Changeset 31107 for extensions/greydragon

Timestamp:

Apr 29, 2015, 9:25:06 PM (9 years ago)

Author:

SergeD

Message:

version 1.2.24 - see changelog for details

Location:

extensions/greydragon

Files:

• changelog.txt (modified) (1 diff)
• css/styles.css (modified) (6 diffs)
• include/greydragon.class.php (modified) (1 diff)
• template/picture.tpl (modified) (2 diffs)
• themeconf.inc.php (modified) (2 diffs)

extensions/greydragon/changelog.txt

@@ -18 +18 @@
 
 === Changelog ===
+version 1.2.24
++ CSS: min width of drop down menu in header bottom menu mode is increased to 20em for better content alignment
+- Fixed navigation arrows photo overlay when thumbnail navigation bar is enabled
+
 version 1.2.23
 + Added Icon tooltips in Icon metadata tab mode. This would also cause title to be shown in metadata overlay window

extensions/greydragon/css/styles.css

@@ -45 +45 @@
 
 /* form */
-legend {font-style:normal;}
-#qsearchInput {margin-left:-20px}
+legend { font-style: normal; }
+#qsearchInput { margin-left: -20px; }
 
 .properties fieldset { padding: 0; margin-left: 8px; margin-right: 8px; }
@@ -93 +93 @@
 .content .titrePage       { padding: 0; margin-bottom: 4px;}
 .content .titrePage h2    { background: none !important; line-height: 20px; padding: 6px 0 0 6px; }
+
+#quickconnect fieldset { margin: 0 10px 0 -10px; border: 2px solid #444444; }
+.categoryActions { margin-right: 14px; margin-top: 0; }
 
 /* menubar */
@@ -125 +128 @@
 #menubar.header-bottom dl { float: left; padding-left: 1em; padding-right: 1em; cursor: pointer; }
 #menubar.header-bottom dl:first-child { margin-left: 8px; padding-left: 0; }
-#menubar.header-bottom dd { position: absolute; z-index: 1000; display: none; float: left; min-width: 160px; padding: 0.5em 0 0.5em 0.5em; margin: 0 0 0 -8px; text-align: left; list-style: none; -webkit-background-clip: padding-box; background-clip: padding-box; }
+#menubar.header-bottom dd { position: absolute; z-index: 1000; display: none; float: left; min-width: 20em; padding: 0.5em 0 0.5em 0.5em; margin: 0 0 0 -8px; text-align: left; list-style: none; -webkit-background-clip: padding-box; background-clip: padding-box; }
 #menubar.header-bottom dl:hover dd { display: block; }
 #menubar.header-bottom #mbAdditionalPages dt { display: none; }
@@ -131 +134 @@
 #menubar.header-bottom #mbAdditionalPages dd ul { margin: 0; list-style-type: none; font-size: 120%; }
 #menubar.header-bottom #mbAdditionalPages dd ul li { float: left; padding-right: 1em; }
+
+#menubar.header-bottom fieldset { border: none; padding: 0 0.5em 0 1em; }
+#menubar.header-bottom fieldset legend { font-size: 1.4em; margin-bottom: 0.5em; }
 
 .header-bottom-menu .contentWithMenu .titrePage { padding-left: 6px; }
@@ -143 +149 @@
 #menubar.top-bar dl:hover dd { display: block; }
 body.top-bar-menu #the_page{ padding-top: 28px; }
-
-#quickconnect FIELDSET { margin: 0 10px 0 -10px; border: 2px solid #444444; }
-.categoryActions { margin-right: 14px; margin-top: 0; }
 
 /* switchers */
@@ -240 +243 @@
 
 #image-metadata-ico { text-align: center; margin-bottom: 1em; }
