From: <an...@us...> - 2008-01-29 21:20:08
|
Revision: 17416 http://gallery.svn.sourceforge.net/gallery/?rev=17416&view=rev Author: andy_st Date: 2008-01-29 13:20:05 -0800 (Tue, 29 Jan 2008) Log Message: ----------- Fix for bug 1873043 - Invalid HTML in publishxp. Removed <title> from Head.tpl and using $template->title() to override the default title instead. Modified Paths: -------------- trunk/gallery2/modules/publishxp/NewAlbum.inc trunk/gallery2/modules/publishxp/Options.inc trunk/gallery2/modules/publishxp/PublishXpLogin.inc trunk/gallery2/modules/publishxp/SelectAlbum.inc trunk/gallery2/modules/publishxp/UploadItems.inc trunk/gallery2/modules/publishxp/templates/Head.tpl Modified: trunk/gallery2/modules/publishxp/NewAlbum.inc =================================================================== --- trunk/gallery2/modules/publishxp/NewAlbum.inc 2008-01-29 20:54:42 UTC (rev 17415) +++ trunk/gallery2/modules/publishxp/NewAlbum.inc 2008-01-29 21:20:05 UTC (rev 17416) @@ -156,6 +156,12 @@ $NewAlbum = array(); $NewAlbum['parents'] = $parents; + list ($ret, $module) = GalleryCoreApi::loadPlugin('module', 'publishxp'); + if ($ret) { + return array($ret, null); + } + + $template->title($module->translate('Publish XP')); $template->setVariable('NewAlbum', $NewAlbum); $template->setVariable('controller', 'publishxp.NewAlbum'); $template->head('modules/publishxp/templates/Head.tpl'); Modified: trunk/gallery2/modules/publishxp/Options.inc =================================================================== --- trunk/gallery2/modules/publishxp/Options.inc 2008-01-29 20:54:42 UTC (rev 17415) +++ trunk/gallery2/modules/publishxp/Options.inc 2008-01-29 21:20:05 UTC (rev 17416) @@ -129,6 +129,12 @@ } } + list ($ret, $module) = GalleryCoreApi::loadPlugin('module', 'publishxp'); + if ($ret) { + return array($ret, null); + } + + $template->title($module->translate('Publish XP')); $template->setVariable('Options', $Options); $template->head('modules/publishxp/templates/Head.tpl'); Modified: trunk/gallery2/modules/publishxp/PublishXpLogin.inc =================================================================== --- trunk/gallery2/modules/publishxp/PublishXpLogin.inc 2008-01-29 20:54:42 UTC (rev 17415) +++ trunk/gallery2/modules/publishxp/PublishXpLogin.inc 2008-01-29 21:20:05 UTC (rev 17416) @@ -119,6 +119,12 @@ return array(null, array('redirect' => array('view' => 'publishxp.SelectAlbum'))); } + list ($ret, $module) = GalleryCoreApi::loadPlugin('module', 'publishxp'); + if ($ret) { + return array($ret, null); + } + + $template->title($module->translate('Publish XP')); $template->setVariable('controller', 'publishxp.PublishXpLogin'); $template->head('modules/publishxp/templates/Head.tpl'); Modified: trunk/gallery2/modules/publishxp/SelectAlbum.inc =================================================================== --- trunk/gallery2/modules/publishxp/SelectAlbum.inc 2008-01-29 20:54:42 UTC (rev 17415) +++ trunk/gallery2/modules/publishxp/SelectAlbum.inc 2008-01-29 21:20:05 UTC (rev 17416) @@ -130,6 +130,7 @@ $albumIds['allIds'] = $filteredIds; } + $albums = array(); if (!empty($albumIds['allIds'])) { /* Load all the album entities */ list ($ret, $albums) = @@ -142,6 +143,12 @@ $SelectAlbum = array(); $SelectAlbum['albumTree'] = GalleryUtilities::createAlbumTree($albums); + list ($ret, $module) = GalleryCoreApi::loadPlugin('module', 'publishxp'); + if ($ret) { + return array($ret, null); + } + + $template->title($module->translate('Publish XP')); $template->setVariable('SelectAlbum', $SelectAlbum); $template->setVariable('controller', 'publishxp.SelectAlbum'); $template->head('modules/publishxp/templates/Head.tpl'); Modified: trunk/gallery2/modules/publishxp/UploadItems.inc =================================================================== --- trunk/gallery2/modules/publishxp/UploadItems.inc 2008-01-29 20:54:42 UTC (rev 17415) +++ trunk/gallery2/modules/publishxp/UploadItems.inc 2008-01-29 21:20:05 UTC (rev 17416) @@ -279,6 +279,12 @@ $UploadItems['setCaptions'] = 0; } + list ($ret, $module) = GalleryCoreApi::loadPlugin('module', 'publishxp'); + if ($ret) { + return array($ret, null); + } + + $template->title($module->translate('Publish XP')); $template->setVariable('UploadItems', $UploadItems); $template->head('modules/publishxp/templates/Head.tpl'); Modified: trunk/gallery2/modules/publishxp/templates/Head.tpl =================================================================== --- trunk/gallery2/modules/publishxp/templates/Head.tpl 2008-01-29 20:54:42 UTC (rev 17415) +++ trunk/gallery2/modules/publishxp/templates/Head.tpl 2008-01-29 21:20:05 UTC (rev 17416) @@ -2,10 +2,6 @@ * $Revision$ * Read this before changing templates! http://codex.gallery2.org/Gallery2:Editing_Templates *} -<title> - {g->text text="Publish XP"} -</title> - <script type="text/javascript"> // <![CDATA[ var onBackUrl = null; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |