From: <je...@us...> - 2006-07-21 04:00:49
|
Revision: 14011 Author: jenst Date: 2006-07-20 21:00:13 -0700 (Thu, 20 Jul 2006) ViewCVS: http://svn.sourceforge.net/gallery/?rev=14011&view=rev Log Message: ----------- 2006-07-21 Jens Tkotz <je...@pe...> 1.6-svn-b1-j90-UNSTABLE * Added new icons for navigation * Converted a couple of png icons to gif icons (DARN IE !) Modified Paths: -------------- branches/DEV_1_6/gallery/ChangeLog branches/DEV_1_6/gallery/Version.php branches/DEV_1_6/gallery/albums.php branches/DEV_1_6/gallery/lib/content.php branches/DEV_1_6/gallery/templates/info_donation-block.tpl.default branches/DEV_1_6/gallery/view_album.php Added Paths: ----------- branches/DEV_1_6/gallery/images/icons/admin.gif branches/DEV_1_6/gallery/images/icons/compressed.gif branches/DEV_1_6/gallery/images/icons/docs.gif branches/DEV_1_6/gallery/images/icons/login.gif branches/DEV_1_6/gallery/images/icons/logout.gif branches/DEV_1_6/gallery/images/icons/navigation/ branches/DEV_1_6/gallery/images/icons/navigation/nav_dot.gif branches/DEV_1_6/gallery/images/icons/navigation/nav_dot_left.gif branches/DEV_1_6/gallery/images/icons/navigation/nav_dot_right.gif branches/DEV_1_6/gallery/images/icons/navigation/nav_first.gif branches/DEV_1_6/gallery/images/icons/navigation/nav_home.gif branches/DEV_1_6/gallery/images/icons/navigation/nav_last.gif branches/DEV_1_6/gallery/images/icons/navigation/nav_next.gif branches/DEV_1_6/gallery/images/icons/navigation/nav_page.gif branches/DEV_1_6/gallery/images/icons/navigation/nav_prev.gif branches/DEV_1_6/gallery/images/icons/new_album.gif branches/DEV_1_6/gallery/images/icons/preferences.gif branches/DEV_1_6/gallery/images/icons/presentation.gif branches/DEV_1_6/gallery/images/icons/register.gif branches/DEV_1_6/gallery/images/icons/rss-feed.gif Removed Paths: ------------- branches/DEV_1_6/gallery/images/icons/compressed.png Modified: branches/DEV_1_6/gallery/ChangeLog =================================================================== --- branches/DEV_1_6/gallery/ChangeLog 2006-07-21 03:11:00 UTC (rev 14010) +++ branches/DEV_1_6/gallery/ChangeLog 2006-07-21 04:00:13 UTC (rev 14011) @@ -1,3 +1,9 @@ +2006-07-21 Jens Tkotz <je...@pe...> 1.6-svn-b1-j90-UNSTABLE + + * Added new icons for navigation + + * Converted a couple of png icons to gif icons (DARN IE !) + 2006-07-21 Jens Tkotz <je...@pe...> 1.6-svn-b1-j89-UNSTABLE * Added icons for notice messages. Modified: branches/DEV_1_6/gallery/Version.php =================================================================== --- branches/DEV_1_6/gallery/Version.php 2006-07-21 03:11:00 UTC (rev 14010) +++ branches/DEV_1_6/gallery/Version.php 2006-07-21 04:00:13 UTC (rev 14011) @@ -22,7 +22,7 @@ ?> <?php -$gallery->version = '1.6-svn-b1-j89-UNSTABLE'; +$gallery->version = '1.6-svn-b1-j90-UNSTABLE'; $gallery->config_version = 97; $gallery->album_version = 38; $gallery->user_version = 6; Modified: branches/DEV_1_6/gallery/albums.php =================================================================== --- branches/DEV_1_6/gallery/albums.php 2006-07-21 03:11:00 UTC (rev 14010) +++ branches/DEV_1_6/gallery/albums.php 2006-07-21 04:00:13 UTC (rev 14011) @@ -140,18 +140,20 @@ if ($gallery->app->gallery_slideshow_type != "off" && $numPhotos != 0) { $iconElements[] = galleryLink( makeGalleryUrl("slideshow.php", array("set_albumName" => null)), - gTranslate('core', "sl_ideshow"), array(), 'presentation.png' + gTranslate('core', "sl_ideshow"), array(), 'presentation.gif' ); } if ($gallery->user->canCreateAlbums() && !$gallery->session->offline) { $iconElements[] = galleryLink( doCommand("new-album", array(), "view_album.php"), - gTranslate('core', "_new album"), array(), 'new_album.png', true + gTranslate('core', "_new album"), array(), 'new_album.gif', true ); } -if ($gallery->user->isLoggedIn() && !$gallery->session->offline) { +$loggedIn = ($gallery->user->isLoggedIn() && !$gallery->session->offline); + +if ($loggedIn) { if ($gallery->user->isAdmin()) { $linkurl = makeGalleryUrl('administer_startpage.php', array('type' => 'popup')); $iconElements[] = popup_link( @@ -161,14 +163,14 @@ $iconElements[] = galleryLink( makeGalleryUrl('admin-page.php'), - gTranslate('core', "_admin page"), array(), 'admin.png', true + gTranslate('core', "_admin page"), array(), 'admin.gif', true ); $docsUrl = galleryDocs('admin'); if ($docsUrl) { $iconElements[] = galleryLink( $docsUrl, - gTranslate('core', "_documentation"), array('target' => '_blank'), 'about.png', true + gTranslate('core', "_documentation"), array('target' => '_blank'), 'docs.gif', true ); } } @@ -176,30 +178,18 @@ if ($gallery->userDB->canModifyUser()) { $iconElements[] = popup_link( gTranslate('core', "_preferences"), - 'user_preferences.php', false, true, 500, 500, '','','preferences.png' + 'user_preferences.php', false, true, 500, 500, '','','preferences.gif' ); } + } - if (!$GALLERY_EMBEDDED_INSIDE) { - $iconElements[] = galleryLink( - doCommand("logout", array(), "albums.php"), - gTranslate('core', "log_out"), array(), 'logout.png', true - ); - } -} else { - if (!$GALLERY_EMBEDDED_INSIDE) { - $iconElements[] = popup_link( - gTranslate('core', "_login"), - 'login.php', false, true, 500, 500, '','','login.png', true - ); +$iconElements[] = LoginLogoutButton(doCommand("logout", array(), "albums.php")); - if (!strcmp($gallery->app->selfReg, 'yes')) { - $iconElements[] = popup_link( - gTranslate('core', "_register"), - 'register.php', false, true, 500, 500, '','','register.png' - ); - } - } +if (!$loggedIn && !$GALLERY_EMBEDDED_INSIDE && $gallery->app->selfReg == 'yes') { + $iconElements[] = popup_link( + gTranslate('core', "_register"), + 'register.php', false, true, 500, 500, '','','register.gif' + ); } $adminbox["text"] = $adminText; @@ -354,7 +344,7 @@ $rootAlbum[$tmpAlbumName]['albumdesc']['title'] = editField($gallery->album, "title", $albumURL); if ($gallery->user->canDownloadAlbum($gallery->album) && $gallery->album->numPhotos(1)) { $rootAlbum[$tmpAlbumName]['albumdesc']['title'] .= ' '. popup_link( - gImage('icons/compressed.png', gTranslate('core', "Download entire album as archive")), + gImage('icons/compressed.gif', gTranslate('core', "Download entire album as archive")), "download.php?set_albumName=$tmpAlbumName", false, false, 500, 500, 'g-small', '', '', false, false Added: branches/DEV_1_6/gallery/images/icons/admin.gif =================================================================== (Binary files differ) Property changes on: branches/DEV_1_6/gallery/images/icons/admin.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/DEV_1_6/gallery/images/icons/compressed.gif =================================================================== (Binary files differ) Property changes on: branches/DEV_1_6/gallery/images/icons/compressed.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: branches/DEV_1_6/gallery/images/icons/compressed.png =================================================================== (Binary files differ) Added: branches/DEV_1_6/gallery/images/icons/docs.gif =================================================================== (Binary files differ) Property changes on: branches/DEV_1_6/gallery/images/icons/docs.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/DEV_1_6/gallery/images/icons/login.gif =================================================================== (Binary files differ) Property changes on: branches/DEV_1_6/gallery/images/icons/login.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/DEV_1_6/gallery/images/icons/logout.gif =================================================================== (Binary files differ) Property changes on: branches/DEV_1_6/gallery/images/icons/logout.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/DEV_1_6/gallery/images/icons/navigation/nav_dot.gif =================================================================== (Binary files differ) Property changes on: branches/DEV_1_6/gallery/images/icons/navigation/nav_dot.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/DEV_1_6/gallery/images/icons/navigation/nav_dot_left.gif =================================================================== (Binary files differ) Property changes on: branches/DEV_1_6/gallery/images/icons/navigation/nav_dot_left.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/DEV_1_6/gallery/images/icons/navigation/nav_dot_right.gif =================================================================== (Binary files differ) Property changes on: branches/DEV_1_6/gallery/images/icons/navigation/nav_dot_right.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/DEV_1_6/gallery/images/icons/navigation/nav_first.gif =================================================================== (Binary files differ) Property changes on: branches/DEV_1_6/gallery/images/icons/navigation/nav_first.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/DEV_1_6/gallery/images/icons/navigation/nav_home.gif =================================================================== (Binary files differ) Property changes on: branches/DEV_1_6/gallery/images/icons/navigation/nav_home.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/DEV_1_6/gallery/images/icons/navigation/nav_last.gif =================================================================== (Binary files differ) Property changes on: branches/DEV_1_6/gallery/images/icons/navigation/nav_last.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/DEV_1_6/gallery/images/icons/navigation/nav_next.gif =================================================================== (Binary files differ) Property changes on: branches/DEV_1_6/gallery/images/icons/navigation/nav_next.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/DEV_1_6/gallery/images/icons/navigation/nav_page.gif =================================================================== (Binary files differ) Property changes on: branches/DEV_1_6/gallery/images/icons/navigation/nav_page.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/DEV_1_6/gallery/images/icons/navigation/nav_prev.gif =================================================================== (Binary files differ) Property changes on: branches/DEV_1_6/gallery/images/icons/navigation/nav_prev.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/DEV_1_6/gallery/images/icons/new_album.gif =================================================================== (Binary files differ) Property changes on: branches/DEV_1_6/gallery/images/icons/new_album.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/DEV_1_6/gallery/images/icons/preferences.gif =================================================================== (Binary files differ) Property changes on: branches/DEV_1_6/gallery/images/icons/preferences.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/DEV_1_6/gallery/images/icons/presentation.gif =================================================================== (Binary files differ) Property changes on: branches/DEV_1_6/gallery/images/icons/presentation.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/DEV_1_6/gallery/images/icons/register.gif =================================================================== (Binary files differ) Property changes on: branches/DEV_1_6/gallery/images/icons/register.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/DEV_1_6/gallery/images/icons/rss-feed.gif =================================================================== (Binary files differ) Property changes on: branches/DEV_1_6/gallery/images/icons/rss-feed.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: branches/DEV_1_6/gallery/lib/content.php =================================================================== --- branches/DEV_1_6/gallery/lib/content.php 2006-07-21 03:11:00 UTC (rev 14010) +++ branches/DEV_1_6/gallery/lib/content.php 2006-07-21 04:00:13 UTC (rev 14011) @@ -1336,12 +1336,12 @@ if (!$GALLERY_EMBEDDED_INSIDE && !$gallery->session->offline) { if ($gallery->user->isLoggedIn()) { - $html = galleryIconLink($returnUrl, 'logout.png', gTranslate('common', "log_out")); + $html = galleryIconLink($returnUrl, 'logout.gif', gTranslate('common', "log_out")); } else { $html = popup_link( gTranslate('common', "log_in"), - 'login.php', false, true, 500, 500, '','','login.png'); + 'login.php', false, true, 500, 500, '','','login.gif'); } } return $html; Modified: branches/DEV_1_6/gallery/templates/info_donation-block.tpl.default =================================================================== --- branches/DEV_1_6/gallery/templates/info_donation-block.tpl.default 2006-07-21 03:11:00 UTC (rev 14010) +++ branches/DEV_1_6/gallery/templates/info_donation-block.tpl.default 2006-07-21 04:00:13 UTC (rev 14011) @@ -15,7 +15,7 @@ ?> <td class="center"> <a href="<?php echo $gallery->app->photoAlbumURL . "/rss.php"; ?>"> - <?php echo getIconText('rss-feed.png', gTranslate('common', "RSS")); ?> + <?php echo getIconText('rss-feed.gif', gTranslate('common', "RSS")); ?> </a> </td> <?php Modified: branches/DEV_1_6/gallery/view_album.php =================================================================== --- branches/DEV_1_6/gallery/view_album.php 2006-07-21 03:11:00 UTC (rev 14010) +++ branches/DEV_1_6/gallery/view_album.php 2006-07-21 04:00:13 UTC (rev 14011) @@ -350,7 +350,7 @@ makeGalleryUrl("slideshow.php", array("set_albumName" => $albumName)), gTranslate('core', "sl_ideshow"), array(), - 'presentation.png' + 'presentation.gif' ); } @@ -657,7 +657,7 @@ $link = ''; if ($gallery->user->canDownloadAlbum($myAlbum) && $myAlbum->numPhotos(1)) { - $iconText = gImage('icons/compressed.png', gTranslate('core', "Download entire album as archive")); + $iconText = gImage('icons/compressed.gif', gTranslate('core', "Download entire album as archive")); $link = popup_link( $iconText, 'download.php?set_albumName='. $gallery->album->getAlbumName($i), This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |