Changeset 32162

Timestamp:

May 2, 2020, 6:46:21 PM (4 years ago)

Author:

ddtddt

Message:

[manage_properties_photos]

Location:

extensions/manage_properties_photos

Files:

• admin/admin.tpl (modified) (11 diffs)
• initadmin.php (modified) (3 diffs)
• mmp.tpl (modified) (3 diffs)

extensions/manage_properties_photos/admin/admin.tpl

@@ -1 +1 @@
 {combine_script id='jquery.ui.sortable' require='jquery.ui' load='footer' path='themes/default/js/ui/minified/jquery.ui.sortable.min.js'}
 {combine_script id='core.scripts' load='async' path='themes/default/js/scripts.js'}
-{combine_script id='jquery.timepicker' require='jquery.ui.datepicker,jquery.ui.slider' load='footer' path=$ADD_PROP_PHOTO_PATH|@cat:"js/jquery-ui-timepicker-addon.js"}
-{assign var="datepicker_language" value="themes/default/js/ui/i18n/jquery.ui.datepicker-`$lang_info.code`.js"}
-{if "PHPWG_ROOT_PATH"|@constant|@cat:$datepicker_language|@file_exists}
-{combine_script id="jquery.ui.datepicker-$lang_info.code" load='footer' path=$datepicker_language}
-{/if}
+{include file='include/datepicker.inc.tpl'}
 
 {combine_script id='jquery.chosen' load='footer' path='themes/default/js/plugins/chosen.jquery.min.js'}
 {combine_css path="themes/default/js/plugins/chosen.css"}
-
-{combine_css path="themes/default/js/ui/theme/jquery.ui.datepicker.css"}
 {combine_css path="themes/default/js/ui/theme/jquery.ui.slider.css"}
 
@@ -16 +10 @@
 {footer_script}
 jQuery(document).ready(function(){
+
+{* <!-- DATEPICKER --> *}
+jQuery(function(){ {* <!-- onLoad needed to wait localization loads --> *}
+  jQuery('[data-datepicker]').pwgDatepicker({
+    showTimepicker: true,
+    cancelButton: '{'Cancel'|translate}'
+  });
+});
 
   var x = 1;
@@ -53 +55 @@
   
   jQuery('#aip_sumit').click(function(){
-    jQuery("#add_info_edit").show();
+    jQuery("#add_info_edit").toggle();
     jQuery("#leg_add").show();
     jQuery("#leg_edit").hide();
@@ -244 +246 @@
     $(wrapper).on("click",".remove_field", function(e){
         e.preventDefault(); $(this).parent('div').remove(); x--;
-    })
-        
-        $('.dateSelect').datetimepicker({
-                numberOfMonths: 1,
-                changeMonth: true,
-                changeYear: true,
-                yearRange: "1900:+1",
-                dateFormat: "yy-mm-dd",
-                timeText: '{'selection'|@translate|escape:javascript}',
-                hourText: '{'Hour'|@translate|escape:javascript}',
-                minuteText: '{'Minute'|@translate|escape:javascript}',
-                currentText: '{'Now'|@translate|escape:javascript}',
-                closeText: '{'Validate'|@translate|escape:javascript}'
-    });
-        
+    })  
 });
 {/footer_script}
@@ -268 +256 @@
         margin-right:40px;
 }
+#aip_sumit{
+    border: 1px solid #D6D6D6;
+    color: #5B5B5B;
+        padding: 7px 15px;
+        font-weight: bold;
+        font-size: 11px;
+}
+#aip_sumit:hover{
+    border: 1px solid #aaa;
+    text-decoration: none;
+}
+.showCreatempp{
+    text-align: left;
+    margin: 0 1em 25px 20px;
+    line-height: 22px;
+}
 {/html_style}
 
@@ -275 +279 @@
 </div>
 {if isset ($addinfotemplate)}
-        <p class="showCreateAlbum">
-            <a href="#" id="aip_sumit" >{'Create new Property photo'|@translate} </a>
+        <p class="showCreatempp">
+            <a href="#" id="aip_sumit" class="icon-plus">{'Create new Property photo'|@translate} </a>
         </p>
     <div id="add_info_edit" style="display: none;">
         <form method="post" >
