diff options
| -rw-r--r-- | modules/search/helpers/search_block.php | 2 | ||||
| -rw-r--r-- | modules/slideshow/helpers/slideshow_block.php | 10 | ||||
| -rw-r--r-- | themes/default/css/screen.css | 70 | ||||
| -rw-r--r-- | themes/default/views/album.html.php | 7 | ||||
| -rw-r--r-- | themes/default/views/photo.html.php | 9 | ||||
| -rw-r--r-- | themes/default/views/sidebar.html.php | 8 |
6 files changed, 44 insertions, 62 deletions
diff --git a/modules/search/helpers/search_block.php b/modules/search/helpers/search_block.php index b6450b4d..0294c920 100644 --- a/modules/search/helpers/search_block.php +++ b/modules/search/helpers/search_block.php @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */ class search_block_Core { - public static function header_bottom($theme) { + public static function header_top($theme) { $view = new View("search_link.html"); return $view->render(); } diff --git a/modules/slideshow/helpers/slideshow_block.php b/modules/slideshow/helpers/slideshow_block.php index c757a28a..b5177b8e 100644 --- a/modules/slideshow/helpers/slideshow_block.php +++ b/modules/slideshow/helpers/slideshow_block.php @@ -28,15 +28,7 @@ class slideshow_block_Core { " title=\"" . _("View slideshow") . "\">" . _("View slideshow") . "</a>"; } - public static function album_top($theme) { + public static function sidebar_top($theme) { return self::_piclens_link($theme); } - - public static function photo_top($theme) { - return self::_piclens_link($theme); - } - - public static function tag_top($theme) { - return self::_piclens_link(); - } } diff --git a/themes/default/css/screen.css b/themes/default/css/screen.css index 88eac87a..87321217 100644 --- a/themes/default/css/screen.css +++ b/themes/default/css/screen.css @@ -194,7 +194,7 @@ li.gError select { border: 2px solid red; } -/** ******************************************************************* +/** **************************************************************** * 2) Base text styles ******************************************************************/ @@ -225,22 +225,24 @@ li.gError select { /* Layout containers ~~~~~~~~~~~~~~~~~~~~~ */ #gHeader { - border-bottom: 1px solid #ccc; + border-bottom: 1px solid #fff; } #gContent { - padding: 20px; + padding: 0 0 0 20px; } #gSidebar { background-color: #fff; - padding: 20px 20px 0 0; + margin-top: -20px; + padding: 0 20px; width: 220px; } #gFooter { border-top: 1px solid #ccc; - padding: .5em; + margin-top: 20px; + padding: 10px 20px; } /** **************************************************************** @@ -248,6 +250,7 @@ li.gError select { ******************************************************************/ .gBlock { + clear: both; margin-bottom: 2.5em; } @@ -281,7 +284,6 @@ table.gBlockContent td { /* Logo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ #gLogo { - float: left; margin: 5px 10px 10px 20px; } @@ -294,14 +296,8 @@ table.gBlockContent td { position: relative; } -#gAlbumHeader h1 { - display: inline; - margin-right: .6em; -} - #gAlbumHeader .gDescription { - color: #ccc; - display: inline; + color: #999; } #gAlbumGrid { @@ -309,11 +305,12 @@ table.gBlockContent td { } .gItem { - border: 1px solid #ccc; float: left; - margin: 0 24px 10px 0; + height: 270px; + margin-bottom: 10px; padding: 0 0 5px 0; text-align: center; + width: 33%; } .gItem h2 { @@ -357,9 +354,6 @@ table.gBlockContent td { /* Metadata ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ -table.gMetadata { -} - table.gMetadata td, table.gMetadata th { border: none; @@ -479,7 +473,7 @@ table.gMetadata td.toggle { /** ******************************************************************* * 6) Navigation and menus - ******************************************************************/ + ****************************************************************** / /* Login menu ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ @@ -494,51 +488,51 @@ table.gMetadata td.toggle { #gSiteMenu { border-bottom: 1px solid #ccc; - clear: both; font-size: 1.2em; - padding-left: 20px; - width: 100%; + padding: 0 20px 0; } -#gItemMenu { - margin: 0 0 20px 20px; - position: absolute; - right: 0; - top: 0; +#gSiteMenu ul { + margin-bottom: 0; } -#gItemMenu #gAlbumLink, -#gItemMenu #gHybridLink, -#gItemMenu #gSlideshowLink, -#gItemMenu #gFullsizeLink { +#gViewMenu li { + float: left; +} + +#gViewMenu #gAlbumLink, +#gViewMenu #gHybridLink, +#gViewMenu #gSlideshowLink, +#gViewMenu #gFullsizeLink { + background-color: #BDD2FF; color: transparent; - height: 1em; + display: block; + height: 22px; overflow: hidden; text-indent: 1000px; white-space: nowrap; - width: 20px; + width: 33px; } -#gItemMenu #gAlbumLink { +#gViewMenu #gAlbumLink { background: url('../images/ico-view-album.png') no-repeat 6px center; } -#gItemMenu #gHybridLink { +#gViewMenu #gHybridLink { background: url('../images/ico-view-hybrid.png') no-repeat 6px center; } -#gItemMenu #gSlideshowLink { +#gViewMenu #gSlideshowLink { background: url('../images/ico-view-slideshow.png') no-repeat 6px center; } -#gItemMenu #gFullsizeLink { +#gViewMenu #gFullsizeLink { background: url('../images/ico-view-fullsize.png') no-repeat center center; } /* Breadcrumbs ~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ #gBreadcrumbs { - height: 32px; padding-left: 20px; } diff --git a/themes/default/views/album.html.php b/themes/default/views/album.html.php index cad41509..addd6c3a 100644 --- a/themes/default/views/album.html.php +++ b/themes/default/views/album.html.php @@ -1,11 +1,6 @@ <? defined("SYSPATH") or die("No direct script access."); ?> <div id="gAlbumHeader"> - <ul id="gItemMenu" class="sf-menu"> - <li><a href="#" id="gAlbumLink" title="<?= _("View album") ?>"><?= _("Album view") ?></a></li> - <li><a href="#" id="gHybridLink" title="<?= _("View album in hybrid mode") ?>"><?= _("Hybrid view") ?></a></li> - <li><?= $theme->album_top() ?></li> - </ul> - + <?= $theme->album_top() ?> <h1><?= $item->title_edit ?></h1> <div class="gDescription"><?= $item->description_edit ?></div> </div> diff --git a/themes/default/views/photo.html.php b/themes/default/views/photo.html.php index 5b4da2b7..8b00f0a5 100644 --- a/themes/default/views/photo.html.php +++ b/themes/default/views/photo.html.php @@ -1,16 +1,11 @@ <? defined("SYSPATH") or die("No direct script access."); ?> <div id="gItemHeader"> - <ul id="gItemMenu" class="sf-menu"> - <li><a href="#" id="gFullsizeLink" title="<?= _("View full size image") ?>"><?= _("View full size image") ?></a></li> - <li><a href="#" id="gHybridLink" title="<?= _("View album in hybrid mode") ?>"><?= _("Hybrid view") ?></a></li> - <li><?= $theme->album_top() ?></li> - </ul> - + <?= $theme->photo_top() ?> <h1><?= $item->title_edit ?></h1> </div> <div id="gItem"> - <img id="gPhotoID-<?= $item->id ?>" alt="photo" src="<?= $item->resize_url() ?>" + <img id="gPhotoID-<?= $item->id ?>" alt="<?= $item->title ?>" src="<?= $item->resize_url() ?>" width="<?= $item->resize_width ?>" height="<?= $item->resize_height ?>" /> <div><?= $item->description_edit ?></div> diff --git a/themes/default/views/sidebar.html.php b/themes/default/views/sidebar.html.php index f05ee025..d030a242 100644 --- a/themes/default/views/sidebar.html.php +++ b/themes/default/views/sidebar.html.php @@ -1,4 +1,10 @@ <? defined("SYSPATH") or die("No direct script access."); ?> -<?= $theme->sidebar_top() ?> +<ul id="gViewMenu" class="sf-menu"> + <li><a href="#" id="gFullsizeLink" title="<?= _("View full size image") ?>"><?= _("View full size image") ?></a></li> + <li><a href="#" id="gAlbumLink" title="<?= _("View album") ?>"><?= _("Album view") ?></a></li> + <li><a href="#" id="gHybridLink" title="<?= _("View album in hybrid mode") ?>"><?= _("Hybrid view") ?></a></li> + <li><?= $theme->sidebar_top() ?></li> +</ul> + <?= $theme->sidebar_blocks() ?> <?= $theme->sidebar_bottom() ?> |