From f280ff4b171e1c3b6150794ac8a875b00e4f7522 Mon Sep 17 00:00:00 2001 From: chrisaga Date: Thu, 17 Nov 2005 20:13:36 +0000 Subject: bug 206 fixed: PNG thumbnails clipped with IE - added class="icon" to recent.png (functions_html.inc.php) - added class="button" to al png button images (*.tpl) - changed pngfix.js to only fix icon or button images template improvement: category prettier and simpler (a little bit) - got rid of one SPAN level - content.css more readable git-svn-id: http://piwigo.org/svn/branches/branch-1_5@939 68402e56-0260-453c-a942-63ccdbb3a9ee --- include/functions_html.inc.php | 4 +-- include/pngfix.js | 7 ++-- template/yoga/about.tpl | 2 +- template/yoga/admin/cat_list.tpl | 12 +++---- template/yoga/admin/cat_modify.tpl | 14 ++++---- template/yoga/admin/cat_move.tpl | 2 +- template/yoga/admin/cat_options.tpl | 2 +- template/yoga/admin/cat_perm.tpl | 2 +- template/yoga/admin/configuration.tpl | 2 +- template/yoga/admin/group_list.tpl | 4 +-- template/yoga/admin/maintenance.tpl | 2 +- template/yoga/admin/picture_modify.tpl | 4 +-- template/yoga/admin/remote_site.tpl | 4 +-- template/yoga/admin/thumbnail.tpl | 2 +- template/yoga/admin/update.tpl | 2 +- template/yoga/admin/user_list.tpl | 4 +-- template/yoga/category.tpl | 20 ++++++----- template/yoga/comments.tpl | 2 +- template/yoga/content.css | 61 ++++++++++++++++++---------------- template/yoga/identification.tpl | 10 +++--- template/yoga/notification.tpl | 2 +- template/yoga/password.tpl | 2 +- template/yoga/picture.tpl | 22 ++++++------ template/yoga/popuphelp.tpl | 2 +- template/yoga/profile.tpl | 2 +- template/yoga/register.tpl | 2 +- template/yoga/search.tpl | 4 +-- 27 files changed, 103 insertions(+), 95 deletions(-) diff --git a/include/functions_html.inc.php b/include/functions_html.inc.php index 5fe88fb63..21dcf0834 100644 --- a/include/functions_html.inc.php +++ b/include/functions_html.inc.php @@ -48,8 +48,8 @@ function get_icon( $date ) $title .= $user['recent_period']; $title .= ' '.$lang['days']; $size = getimagesize( $icon_url ); - $output = ''; + $output = '(!)'; } return $output; } diff --git a/include/pngfix.js b/include/pngfix.js index ba1a099ae..a543c09cb 100644 --- a/include/pngfix.js +++ b/include/pngfix.js @@ -6,7 +6,9 @@ function correctPNG() { for(var i=0; i

{lang:About}