-            <fieldset>
+            <fieldset class="with-border">
                 <legend><span id="leg_add">{'Create new Property photo'|@translate}</span><span id="leg_edit">{'Edit Property photo'|@translate}</span></legend>
                 <input id="hideid" data-maxfield="{$MPPMAXFIELD}" type="hidden" name="invisibleID" value="{$addinfo_edit2.AIPID}"></input>
@@ -292 +296 @@
                                 
                 <p id="wordingta" class="input">
-                    <label for="inserwording">{'Wording'|@translate}</label><br />
+                    <label for="inserwording"><strong>{'Wording'|@translate}</strong></label><br />
                     <textarea {if $useED==1}placeholder="{'Use Extended Description tags...'|@translate}"{/if} style="margin-left:50px" rows="5" cols="50" class="description" name="inserwording" id="aip_add">{$addinfo_edit2.AIPDESC}</textarea>
                     {if $useED==1}
@@ -308 +312 @@
                                 </div>
                                 <div id="exifselect" class="exifselect">
+                                  {if empty ($rm_exif)}<span style="margin: 0 0 0 20px">{'The reference photo doesn\'t have exif'|@translate}
+                                  {else}
                                         <select name="selectexif" id="selectexif">
                                                 <option value="">-----</option>
@@ -314 +320 @@
                                                 <option value="{if isset ($rm.RM_SECTION) and ($rm.RM_SECTION)!='1'}{$rm.RM_SECTION}:{/if}{$rm.RM_KEY}">{if isset ($rm.RM_SECTION) and ($rm.RM_SECTION)!='1'}&nbsp;&nbsp;&nbsp;{/if}{$rm.RM_KEY}</option>
                                           {/foreach}
-                                        </select>{if empty ($rm_exif)}<span style="margin: 0 0 0 20px">{'The reference photo doesn\'t have exif'|@translate}{/if}
+                                        </select>
+                                  {/if}
                                 </div>
                                 <div id="iptcselect" class="iptcselect">
+                                  {if empty ($rm_iptc)}<span style="margin: 0 0 0 20px">{'The reference photo doesn\'t have IPTC'|@translate}
+                                  {else}
                                         <select name="selectiptc" id="selectiptc">
                                                 <option value="">-----</option>
@@ -322 +331 @@
                                                   <option value="{$rm.RM_KEY}">{$rm.RM_KEY}</option>
                                                 {/foreach}
-                                        </select>{if empty ($rm_iptc)}<span style="margin: 0 0 0 20px">{'The reference photo doesn\'t have IPTC'|@translate}{/if}
+                                        </select>
+                                  {/if}
                                 </div>
                                 <p class="actionButtons">
-                    <input class="submit" name="submitaddAIP" type="submit" value="{'Submit'|@translate}" />
-                    <a href="#" id="addinfoClose">{'Cancel'|@translate}</a>
+                                        <button name="submitaddAIP" type="submit" class="buttonLike">
+                                                <i class="icon-plus-circled"></i> {'Create'|translate}
+                                        </button>
+                    <a href="#" id="addinfoClose" class="icon-cancel-circled">{'Cancel'|@translate}</a>
                 </p>
             </fieldset>
@@ -376 +388 @@
                                 {/if}
                                 {if $infophoto.AIPTYP==2}
-                                        <td><input type="text" class="dateSelect" id="dateSelect[{$infophoto.IDINFOPHO}]" name="datadate[{$infophoto.IDINFOPHO}]" style="width:120px;" value="{$infophoto.AIPDATA}"></td>
+                                        <td>
+                                          <input type="hidden" name="datadate[{$infophoto.IDINFOPHO}]" value="{$infophoto.AIPDATA}">
+                                          <label>
+                                                <i class="icon-calendar"></i>
+                                                <input type="text" data-datepicker="datadate[{$infophoto.IDINFOPHO}]" readonly>
+                                          </label>
+                                        </td>
                                 {/if}
                                 {if $infophoto.AIPTYP==4}

