Merge branch 'master' of github.com:hainatravel/information-system

application/views/bootstrap/header.php

@@ -140,7 +140,9 @@
                 value="<?php echo isset($keywords) ? $keywords : false; ?>">
               <button class="btn">搜索</button>
               <?php if (in_array($this->config->item('site_code'), array('jp', 'gm', 'vc', 'vac', 'ru', 'it'))) { ?>
-              <a href="https://multimedia.mycht.cn/" target="_blank"
+              <a href="<?php
+                  $admin_info = $this->session->userdata('session_admin');
+                  echo 'https://multimedia.mycht.cn/authorise/' . $admin_info['OPI_SN'] . '/' . $this->config->item('site_code') ?>" target="_blank"
                 class="btn" title="图片上传管理"><i class="icon-picture"></i></a>
               <?php } else { ?>
               <a href="#" onclick="openKCFinder_singleFile_res();" class="btn" title="快速上传图片"><i

application/views/bootstrap3/header.php

@@ -203,7 +203,10 @@
             <span class="input-group-btn">
               <button class="btn btn-default btn-sm" type="submit">搜索</button>
               <?php if (in_array($this->config->item('site_code'), array('jp', 'gm', 'vc', 'vac', 'ru', 'it'))) { ?>
-                <a href="https://multimedia.mycht.cn/" target="_blank" class="btn btn-default btn-sm" title="图片上传管理"><span
+                <a href="<?php
+                $admin_info = $this->session->userdata('session_admin');
+                echo 'https://multimedia.mycht.cn/authorise/' . $admin_info['OPI_SN'] . '/' . $this->config->item('site_code') ?>"
+                  target="_blank" class="btn btn-default btn-sm" title="多媒体图片"><span
                     class="glyphicon glyphicon-picture"></span></a>
               <?php } else { ?>
                 <a href="#" onclick="openKCFinder_singleFile_res();" class="btn btn-default btn-sm" title="快速上传图片"><span

application/views/mobile_first/ah-gp-form.php

@@ -357,13 +357,10 @@
 						<input type="checkbox" value="yes" name="contact_via_video_appointment" id="Video" class="checkBorder" >
 						<label for="Video">Video appointment</label>
 					</div> 
-   
-   <p style="    clear: both;
-    margin-top: 60px;
-    margin-bottom: -30px; padding: 0;">We require a USD 300 deposit per adult or child charged at adult rates. For single room requests or if traveling with children, please inform us. Additional costs will be added to your balance.</p>
+
     <button class="sendButton" id="submit_gp_form" type="button">Inquire Now</button>
     <input name="total_price" id="totalPriceHidden" type="hidden" value="10000" />
-    <input name="payment_required" id="payment_required" type="hidden" value="required" />
+    <input name="payment_required" id="payment_required" type="hidden" value="" />
     <input name="product_code" type="hidden" value="<?php echo $meta_product_code; ?>"/> 
     <input name="itinerary" type="hidden" value="<?php echo $information->ic_title; ?>" />
     </form>

application/views/mobile_first/ah-lantern-festival-gp-form.php

@@ -333,12 +333,6 @@
 						<label for="Video">Video appointment</label>
 					</div> 
    
-                    <p style="
-    clear: both;
-    margin: 40px 0 -30px 0;
-    font-style: italic;
-    color: #333;
-">A USD 200 deposit is required for each adult/child over 8. Please let us know if you need a single room or if you're traveling with children under 8. Any additional costs will be added to your balance.</p>
     <button class="sendButton" id="submit_gp_form" type="button">Inquire</button>
         <input name="total_price" id="totalPriceHidden" type="hidden" value="10000" />
         <input name="payment_description" type="hidden" value="Booking Yi Peng Festival Mini-Group Tour" />

application/views/mobile_first/ah.php

@@ -654,6 +654,21 @@
         return result;
       }
     </script>
+  <script>
+    (function (w, d, i) {
+      var navbar = d.getElementById(i);
+      var prevScrollpos = w.pageYOffset;
+      w.onscroll = function() {
+        var currentScrollPos = w.pageYOffset;
+        if (prevScrollpos > currentScrollPos) {
+          navbar.style.top = '0';
+        } else {
+          navbar.style.top = '-100px';
+        }
+        prevScrollpos = currentScrollPos;
+      }
+    })(window, document, 'header');
+  </script>
 
   </footer>
   <!--移动底部 结束-->