diff --git a/template/yoga/admin/cat_list.tpl b/template/yoga/admin/cat_list.tpl index 516917c8e..aac892fd1 100644 --- a/template/yoga/admin/cat_list.tpl +++ b/template/yoga/admin/cat_list.tpl @@ -11,17 +11,17 @@
    • -
    • {lang:jump to}
      • -
    • {lang:edit}
      • +
    • {lang:jump to}
      • +
    • {lang:edit}
      • -
    • {lang:elements}
      • +
    • {lang:elements}
      • -
    • {lang:sub-categories}
      • +
    • {lang:sub-categories}
      • -
    • {lang:permissions}
      • +
    • {lang:permissions}
      • -
    • {lang:delete}
      • +
    • {lang:delete}
    diff --git a/template/yoga/admin/cat_modify.tpl b/template/yoga/admin/cat_modify.tpl index aef85cb37..b25770cc0 100644 --- a/template/yoga/admin/cat_modify.tpl +++ b/template/yoga/admin/cat_modify.tpl @@ -1,7 +1,7 @@
      -
    • (?)
      • +
    • (?)

    {lang:title_edit_cat}

    @@ -9,16 +9,16 @@

    {CATEGORIES_NAV}

      -
    • {lang:jump to}
      • +
    • {lang:jump to}
      • -
    • {lang:elements}
      • +
    • {lang:elements}
      • -
    • {lang:sub-categories}
      • +
    • {lang:sub-categories}
      • -
    • {lang:permissions}
      • +
    • {lang:permissions}
      • -
    • {lang:delete}
      • +
    • {lang:delete}
    @@ -118,7 +118,7 @@ - {lang:Random picture} + {lang:Random picture} diff --git a/template/yoga/admin/cat_move.tpl b/template/yoga/admin/cat_move.tpl index eb6ccde36..cdf913868 100644 --- a/template/yoga/admin/cat_move.tpl +++ b/template/yoga/admin/cat_move.tpl @@ -1,7 +1,7 @@
      -
    • (?)
      • +
    • (?)

    {lang:Move categories}

    diff --git a/template/yoga/admin/cat_options.tpl b/template/yoga/admin/cat_options.tpl index 052b2a99c..dbc2b5353 100644 --- a/template/yoga/admin/cat_options.tpl +++ b/template/yoga/admin/cat_options.tpl @@ -1,7 +1,7 @@
      -
    • (?)
      • +
    • (?)

    {lang:title_cat_options}

    diff --git a/template/yoga/admin/cat_perm.tpl b/template/yoga/admin/cat_perm.tpl index 0bc6efbcb..d531a9ccd 100644 --- a/template/yoga/admin/cat_perm.tpl +++ b/template/yoga/admin/cat_perm.tpl @@ -1,6 +1,6 @@
      -
    • (?)
      • +
    • (?)

    {lang:Manage permissions for a category}

    diff --git a/template/yoga/admin/configuration.tpl b/template/yoga/admin/configuration.tpl index c2985c073..a3e8e9eb7 100644 --- a/template/yoga/admin/configuration.tpl +++ b/template/yoga/admin/configuration.tpl @@ -1,7 +1,7 @@
      -
    • (?)
      • +
    • (?)

    {lang:title_configuration}

    diff --git a/template/yoga/admin/group_list.tpl b/template/yoga/admin/group_list.tpl index 41e76cf3b..fa03cb56e 100644 --- a/template/yoga/admin/group_list.tpl +++ b/template/yoga/admin/group_list.tpl @@ -20,8 +20,8 @@ {group.NAME} {group.MEMBERS} - permissions - delete + permissions + delete diff --git a/template/yoga/admin/maintenance.tpl b/template/yoga/admin/maintenance.tpl index 7fe6c8ab5..692c5204b 100644 --- a/template/yoga/admin/maintenance.tpl +++ b/template/yoga/admin/maintenance.tpl @@ -1,7 +1,7 @@
      -
    • (?)
      • +
    • (?)

    {lang:Maintenance}

    diff --git a/template/yoga/admin/picture_modify.tpl b/template/yoga/admin/picture_modify.tpl index 9cb4af880..b62e08025 100644 --- a/template/yoga/admin/picture_modify.tpl +++ b/template/yoga/admin/picture_modify.tpl @@ -5,9 +5,9 @@
      -
    • {lang:jump to}
      • +
    • {lang:jump to}
      • -
    • {lang:synchronize}
      • +
    • {lang:synchronize}
    diff --git a/template/yoga/admin/remote_site.tpl b/template/yoga/admin/remote_site.tpl index 8f41384f6..69983a32c 100644 --- a/template/yoga/admin/remote_site.tpl +++ b/template/yoga/admin/remote_site.tpl @@ -1,7 +1,7 @@
      -
    • (?)
      • +
    • (?)

    {lang:remote_sites}

    @@ -80,4 +80,4 @@ - \ No newline at end of file + diff --git a/template/yoga/admin/thumbnail.tpl b/template/yoga/admin/thumbnail.tpl index 9e0d70f5e..f551c66be 100644 --- a/template/yoga/admin/thumbnail.tpl +++ b/template/yoga/admin/thumbnail.tpl @@ -1,7 +1,7 @@
      -
    • (?)
      • +
    • (?)

    {lang:title_thumbnails}

    diff --git a/template/yoga/admin/update.tpl b/template/yoga/admin/update.tpl index 1776b1bdd..ad3491ffe 100644 --- a/template/yoga/admin/update.tpl +++ b/template/yoga/admin/update.tpl @@ -2,7 +2,7 @@
      -
    • (?)
      • +
    • (?)

    {lang:title_update}

    diff --git a/template/yoga/admin/user_list.tpl b/template/yoga/admin/user_list.tpl index a3392d6f6..7e15175cb 100644 --- a/template/yoga/admin/user_list.tpl +++ b/template/yoga/admin/user_list.tpl @@ -1,6 +1,6 @@
      -
    • (?)
      • +
    • (?)

    {lang:title_liste_users}

    @@ -90,7 +90,7 @@ {user.EMAIL} {user.GROUPS} - {L_PERMISSIONS} + {L_PERMISSIONS} diff --git a/template/yoga/category.tpl b/template/yoga/category.tpl index 1349c92ce..de46b3d04 100644 --- a/template/yoga/category.tpl +++ b/template/yoga/category.tpl @@ -104,10 +104,10 @@
    •  
      • -
    • {lang:caddie}
      • +
    • {lang:caddie}
      • -
    • {lang:edit}
      • +
    • {lang:edit}

    {TITLE}

    @@ -122,14 +122,15 @@
  • - - + + - {thumbnails.line.thumbnail.IMAGE_ALT} + {thumbnails.line.thumbnail.IMAGE_ALT} - + + {thumbnails.line.thumbnail.element_name.NAME} @@ -140,7 +141,8 @@
    {thumbnails.line.thumbnail.nb_comments.NB_COMMENTS} {L_COMMENT} -     +     +
    • diff --git a/template/yoga/comments.tpl b/template/yoga/comments.tpl index bb4b7726b..725fb6184 100644 --- a/template/yoga/comments.tpl +++ b/template/yoga/comments.tpl @@ -3,7 +3,7 @@
      -
    • {lang:home}
      • +
    • {lang:home}

    {lang:User comments}

    diff --git a/template/yoga/content.css b/template/yoga/content.css index 8ed3d1189..725e5f95d 100644 --- a/template/yoga/content.css +++ b/template/yoga/content.css @@ -29,8 +29,28 @@ BODY#theNotificationPage #content margin-bottom: 1ex; } +/* Thumbnails customization */ +#content UL.thumbnails SPAN, #content UL.thumbnails SPAN.wrap2 A { + width: 140px; /* max thumbnail width + 2px */ +} +#content UL.thumbnails SPAN.wrap2 { + height: 140px; /* max thumbnail height + 2px */ +} +#content UL.thumbnails SPAN.wrap2 { + border: 1px solid #aaaaaa; /* thumbnails border color and style */ + -moz-border-radius: 4px; /* round corners with Geko */ + border-radius: 4px 4px; /* round corners with CSS3 compliant browsers */ +} +#content UL.thumbnails SPAN.wrap2:hover { + border-color: yellow; /* thumbnails border color when mouse cursor is over it */ +} +#content UL.thumbnails SPAN.thumbLegend { + font-size: 80%; /* font size */ + height: 3em; /* max legend height (don't set auto to be Geko friendly)*/ + display: block; /* display: hide if you don't want legend */ + overflow: hidden; /* oversized legend is clipped */ +} /* Thumbnail "elastic" layout */ - #content UL.thumbnails { margin: 0; padding: 0; @@ -39,59 +59,42 @@ BODY#theNotificationPage #content } #content UL.thumbnails LI { display: inline } -#content UL.thumbnails SPAN { +#content UL.thumbnails SPAN.wrap1 { margin: 0 5px 5px 5px; - /*width: 130px; 128px + 2 * 1px if the SPAN has a border of 1px */ - width: 128px; /* we can use the same size as well */ display: table-cell; display: inline-table; display: inline-block; vertical-align: top; /* OK with Opera and IE6 not Geko */ text-align: center; /* to center the thumbnail and legend in Geko/Opera */ - font-size: 80%; } -#content UL.thumbnails SPAN SPAN { +#content UL.thumbnails SPAN.wrap2 { margin: 0; /* important reset the margins */ - border: 1px solid #aaaaaa; - width: 128px; /* fixed size again */ - height: 128px; /* fixed size again */ display: table-cell; /* block prevents vertical-align here */ vertical-align: middle; /* Ok with Opera and Geko not IE6 */ } -#content UL.thumbnails SPAN.wrap { - border: none; - height: auto; /* important for vertical centering */ - display: block; /* important */ - overflow: hidden; /* everridden by specific IE6 rule below */ - margin-top: auto; /* to make vertical-align work in Geko and Opera */ - margin-bottom: auto; /* to make vertical-align work in Geko and Opera */ +#content UL.thumbnails SPAN.wrap2 A { + display: block; + border-bottom: none; } #content UL.thumbnails IMG { margin-bottom: -4px; /* why ??? something wrong with Geko and Opera ignored by IE6*/ } -/* fix Geko's lack of good willing in vertical-align: top */ -/* Too dirty : have to find something better */ -/*#content UL.thumbnails>LI>SPAN{*/ -/* height: 170px;*/ /* unfortunately min-height doesn't work here */ -/*}*/ /* fix IE with another layout */ -* html #content UL.thumbnails SPAN { - overflow: hidden; /* keep it there: not needed by Geko, buggy with Opera */ -} -* html #content UL.thumbnails SPAN SPAN { +* html #content UL.thumbnails SPAN.wrap2 { + display: block; position: relative; + text-align: left; } -* html #content UL.thumbnails SPAN.wrap { +* html #content UL.thumbnails SPAN.wrap2 A { overflow: visible; position: absolute; top: 50%; - left: 0px; /* same as "#content UL.thumbnails SPAN SPAN { padding:" if any*/ + text-align: center; } * html #content UL.thumbnails IMG.thumbnail { position: relative; top: -50%; } - #content .navigationBar, #content .additional_info { margin: 10px 0; text-align: center; @@ -173,7 +176,7 @@ ul.categoryActions { } #content DIV.comment BLOCKQUOTE { - margin: 1em 1em 1em 150px; /* margin-left corresponds to maximum thumbnail width */ + margin: 1em 1em 1em 140px; /* margin-left corresponds to maximum thumbnail width */ border: 1px solid #d3d3d3; border-left: 2px solid gray; padding: 0.5em; diff --git a/template/yoga/identification.tpl b/template/yoga/identification.tpl index ef4fc2e8c..93e425a28 100644 --- a/template/yoga/identification.tpl +++ b/template/yoga/identification.tpl @@ -3,9 +3,9 @@
      -
    • {lang:Forgot your password?}
      • -
    • {lang:register}
      • -
    • {lang:home}
      • +
    • {lang:Forgot your password?}
      • +
    • {lang:register}
      • +
    • {lang:home}

    {lang:Identification}

    @@ -48,8 +48,8 @@

    - {L_REGISTER} - {lang:Forgot your password?} + {L_REGISTER} + {lang:Forgot your password?}

    diff --git a/template/yoga/notification.tpl b/template/yoga/notification.tpl index 974967e62..721b13982 100644 --- a/template/yoga/notification.tpl +++ b/template/yoga/notification.tpl @@ -2,7 +2,7 @@
      -
    • {lang:home}
      • +
    • {lang:home}

    {lang:Notification}

    diff --git a/template/yoga/password.tpl b/template/yoga/password.tpl index e077fa905..685e4e605 100644 --- a/template/yoga/password.tpl +++ b/template/yoga/password.tpl @@ -3,7 +3,7 @@
      -
    • {lang:home}
      • +
    • {lang:home}

    {lang:Password forgotten}

    diff --git a/template/yoga/picture.tpl b/template/yoga/picture.tpl index c9df55eeb..f29362456 100644 --- a/template/yoga/picture.tpl +++ b/template/yoga/picture.tpl @@ -14,32 +14,32 @@
    - {L_SLIDESHOW} - {L_PICTURE_METADATA} + {L_SLIDESHOW} + {L_PICTURE_METADATA} - {lang:representative} + {lang:representative} - {favorite.FAVORITE_ALT} + {favorite.FAVORITE_ALT} - {L_DOWNLOAD} + {L_DOWNLOAD} - {L_ADMIN} + {L_ADMIN} - {lang:caddie} + {lang:caddie}
    - + - {L_UP_ALT} + {L_UP_ALT} - +
    @@ -164,7 +164,7 @@

    - [{L_DELETE}] + [{L_DELETE}]

    diff --git a/template/yoga/popuphelp.tpl b/template/yoga/popuphelp.tpl index 23390c936..6c892312f 100644 --- a/template/yoga/popuphelp.tpl +++ b/template/yoga/popuphelp.tpl @@ -2,4 +2,4 @@ {HELP_CONTENT}
    -

    close

    +

    close

    diff --git a/template/yoga/profile.tpl b/template/yoga/profile.tpl index 400078474..a800cc142 100644 --- a/template/yoga/profile.tpl +++ b/template/yoga/profile.tpl @@ -12,7 +12,7 @@
      -
    • {lang:home}
      • +
    • {lang:home}

    {lang:Profile}

    diff --git a/template/yoga/register.tpl b/template/yoga/register.tpl index 5aa861b41..92f647ff7 100644 --- a/template/yoga/register.tpl +++ b/template/yoga/register.tpl @@ -4,7 +4,7 @@
      -
    • {lang:home}
      • +
    • {lang:home}

    {lang:Registration}

    diff --git a/template/yoga/search.tpl b/template/yoga/search.tpl index 2f5b35dd9..1867cb2c5 100644 --- a/template/yoga/search.tpl +++ b/template/yoga/search.tpl @@ -2,8 +2,8 @@
      -
    • (?)
      • -
    • {lang:home}
      • +
    • (?)
      • +
    • {lang:home}

    {lang:Search}

    -- cgit v1.2.3