### Eclipse Workspace Patch 1.0 #P sakai_2-6-x Index: portal/portal-render-engine-impl/pack/src/webapp/vm/defaultskin/includePageBody.vm =================================================================== --- portal/portal-render-engine-impl/pack/src/webapp/vm/defaultskin/includePageBody.vm (revision 63460) +++ portal/portal-render-engine-impl/pack/src/webapp/vm/defaultskin/includePageBody.vm (working copy) @@ -22,7 +22,7 @@ ${rloader.sit_reset} #end -

${tool.toolRenderResult.getTitle()}

+

${tool.toolTitle}

#if (${tool.toolJSR168Edit} ) @@ -102,7 +102,7 @@ ${rloader.sit_reset} #end -

${tool.toolRenderResult.getTitle()}

+

${tool.toolTitle}

#if (${tool.toolJSR168Edit} ) Index: portal/portal-render-engine-impl/pack/src/webapp/vm/defaultskin/includeToolBody.vm =================================================================== --- portal/portal-render-engine-impl/pack/src/webapp/vm/defaultskin/includeToolBody.vm (revision 63460) +++ portal/portal-render-engine-impl/pack/src/webapp/vm/defaultskin/includeToolBody.vm (working copy) @@ -26,7 +26,7 @@ ${rloader.sit_reset} #end -##

${tool.toolRenderResult.getTitle()}

+##

${tool.toolTitle}

## Do not show the title in this mode because there may be a separate title above this

 