extensions/manage_properties_photos/initadmin.php

@@ -70 +70 @@
         $template->assign('useED',0);
       }
+                $template->assign('DATADATE', date('Y-m-d').' 10:05:05');
         while ($info_select = pwg_db_fetch_assoc($propertieslist2)){
                 $items = array(
@@ -78 +79 @@
                 if($info_select['Typ']==4||$info_select['Typ']==5){
                         $items['AIPDATAPROP'] =  json_encode(unserialize($info_select['dataprop']));
-                }       
+                }               
                 if($info_select['wording']=="**delpho**"){
                         $items['AIPWORDING'] =l10n('Delete photo');
@@ -84 +85 @@
                 $template->append('info_select', $items);
         }
-         /* $propertieslist[]="------";
-        while ($row = pwg_db_fetch_assoc($propertieslist2)){
-                $propertieslist[$row['Typ']][$row['id_prop_pho']]=trigger_change('AP_render_content', $row['wording']);
-        }*/
         
     $template->set_filename('MMPP', realpath(ADD_PROP_PHOTO_PATH.'mmp.tpl'));

extensions/manage_properties_photos/mmp.tpl

@@ -1 +1 @@
 {combine_script id='jquery.ui.sortable' require='jquery.ui' load='footer' path='themes/default/js/ui/minified/jquery.ui.sortable.min.js'}
 {combine_script id='core.scripts' load='async' path='themes/default/js/scripts.js'}
-{combine_script id='jquery.timepicker' require='jquery.ui.datepicker,jquery.ui.slider' load='footer' path=$ADD_PROP_PHOTO_PATH|@cat:"js/jquery-ui-timepicker-addon.js"}
-{assign var="datepicker_language" value="themes/default/js/ui/i18n/jquery.ui.datepicker-`$lang_info.code`.js"}
-{if "PHPWG_ROOT_PATH"|@constant|@cat:$datepicker_language|@file_exists}
-{combine_script id="jquery.ui.datepicker-$lang_info.code" load='footer' path=$datepicker_language}
-{/if}
+{include file='include/datepicker.inc.tpl'}
 
 {combine_script id='jquery.chosen' load='footer' path='themes/default/js/plugins/chosen.jquery.min.js'}
 {combine_css path="themes/default/js/plugins/chosen.css"}
-
-{combine_css path="themes/default/js/ui/theme/jquery.ui.datepicker.css"}
 {combine_css path="themes/default/js/ui/theme/jquery.ui.slider.css"}
 
 {footer_script}
 jQuery(document).ready(function(){
+
+{* <!-- DATEPICKER --> *}
+jQuery(function(){ {* <!-- onLoad needed to wait localization loads --> *}
+  jQuery('[data-datepicker]').pwgDatepicker({
+    showTimepicker: true,
+    cancelButton: '{'Cancel'|translate}'
+  });
+});
+
   $("input[name=check_MPP]").change(function(){
     if($(this).is(':checked')){
@@ -73 +76 @@
   .change();
   
-        $('.dateSelect').datetimepicker({
-                numberOfMonths: 1,
-                changeMonth: true,
-                changeYear: true,
-                yearRange: "1900:+1",
-                dateFormat: "yy-mm-dd",
-                timeText: '{'selection'|@translate|escape:javascript}',
-                hourText: '{'Hour'|@translate|escape:javascript}',
-                minuteText: '{'Minute'|@translate|escape:javascript}',
-                currentText: '{'Now'|@translate|escape:javascript}',
-                closeText: '{'Validate'|@translate|escape:javascript}'
-    });
-  
 });
 {/footer_script}
@@ -106 +96 @@
   </div>
   <div id="changeproda" style="display: none;" >
-        <input type="text" class="dateSelect" id="dateSelect" name="datadate" style="width:120px;" value="">
+          <input type="hidden" name="datadate" value="{$DATADATE}">
+      <label>
+        <i class="icon-calendar"></i>
+        <input type="text" data-datepicker="datadate" readonly>
+      </label>  
   </div>
   <div id="changeselect" style="display: none;" >