Changeset 12213
- Timestamp:
- Sep 24, 2011, 12:05:07 PM (13 years ago)
- Location:
- extensions/GMaps
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
extensions/GMaps/gmaps_pip.class.inc.php
r12212 r12213 297 297 boundmap:'".l10n('gmaps_i_boundmap')."', 298 298 boundkml:'".l10n('gmaps_i_boundkml')."', 299 loading:'".l10n('gmaps_loading')."' 299 loading:'".l10n('gmaps_loading')."', 300 gmaps_i_show_this_picture_in:'".l10n('gmaps_i_show_this_picture_in')."' 300 301 }, 301 302 requestId:'', -
extensions/GMaps/gmaps_root.class.inc.php
r12212 r12213 235 235 if($id!=0) 236 236 { 237 $sql.=" AND pct.id = '$id'";237 $sql.=" AND (pgcm.categoryId ='$id' or pct.id!='$id' AND pgcm.applySubCat='y') "; 238 238 } 239 239 else 240 240 { 241 $sql.=" AND pgcm.categoryId = 0 ";241 $sql.=" AND pgcm.categoryId = 0 AND pgcm.applySubCat='y' "; 242 242 } 243 $sql.=" AND pgcm.applySubCat='y' 244 ORDER BY priorityRank DESC, pgmm.displayType ASC, pgcm.categoryId ASC, pgcm.imgSort ASC;"; 243 $sql.=" ORDER BY priorityRank DESC, pgmm.displayType ASC, pgcm.categoryId ASC, pgcm.imgSort ASC;"; 245 244 } 246 245 elseif($mode==self::ID_MODE_MAP) … … 259 258 return(false); 260 259 } 261 262 260 $result=pwg_query($sql); 263 261 -
extensions/GMaps/js/gmapsInfoWindow.js
r12204 r12213 93 93 ).append($('<span/>', 94 94 { 95 html: 'gmaps_i_show_this_picture_in'95 html:gmaps.lang.gmaps_i_show_this_picture_in 96 96 } 97 97 ) -
extensions/GMaps/js/gmapsInfoWindow.min.js
r12204 r12213 1 1 /* file: gmapsInfoWindow.js - v1.0.0 | minified on 2011/09/23 with http://jscompress.com/ */ 2 function initInfoWindow(){if($("#iGMapsInfoWindow").length==0){$("body").append($("<div/>",{id:"iGMapsInfoWindow",css:{display:"none"}}).append($("<div/>",{id:"iGMapsInfoWindowContent"}).append($("<div/>",{id:"iGMIWC_title",html:"(title)"})).append($("<table/>",{id:"iGMIWC_thumb"}).append($("<tr/>").append($("<td/>",{css:{width:"28px"}}).append($('<div id="iWALeft"/>'))).append($("<td/>").append($("<img/>",{id:"iGMIWC_img",src:""}))).append($("<td/>",{css:{width:"28px"}}).append($('<div id="iWARight">'))))).append($("<div/>",{id:"iGMIWC_picnum",html:"0/0 photo"})).append($("<div/>",{id:"iGMIWC_showcat",css:{display:"none"}}).append($("<span/>",{html: "gmaps_i_show_this_picture_in"})).append($("<ul/>",{id:"iGMIWC_showcatList"})))))}}2 function initInfoWindow(){if($("#iGMapsInfoWindow").length==0){$("body").append($("<div/>",{id:"iGMapsInfoWindow",css:{display:"none"}}).append($("<div/>",{id:"iGMapsInfoWindowContent"}).append($("<div/>",{id:"iGMIWC_title",html:"(title)"})).append($("<table/>",{id:"iGMIWC_thumb"}).append($("<tr/>").append($("<td/>",{css:{width:"28px"}}).append($('<div id="iWALeft"/>'))).append($("<td/>").append($("<img/>",{id:"iGMIWC_img",src:""}))).append($("<td/>",{css:{width:"28px"}}).append($('<div id="iWARight">'))))).append($("<div/>",{id:"iGMIWC_picnum",html:"0/0 photo"})).append($("<div/>",{id:"iGMIWC_showcat",css:{display:"none"}}).append($("<span/>",{html:gmaps.lang.gmaps_i_show_this_picture_in})).append($("<ul/>",{id:"iGMIWC_showcatList"})))))}} -
extensions/GMaps/main.inc.php
r12212 r12213 2 2 /* 3 3 Plugin Name: GMaps 4 Version: 1.3. 14 Version: 1.3.2 5 5 Description: Display and manage (google) maps 6 6 Plugin URI: http://piwigo.org/ext/extension_view.php?eid=454 … … 116 116 | | | in Gmaps plugin manager 117 117 | | | 118 | | | * mantis bug:2042 119 | | | . Category map is not available if option "apply to 120 | | | subcategories" is not selected 118 121 | | | 119 122 | | |
Note: See TracChangeset
for help on using the changeset viewer.