Index: portal/portal-impl/impl/src/java/org/sakaiproject/portal/charon/SkinnableCharonPortal.java =================================================================== --- portal/portal-impl/impl/src/java/org/sakaiproject/portal/charon/SkinnableCharonPortal.java (revision 63460) +++ portal/portal-impl/impl/src/java/org/sakaiproject/portal/charon/SkinnableCharonPortal.java (working copy) @@ -560,7 +560,6 @@ public Map includeTool(HttpServletResponse res, HttpServletRequest req, ToolConfiguration placement) throws IOException { - // find the tool registered for this ActiveTool tool = ActiveToolManager.getActiveTool(placement.getToolId()); if (tool == null) @@ -596,7 +595,14 @@ String toolUrl = ServerConfigurationService.getToolUrl() + "/" + Web.escapeUrl(placement.getId()) + "/"; - String titleString = Web.escapeHtml(placement.getTitle()); + + String titleString; + String title = ActiveToolManager.getLocalizedToolProperty(Web.escapeHtml(placement.getTitle()),"title"); + if (title!=null) + titleString = title; + else + titleString = Web.escapeHtml(placement.getTitle()); + String toolId = Web.escapeHtml(placement.getToolId()); // Reset the tool state if requested @@ -976,7 +982,7 @@ rcontext.put("pageSkinRepo", skinRepo); rcontext.put("pageSkin", skin); - rcontext.put("pageTitle", Web.escapeHtml(title)); + rcontext.put("pageTitle", Web.escapeHtml(ActiveToolManager.getLocalizedToolProperty(title,"title"))); rcontext.put("pageScriptPath", getScriptPath()); rcontext.put("pageTop", Boolean.valueOf(true)); rcontext.put("rloader", rloader); Index: config/localization/bundles/src/bundle/org/sakaiproject/localization/bundle/tool/tools.properties =================================================================== --- config/localization/bundles/src/bundle/org/sakaiproject/localization/bundle/tool/tools.properties (revision 63460) +++ config/localization/bundles/src/bundle/org/sakaiproject/localization/bundle/tool/tools.properties (working copy) @@ -8,177 +8,193 @@ #.3. Translate into ascii-encoded UTF-8 characters # -#sakai.admin.prefs.description = An admin tool to view and modify any user's Preferences -#sakai.admin.prefs.title = Administrator's Preferences Tool -#sakai.aliases.description = An administration tool to edit Aliases. -#sakai.aliases.title = Admin: Alias Editor -#sakai.announcements.description = For posting current, time-critical information -#sakai.announcements.title = Announcements -#sakai.archive.description = An administration tool to Archive and Import Sites. -#sakai.archive.title = Admin: Archive Tool -#sakai.assignment.description = For posting and submitting assignment(s) online -#sakai.assignment.grades.description = For posting, submitting and grading assignment(s) online -#sakai.assignment.grades.title = Assignments -#sakai.assignment.title = Assignments -#sakai.chat.description = For real-time conversations in written form -#sakai.chat.title = Chat Room -#sakai.createuser.description = Create a new user account -#sakai.createuser.title = New Account -#sakai.discussion.description = For conversations in written form -#sakai.discussion.title = Discussion -#sakai.dropbox.description = For private file sharing between instructor and student -#sakai.dropbox.title = Drop Box -#sakai.filepicker.description = Sakai File Picker Helper Tool -#sakai.filepicker.title = Choose File -#sakai.forums.description = Display forums and topics of a particular site -#sakai.forums.title = Forums -#sakai.gradebook.testservice.description = Check Gradebook service -#sakai.gradebook.testservice.title = Gradebook Service Test -#sakai.gradebook.tool.description = For storing and computing assessment grades from Tests & Quizzes or that are manually entered -#sakai.gradebook.tool.title = Gradebook -#sakai.help.description = The Sakai Help Tool -#sakai.help.title = Help Documentation -#sakai.iframe.description = For accessing an external website within the site -#sakai.iframe.myworkspace.description = For displaying information about a user's My Workspace -#sakai.iframe.myworkspace.title = My Workspace Information Display -#sakai.iframe.service.description = For displaying information about this Service -#sakai.iframe.service.title = Service Information Display -#sakai.iframe.site.description = For displaying Site information -#sakai.iframe.site.title = Site Information Display -#sakai.iframe.title = Web Content -#sakai.login.description = A login tool -#sakai.login.title = Login -#sakai.mailbox.description = For viewing email sent to the site -#sakai.mailbox.title = Email Archive -#sakai.membership.description = View and modify your membership in sites you may join -#sakai.membership.title = Membership -#sakai.memory.description = An administration tool to view the JVM memory and reset the system caches -#sakai.memory.title = Admin: Memory / Cache Tool -#sakai.messagecenter.description = For using the message forums or private mail for a site. -#sakai.messagecenter.title = Messages & Forums -#sakai.messageforums.helper.description = Message Center Navigation Helper Tool -#sakai.messageforums.helper.title = Private Messages Helper -#sakai.messages.description = Display messages to/from users of a particular site -#sakai.messages.title = Messages -#sakai.metaobj.description = Sakai Forms Tool -#sakai.metaobj.form.description = Sakai Form Helper Tool -#sakai.metaobj.form.resourceCreateHelper.description = Resource Form Create Helper -#sakai.metaobj.form.resourceCreateHelper.title = Resource Form Create Helper -#sakai.metaobj.form.resourceEditHelper.description = Resource Form Edit Helper -#sakai.metaobj.form.resourceEditHelper.title = Resource Form Edit Helper -#sakai.metaobj.form.title = Form Helper -#sakai.metaobj.formView.description = Sakai Form View Tool -#sakai.metaobj.formView.title = Form View -#sakai.metaobj.title = Forms -#sakai.motd.description = Display the system message of the day -#sakai.motd.title = Message Of The Day -#sakai.news.description = For viewing content from online sources -#sakai.news.title = News -#sakai.online.description = See who's on-line and where they are -#sakai.online.title = Admin: On-Line -#sakai.permissions.helper.description = Sakai Permissions Helper Tool -#sakai.permissions.helper.title = Set Permissions -#sakai.podcasts.description = For managing individual podcast and podcast feed information -#sakai.podcasts.title = Podcasts -#sakai.postem.description = PostEm gradebook tool for sakai. -#sakai.postem.title = PostEm -#sakai.preferences.description = Tool to view and modify user's Preferences -#sakai.preferences.title = Preferences Tool -#sakai.presence.description = Display the users present at a location -#sakai.presence.title = Presence Tool -#sakai.presentation.description = For showing and viewing slideshows of image collections from Resources -#sakai.presentation.title = Presentation -#sakai.privacy.description = Display current privacy status for all sites or a site -#sakai.privacy.title = Privacy Status -#sakai.profile.description = Profile Tool -#sakai.profile.title = Profile -#sakai.realms.description = An administration tool to edit Realms -#sakai.realms.title = Admin: Realms Editor -#sakai.resource.helper.description = Resource Create Edit Helper -#sakai.resource.helper.title = Resource Create/Edit Helper -#sakai.resource.type.helper.description = Provides Implementations for Actions of Basic Resource Types -#sakai.resource.type.helper.title = Resource Type Helper -#sakai.resources.description = For posting documents, URLs to other websites, etc. -#sakai.resources.title = Resources -#sakai.rights.description = For maintaining information about intellectual property rights related to resources -#sakai.rights.title = Rights Helper -#sakai.rutgers.linktool.description = A tool to link to external applications. -#sakai.rutgers.linktool.title = Link Tool -#sakai.rutgers.testlink.description = A test of the link tool. -#sakai.rutgers.testlink.title = Test Link -#sakai.rwiki.description = For collaborative editing of pages and content -#sakai.rwiki.title = Wiki -#sakai.samigo.description = The Samigo assessment tool -#sakai.samigo.title = Samigo -#sakai.samigo.tool.description = For creating and taking online tests and quizzes -#sakai.samigo.tool.title = Tests & Quizzes -#sakai.sample.jsf.widgets-2.description = Individual examples of the Sakai 2.0 JSF tags. -#sakai.sample.jsf.widgets-2.title = Sakai 2.0 JSF Tags -#sakai.sample.tool.servlet.description = A simple sample servlet tool -#sakai.sample.tool.servlet.title = Simple Sample Servlet Tool -#sakai.sample.tool.servlet2.description = A slightly slicker sample servlet tool -#sakai.sample.tool.servlet2.title = Simple Sample Servlet Tool 2 -#sakai.sample.tools.OSIDRepository.description = Display registered Repositories and Search -#sakai.sample.tools.OSIDRepository.title = Sample use of RepositoryManager Component -#sakai.schedule.description = For posting and viewing deadlines, events, etc. -#sakai.schedule.title = Schedule -#sakai.scheduler.description = Job Scheduler -#sakai.scheduler.title = Job Scheduler Based On Quartz -#sakai.search.description = For searching content -#sakai.search.title = Search -#sakai.sections.description = For managing sections within a site -#sakai.sections.title = Section Info -#sakai.singleuser.description = View and modify my user profile -#sakai.singleuser.title = Account -#sakai.site.roster.description = For viewing the site participants list -#sakai.site.roster.title = Roster -#sakai.sitebrowser.description = Find and view summarys of Sites -#sakai.sitebrowser.title = Site Browser -#sakai.siteinfo.description = For showing worksite information and site participants -#sakai.siteinfo.title = Site Info -#sakai.sites.description = An administration tool to edit Sites -#sakai.sites.title = Admin: Sites Editor -#sakai.sitesetup.description = Modify your sites and create new ones -#sakai.sitesetup.title = Worksite Setup -#sakai.su.description = Tool for logging in as another user -#sakai.su.title = Admin: Become User -#sakai.summary.calendar.description = Show a summary of schedule events in My Workspace -#sakai.summary.calendar.title = Calendar -#sakai.syllabus.description = For posting a summary outline and/or requirements for a site -#sakai.syllabus.title = Syllabus -#sakai.synoptic.announcement.description = Display recent announcements, updated as messages arrive -#sakai.synoptic.announcement.title = Recent Announcements -#sakai.synoptic.chat.description = Display recent announcements, updated as messages arrive -#sakai.synoptic.chat.title = Recent Chat Messages -#sakai.synoptic.discussion.description = Display recent discussion items, updated as items arrive -#sakai.synoptic.discussion.title = Recent Discussion Items -#sakai.synoptic.messagecenter.description = Display unread discussion and forum topic messages for all sites or a site -#sakai.synoptic.messagecenter.title = Message Center Notifications -#sakai.test.tools.OSIDUnitTest.description = Simple tests of the Sakai OSID Implementatgions -#sakai.test.tools.OSIDUnitTest.title = Sakai OSID Unit Test Servlet -#sakai.users.description = An administration tool to edit Users -#sakai.users.title = Admin: User Editor -#blogger.title = Blogger -#blogger.description = A Blogger -#sakai.mailtool.title = Mailtool -#sakai.mailtool.description = Send mail to groups in your course.(Attachment-enabled) -#sakai.poll.title = Polls -#sakai.poll.description = For anonymous polls or voting -#osp.style.title = Styles -#osp.style.description = OSP Style Helper Tool -#osp.evaluation.title = Evaluations -#osp.evaluation.description = OSP Evaluations -#osp.matrix.title = Matrices -#osp.matrix.description = OSP Matrices Tool -#osp.presLayout.title = Portfolio Layouts -#osp.presLayout.description = OSP Layouts Tool -#osp.presTemplate.title = Portfolio Templates -#osp.presTemplate.description = OSP Portfolio Templates -#osp.presentation.title = Portfolios -#osp.presentation.description = OSP Portfolios -#osp.glossary.title = Glossary -#osp.glossary.description = OSP Glossary Tool -#osp.wizard.title = Wizards -#osp.wizard.description = OSP Wizards Tool -#sakai.reports.title = Reports -#sakai.reports.description = Reports +sakai.admin.prefs.description = An admin tool to view and modify any user's Preferences +sakai.admin.prefs.title = Administrator's Preferences Tool +sakai.aliases.description = An administration tool to edit Aliases. +sakai.aliases.title = Admin: Alias Editor +sakai.announcements.description = For posting current, time-critical information +sakai.announcements.title = Announcements +sakai.archive.description = An administration tool to Archive and Import Sites. +sakai.archive.title = Admin: Archive Tool +sakai.assignment.description = For posting and submitting assignment(s) online +sakai.assignment.grades.description = For posting, submitting and grading assignment(s) online +sakai.assignment.grades.title = Assignments +sakai.assignment.title = Assignments +sakai.chat.description = For real-time conversations in written form +sakai.chat.title = Chat Room +sakai.createuser.description = Create a new user account +sakai.createuser.title = New Account +sakai.discussion.description = For conversations in written form +sakai.discussion.title = Discussion +sakai.dropbox.description = For private file sharing between instructor and student +sakai.dropbox.title = Drop Box +sakai.filepicker.description = Sakai File Picker Helper Tool +sakai.filepicker.title = Choose File +sakai.forums.description = Display forums and topics of a particular site +sakai.forums.title = Forums +sakai.gradebook.testservice.description = Check Gradebook service +sakai.gradebook.testservice.title = Gradebook Service Test +sakai.gradebook.tool.description = For storing and computing assessment grades from Tests & Quizzes or that are manually entered +sakai.gradebook.tool.title = Gradebook +sakai.help.description = The Sakai Help Tool +sakai.help.title = Help Documentation +sakai.iframe.description = For accessing an external website within the site +sakai.iframe.myworkspace.description = For displaying information about a user's My Workspace +sakai.iframe.myworkspace.title = My Workspace Information Display +sakai.iframe.service.description = For displaying information about this Service +sakai.iframe.service.title = Service Information Display +sakai.iframe.site.description = For displaying Site information +sakai.iframe.site.title = Site Information Display +sakai.iframe.title = Web Content +sakai.login.description = A login tool +sakai.login.title = Login +sakai.mailbox.description = For viewing email sent to the site +sakai.mailbox.title = Email Archive +sakai.membership.description = View and modify your membership in sites you may join +sakai.membership.title = Membership +sakai.memory.description = An administration tool to view the JVM memory and reset the system caches +sakai.memory.title = Admin: Memory / Cache Tool +sakai.messagecenter.description = For using the message forums or private mail for a site. +sakai.messagecenter.title = Messages & Forums +sakai.messageforums.helper.description = Message Center Navigation Helper Tool +sakai.messageforums.helper.title = Private Messages Helper +sakai.messages.description = Display messages to/from users of a particular site +sakai.messages.title = Messages +sakai.metaobj.description = Sakai Forms Tool +sakai.metaobj.form.description = Sakai Form Helper Tool +sakai.metaobj.form.resourceCreateHelper.description = Resource Form Create Helper +sakai.metaobj.form.resourceCreateHelper.title = Resource Form Create Helper +sakai.metaobj.form.resourceEditHelper.description = Resource Form Edit Helper +sakai.metaobj.form.resourceEditHelper.title = Resource Form Edit Helper +sakai.metaobj.form.title = Form Helper +sakai.metaobj.formView.description = Sakai Form View Tool +sakai.metaobj.formView.title = Form View +sakai.metaobj.title = Forms +sakai.motd.description = Display the system message of the day +sakai.motd.title = Message Of The Day +sakai.news.description = For viewing content from online sources +sakai.news.title = News +sakai.online.description = See who's on-line and where they are +sakai.online.title = Admin: On-Line +sakai.permissions.helper.description = Sakai Permissions Helper Tool +sakai.permissions.helper.title = Set Permissions +sakai.podcasts.description = For managing individual podcast and podcast feed information +sakai.podcasts.title = Podcasts +sakai.postem.description = PostEm gradebook tool for sakai. +sakai.postem.title = PostEm +sakai.preferences.description = Tool to view and modify user's Preferences +sakai.preferences.title = Preferences Tool +sakai.presence.description = Display the users present at a location +sakai.presence.title = Presence Tool +sakai.presentation.description = For showing and viewing slideshows of image collections from Resources +sakai.presentation.title = Presentation +sakai.privacy.description = Display current privacy status for all sites or a site +sakai.privacy.title = Privacy Status +sakai.profile.description = Profile Tool +sakai.profile.title = Profile +sakai.realms.description = An administration tool to edit Realms +sakai.realms.title = Admin: Realms Editor +sakai.resource.helper.description = Resource Create Edit Helper +sakai.resource.helper.title = Resource Create/Edit Helper +sakai.resource.type.helper.description = Provides Implementations for Actions of Basic Resource Types +sakai.resource.type.helper.title = Resource Type Helper +sakai.resources.description = For posting documents, URLs to other websites, etc. +sakai.resources.title = Resources +sakai.rights.description = For maintaining information about intellectual property rights related to resources +sakai.rights.title = Rights Helper +sakai.rutgers.linktool.description = A tool to link to external applications. +sakai.rutgers.linktool.title = Link Tool +sakai.rutgers.testlink.description = A test of the link tool. +sakai.rutgers.testlink.title = Test Link +sakai.rwiki.description = For collaborative editing of pages and content +sakai.rwiki.title = Wiki +sakai.samigo.description = The Samigo assessment tool +sakai.samigo.title = Samigo +sakai.samigo.tool.description = For creating and taking online tests and quizzes +sakai.samigo.tool.title = Tests & Quizzes +sakai.sample.jsf.widgets-2.description = Individual examples of the Sakai 2.0 JSF tags. +sakai.sample.jsf.widgets-2.title = Sakai 2.0 JSF Tags +sakai.sample.tool.servlet.description = A simple sample servlet tool +sakai.sample.tool.servlet.title = Simple Sample Servlet Tool +sakai.sample.tool.servlet2.description = A slightly slicker sample servlet tool +sakai.sample.tool.servlet2.title = Simple Sample Servlet Tool 2 +sakai.sample.tools.OSIDRepository.description = Display registered Repositories and Search +sakai.sample.tools.OSIDRepository.title = Sample use of RepositoryManager Component +sakai.schedule.description = For posting and viewing deadlines, events, etc. +sakai.schedule.title = Schedule +sakai.scheduler.description = Job Scheduler +sakai.scheduler.title = Job Scheduler Based On Quartz +sakai.search.description = For searching content +sakai.search.title = Search +sakai.sections.description = For managing sections within a site +sakai.sections.title = Section Info +sakai.singleuser.description = View and modify my user profile +sakai.singleuser.title = Account +sakai.site.roster.description = For viewing the site participants list +sakai.site.roster.title = Roster +sakai.sitebrowser.description = Find and view summarys of Sites +sakai.sitebrowser.title = Site Browser +sakai.siteinfo.description = For showing worksite information and site participants +sakai.siteinfo.title = Site Info +sakai.sites.description = An administration tool to edit Sites +sakai.sites.title = Admin: Sites Editor +sakai.sitesetup.description = Modify your sites and create new ones +sakai.sitesetup.title = Worksite Setup +sakai.su.description = Tool for logging in as another user +sakai.su.title = Admin: Become User +sakai.summary.calendar.description = Show a summary of schedule events in My Workspace +sakai.summary.calendar.title = Calendar +sakai.syllabus.description = For posting a summary outline and/or requirements for a site +sakai.syllabus.title = Syllabus +sakai.synoptic.announcement.description = Display recent announcements, updated as messages arrive +sakai.synoptic.announcement.title = Recent Announcements +sakai.synoptic.chat.description = Display recent announcements, updated as messages arrive +sakai.synoptic.chat.title = Recent Chat Messages +sakai.synoptic.discussion.description = Display recent discussion items, updated as items arrive +sakai.synoptic.discussion.title = Recent Discussion Items +sakai.synoptic.messagecenter.description = Display unread discussion and forum topic messages for all sites or a site +sakai.synoptic.messagecenter.title = Message Center Notifications +sakai.test.tools.OSIDUnitTest.description = Simple tests of the Sakai OSID Implementatgions +sakai.test.tools.OSIDUnitTest.title = Sakai OSID Unit Test Servlet +sakai.users.description = An administration tool to edit Users +sakai.users.title = Admin: User Editor +blogger.title = Blogger +blogger.description = A Blogger +sakai.mailtool.title = Mailtool +sakai.mailtool.description = Send mail to groups in your course.(Attachment-enabled) +sakai.poll.title = Polls +sakai.poll.description = For anonymous polls or voting +osp.style.title = Styles +osp.style.description = OSP Style Helper Tool +osp.evaluation.title = Evaluations +osp.evaluation.description = OSP Evaluations +osp.matrix.title = Matrices +osp.matrix.description = OSP Matrices Tool +osp.presLayout.title = Portfolio Layouts +osp.presLayout.description = OSP Layouts Tool +osp.presTemplate.title = Portfolio Templates +osp.presTemplate.description = OSP Portfolio Templates +osp.presentation.title = Portfolios +osp.presentation.description = OSP Portfolios +osp.glossary.title = Glossary +osp.glossary.description = OSP Glossary Tool +osp.wizard.title = Wizards +osp.wizard.description = OSP Wizards Tool +sakai.reports.title = Reports +sakai.reports.description = Reports +sakai.home.title = Home +sakai.home.description = Main page +es.upv.webasipublic.title = Gu\u00EDa Docente +es.upv.webasipublic.description = Informaci\u00F3n p\u00FAblica de la asignatura +es.upv.webasiprivate.title = Gesti\u00F3n +es.upv.webasiprivate.description = Opciones intranet de gesti\u00EDn de la asignatura +sakai.upv.encuestas.title = Encuestas UPV +sakai.upv.encuestas.description = Herramienta de Encuestas +sakai.poll.title = Sondeos +sakai.poll.description = Sondeos de opini\u00F3n +sakai.sitestats.admin.title = Administraci\u00F3n de estad\u00EDsticas +sakai.sitestats.admin.description = Administraci\u00F3n de estad\u00EDsticas (usuarios, eventos, recursos) de todos los sitios +sakai.sitestats.title = Estad\u00EDsticas +sakai.sitestats.description = Estad\u00EDsticas (usuarios, eventos, recursos) del sitio +sakai.upv.webasimaster.title = Asignaturas +sakai.upv.webasimaster.description = Asignaturas del Master \ No newline at end of file Index: portal/portal-impl/impl/src/java/org/sakaiproject/portal/charon/handlers/SiteHandler.java =================================================================== --- portal/portal-impl/impl/src/java/org/sakaiproject/portal/charon/handlers/SiteHandler.java (revision 63460) +++ portal/portal-impl/impl/src/java/org/sakaiproject/portal/charon/handlers/SiteHandler.java (working copy) @@ -1,3 +1,5 @@ + + /********************************************************************************** * $URL$ * $Id$ @@ -54,6 +56,7 @@ import org.sakaiproject.user.api.Preferences; import org.sakaiproject.user.cover.PreferencesService; import org.sakaiproject.util.Web; +import org.sakaiproject.tool.cover.ActiveToolManager; /** * @author ieb @@ -129,7 +132,6 @@ String siteId, String pageId, String toolContextPath) throws ToolException, IOException { - boolean doFrameTop = "true".equals(req.getParameter("sakai.frame.top")); boolean doFrameSuppress = "true".equals(req.getParameter("sakai.frame.suppress")); @@ -206,7 +208,7 @@ // form a context sensitive title String title = ServerConfigurationService.getString("ui.service") + " : " - + site.getTitle() + " : " + page.getTitle(); + + site.getTitle() + " : " + ActiveToolManager.getLocalizedToolProperty(page.getTitle(),"title"); // start the response String siteType = portal.calcSiteType(siteId); @@ -710,5 +712,4 @@ } return framesetRequested; } - } Index: config/localization/bundles/src/bundle/org/sakaiproject/localization/bundle/tool/tools_es.properties =================================================================== --- config/localization/bundles/src/bundle/org/sakaiproject/localization/bundle/tool/tools_es.properties (revision 63460) +++ config/localization/bundles/src/bundle/org/sakaiproject/localization/bundle/tool/tools_es.properties (working copy) @@ -1,4 +1,5 @@ -sakai.admin.prefs.description = Administraci\u00F3ara ver y modificar las preferencias de cualquier usuario + +sakai.admin.prefs.description = Administraci\u00F3ara ver y modificar las preferencias de cualquier usuario sakai.admin.prefs.title = Gesti\u00F3e las preferencias del administrador sakai.aliases.description = Administraci\u00F3e alias sakai.aliases.title = Administrador: editor de alias @@ -63,7 +64,7 @@ sakai.motd.description = Mostrar los mensajes del sistema diarios sakai.motd.title = Mensaje del d\u00EDa sakai.news.description = Para ver el contenido de fuentes on-line -sakai.news.title = Noticas +sakai.news.title = Noticias sakai.online.description = Ver qui\u00E9n est\u00E1 conectado y d\u00F3nde est\u00E1n sakai.online.title = Administraci\u00F3n: On-Line sakai.permissions.helper.description = Herramienta de permisos de Sakai @@ -147,4 +148,20 @@ sakai.test.tools.OSIDUnitTest.description = Prueba simples de integraci\u00F3n Sakai-OSID sakai.test.tools.OSIDUnitTest.title = Prueba unitaria del servlet de integraci\u00F3n Sakai-OSID sakai.users.description = Administraci\u00F3n de usuarios -sakai.users.title = Administrador: Edici\u00F3n de usuarios \ No newline at end of file +sakai.users.title = Administrador: Edici\u00F3n de usuarios +sakai.home.title = Inicio +sakai.home.description = P\u00E1gina principal del sitio +es.upv.webasipublic.title = Gu\u00EDa Docente +es.upv.webasipublic.description = Informaci\u00F3n p\u00FAblica de la asignatura +es.upv.webasiprivate.title = Gesti\u00F3n +es.upv.webasiprivate.description = Opciones intranet de gesti\u00EDn de la asignatura +sakai.upv.encuestas.title = Encuestas UPV +sakai.upv.encuestas.description = Herramienta de Encuestas +sakai.poll.title = Sondeos +sakai.poll.description = Sondeos de opini\u00F3n +sakai.sitestats.admin.title = Administraci\u00F3n de estad\u00EDsticas +sakai.sitestats.admin.description = Administraci\u00F3n de estad\u00EDsticas (usuarios, eventos, recursos) de todos los sitios +sakai.sitestats.title = Estad\u00EDsticas +sakai.sitestats.description = Estad\u00EDsticas (usuarios, eventos, recursos) del sitio +sakai.upv.webasimaster.title = Asignaturas +sakai.upv.webasimaster.description = Asignaturas del Master \ No newline at end of file Index: portal/portal-impl/impl/src/java/org/sakaiproject/portal/charon/site/PortalSiteHelperImpl.java =================================================================== --- portal/portal-impl/impl/src/java/org/sakaiproject/portal/charon/site/PortalSiteHelperImpl.java (revision 63460) +++ portal/portal-impl/impl/src/java/org/sakaiproject/portal/charon/site/PortalSiteHelperImpl.java (working copy) @@ -68,6 +68,7 @@ import org.sakaiproject.tool.api.Placement; import org.sakaiproject.tool.api.Session; import org.sakaiproject.tool.cover.ToolManager; +import org.sakaiproject.tool.cover.ActiveToolManager; import org.sakaiproject.user.api.UserNotDefinedException; import org.sakaiproject.user.cover.PreferencesService; import org.sakaiproject.user.cover.UserDirectoryService; @@ -75,6 +76,7 @@ import org.sakaiproject.util.MapUtil; import org.sakaiproject.util.Web; + /** * @author ieb * @since Sakai 2.4 @@ -449,7 +451,9 @@ SitePage page, String toolContextPath, String portalPrefix, boolean doPages, boolean resetTools, boolean includeSummary) { - + + System.out.println(" --------------- PortalSiteHelperImpl.pageListToMap ------------"); + Map theMap = new HashMap(); String pageUrl = Web.returnUrl(req, "/" + portalPrefix + "/" @@ -514,13 +518,20 @@ if (doPages || p.isPopUp()) { + System.out.println(" > p.getTitle: " + p.getTitle()); + System.out.println(" > pageTitle: " + Web.escapeHtml(ActiveToolManager.getLocalizedToolProperty(p.getTitle(),"title"))); + + Map m = new HashMap(); m.put("isPage", Boolean.valueOf(true)); m.put("current", Boolean.valueOf(current)); m.put("ispopup", Boolean.valueOf(p.isPopUp())); m.put("pagePopupUrl", pagePopupUrl); - m.put("pageTitle", Web.escapeHtml(p.getTitle())); - m.put("jsPageTitle", Web.escapeJavascript(p.getTitle())); + String title = ActiveToolManager.getLocalizedToolProperty(p.getTitle(),"title"); + if (title==null) + title = p.getTitle(); + m.put("pageTitle", Web.escapeHtml(title)); + m.put("jsPageTitle", Web.escapeJavascript(title)); m.put("pageId", Web.escapeUrl(p.getId())); m.put("jsPageId", Web.escapeJavascript(p.getId())); m.put("pageRefUrl", pagerefUrl); Index: portal/portal-impl/impl/src/java/org/sakaiproject/portal/charon/handlers/WorksiteHandler.java =================================================================== --- portal/portal-impl/impl/src/java/org/sakaiproject/portal/charon/handlers/WorksiteHandler.java (revision 63460) +++ portal/portal-impl/impl/src/java/org/sakaiproject/portal/charon/handlers/WorksiteHandler.java (working copy) @@ -37,6 +37,7 @@ import org.sakaiproject.site.api.SitePage; import org.sakaiproject.tool.api.Session; import org.sakaiproject.tool.api.ToolException; +import org.sakaiproject.tool.cover.ActiveToolManager; /** * @@ -146,7 +147,7 @@ // form a context sensitive title String title = ServerConfigurationService.getString("ui.service") + " : " - + site.getTitle() + " : " + page.getTitle(); + + site.getTitle() + " : " + ActiveToolManager.getLocalizedToolProperty(page.getTitle(),"title"); // start the response String siteType = portal.calcSiteType(siteId); Index: config/localization/bundles/src/bundle/org/sakaiproject/localization/bundle/tool/tools_ca.properties =================================================================== --- config/localization/bundles/src/bundle/org/sakaiproject/localization/bundle/tool/tools_ca.properties (revision 63460) +++ config/localization/bundles/src/bundle/org/sakaiproject/localization/bundle/tool/tools_ca.properties (working copy) @@ -163,3 +163,19 @@ sakai.test.tools.OSIDUnitTest.title = Prova unit\u00E0ria del servlet d'integraci\u00F3 Sakai-OSID sakai.users.description = Administraci\u00F3 d'usuaris sakai.users.title = Administrador: Edici\u00F3 d'usuaris +sakai.home.title = Inici +sakai.home.description = P\u00E1gina principal del lloc +es.upv.webasipublic.title = Gu\u00EDa Docente +es.upv.webasipublic.description = Informaci\u00F3n p\u00FAblica de la asignatura +es.upv.webasiprivate.title = Gesti\u00F3n +es.upv.webasiprivate.description = Opciones intranet de gesti\u00EDn de la asignatura +sakai.upv.encuestas.title = Encuestas UPV +sakai.upv.encuestas.description = Herramienta de Encuestas +sakai.poll.title = Sondeos +sakai.poll.description = Sondeos de opini\u00F3n +sakai.sitestats.admin.title = Administraci\u00F3n de estad\u00EDsticas +sakai.sitestats.admin.description = Administraci\u00F3n de estad\u00EDsticas (usuarios, eventos, recursos) de todos los sitios +sakai.sitestats.title = Estad\u00EDsticas +sakai.sitestats.description = Estad\u00EDsticas (usuarios, eventos, recursos) del sitio +sakai.upv.webasimaster.title = Asignaturas +sakai.upv.webasimaster.description = Asignaturas del Master \ No newline at end of file