-#image-metadata-ico.nav-thumb-margin { margin-right: 284px; }
+.nav-thumb-margin #image-metadata-ico { margin-right: 284px; }
 ul.image-metadata-ico    { display: inline-block; margin: 0 auto; padding: 0; list-style: none; height: 30px; }
 ul.image-metadata-ico li { float: left; margin: 0; cursor: pointer; padding: 0px 20px; height: 30px; line-height: 30px; font-weight: bold; overflow: hidden; position: relative; }

extensions/greydragon/include/greydragon.class.php

@@ -3 +3 @@
 if (!defined('PHPWG_ROOT_PATH')) die('Hacking attempt!');
 
-define('GDTHEME_VERSION', '1.2.23');
+define('GDTHEME_VERSION', '1.2.24');
 
 define("QUOTES_NONE",   FALSE);

extensions/greydragon/template/picture.tpl

@@ -105 +105 @@
 </div>{*<!-- imageToolBar -->*}
 
-<div id="theImageAndInfos">
+<div id="theImageAndInfos"{if $DISPLAY_NAV_THUMB} class="nav-thumb-margin"{/if}>
 <div id="theImage">
 {$ELEMENT_CONTENT}
@@ -145 +145 @@
 
 {if $greydragon.p_pict_tab_mode !== "hide" && $overlay_mode == "on"}
-<div id="image-metadata-ico" {if $DISPLAY_NAV_THUMB}class="nav-thumb-margin"{/if}>
+<div id="image-metadata-ico">
   <ul class="image-metadata-ico"> 
     {include file='picture_tab_ico.tpl'}

extensions/greydragon/themeconf.inc.php

@@ -2 +2 @@
 /*
 Theme Name: GreyDragon
-Version: 1.2.23
+Version: 1.2.24
 Description: GreyDragon Theme
 Theme URI: http://piwigo.org/ext/extension_view.php?eid=775
@@ -108 +108 @@
     <style type="text/css">{strip}
       {if $current.selected_derivative}
-      #theImageAndInfos .gd-nav.nav-prev {ldelim} margin-left: -{$current.selected_derivative->get_size()|get_x_half}px !important; top: {$current.selected_derivative->get_size()|get_y_half}px; {rdelim}
-      #theImageAndInfos .gd-nav.nav-next {ldelim} margin-right: -{$current.selected_derivative->get_size()|get_x_half}px !important; top: {$current.selected_derivative->get_size()|get_y_half}px; {rdelim}
+      #theImageAndInfos .gd-nav.nav-prev {ldelim} margin-left: {if $DISPLAY_NAV_THUMB}calc(-142px - {else}-{/if}{$current.selected_derivative->get_size()|get_x_half}px{if $DISPLAY_NAV_THUMB}){/if} !important; top: {$current.selected_derivative->get_size()|get_y_half}px; {rdelim}
+      #theImageAndInfos .gd-nav.nav-next {ldelim} margin-right: {if $DISPLAY_NAV_THUMB}calc(146px - {else}-{/if}{$current.selected_derivative->get_size()|get_x_half}px{if $DISPLAY_NAV_THUMB}){/if} !important; top: {$current.selected_derivative->get_size()|get_y_half}px; {rdelim}
+      {if $DISPLAY_NAV_THUMB}#theImageAndInfos .gd-nav.nav-up {ldelim} margin-left: -182px; {rdelim}{/if}
       {else}
-      #theImageAndInfos .gd-nav.nav-prev {ldelim} margin-left: -30% !important; top: 50%; {rdelim}
-      #theImageAndInfos .gd-nav.nav-next {ldelim} margin-right: -30% !important; top: 50%; {rdelim}
+      #theImageAndInfos .gd-nav.nav-prev {ldelim} margin-left: -32% !important; top: 40%; {rdelim}
+      #theImageAndInfos .gd-nav.nav-next {ldelim} margin-right: -32% !important; top: 40%; {rdelim}
       {/if}
 {*      #theImageAndInfos .gd-nav.nav-zoom {ldelim} top: {$current.selected_derivative->get_size()|get_y_half}px; {rdelim} *}