Merge branch 'master' of https://github.com/easysoft/zentaopms

module/block/view/todoblock.html.php

@@ -36,13 +36,13 @@
         <div class="form-group">
           <label for="todoBegin" class="col-sm-2"><?php echo $lang->todo->beginAndEnd?></label>
           <div class="col-sm-4">
-            <select name="begin" id="todoBegin" class="form-control">
+            <select name="begin" id="todoBegin" class="form-control chosen-simple">
               <option value=""><?php echo $lang->todo->lblDisableDate;?></option>
             </select>
           </div>
           <label class="col-sm-1 text-center hide-empty-begin" for="todoEnd"> ~ </label>
           <div class="col-sm-4 hide-empty-begin">
-            <select name="end" id="todoEnd" class="form-control"></select>
+            <select name="end" id="todoEnd" class="form-control chosen-simple"></select>
           </div>
         </div>
         <div class="form-group">
@@ -118,12 +118,12 @@
                       {
                           $control.trigger('chosen:updated');
                       }
-                  });
+                  }).find('[name="begin"]').trigger('chosen:updated');
               });
           };
       }
 
-      $('ul.todoes li .todo-check').click(function()
+      $('.block-todoes').blockTodoes().on('click', '.todo-check', function()
       {
           var $liTag     = $(this).closest('li');
           var isFinished = $liTag.hasClass('active');
@@ -135,8 +135,6 @@
               if(isFinished) $liTag.removeClass('active');
           });
       });
-
-      $('.block-todoes').blockTodoes();
   });
 
   function ajaxCreateTodo(obj)

module/my/view/managecontacts.html.php

@@ -76,8 +76,9 @@
             <tr>
               <th></th>
               <td colspan="2">
-                <label class="checkbox-inline">
-                  <input type="checkbox" name="share" value="1" <?php if($mode != 'new' && in_array($list->id, $globalContacts)) echo 'checked';?>/> <?php echo $lang->my->shareContacts;?>
+                <label class="checkbox-primary">
+                  <input type="checkbox" name="share" value="1" id="shareCheckbox" <?php if($mode != 'new' && in_array($list->id, $globalContacts)) echo 'checked';?>/>
+                  <label for="shareCheckbox"><?php echo $lang->my->shareContacts;?></label>
                 </label>
               </td>
             </tr>

www/js/my.full.js

@@ -1639,44 +1639,41 @@ $(document).ready(function()
 
     // fixStyle();
 
-    // Init tree menu
-    $('.tree').tree({initialState: 'preserve'});
-
     // $(window).resize(saveWindowSize);   // When window resized, call it again.
 
     if(needPing) setTimeout('setPing()', 1000 * 60 * 10);  // After 10 minutes, begin ping.
 
-    initPrioritySelector();
+    // initPrioritySelector();
     // initHotKey();
-    initHelpLink();
+    // initHelpLink();
     checkTutorial();
     revertModuleCookie();
 
     /* Adjust for dropdown position. */
-    $('li.dropdown-submenu').mouseover(function()
-    {
-        $('li.dropdown-submenu > .dropdown-menu').each(function()
-        {
-            if($(this).css('display') == 'block')
-            {
-                var topPosition = $(this).offset().top;
-                if(topPosition < 0) $(this).css('bottom', Number($(this).css('bottom').replace('px', '')) + topPosition);
-            }
-        })
-    })
+    // $('li.dropdown-submenu').mouseover(function()
+    // {
+    //     $('li.dropdown-submenu > .dropdown-menu').each(function()
+    //     {
+    //         if($(this).css('display') == 'block')
+    //         {
+    //             var topPosition = $(this).offset().top;
+    //             if(topPosition < 0) $(this).css('bottom', Number($(this).css('bottom').replace('px', '')) + topPosition);
+    //         }
+    //     })
+    // })
 
-    $.extend({'closeModal':function(callback, location)
-    {
-        $ajaxModal = $('.modal-iframe');
-        $ajaxModal.on('hidden.zui.modal', function()
-        {
-              if(location && (!$ajaxModal.data('cancel-reload')))
-              {
-                if(location == 'this') window.location.reload();
-                else window.location = location;
-              }
-              if(callback && $.isFunction(callback)) callback();
-        });
-        $ajaxModal.modal('hide');
-    }});
+    // $.extend({'closeModal':function(callback, location)
+    // {
+    //     $ajaxModal = $('.modal-iframe');
+    //     $ajaxModal.on('hidden.zui.modal', function()
+    //     {
+    //           if(location && (!$ajaxModal.data('cancel-reload')))
+    //           {
+    //             if(location == 'this') window.location.reload();
+    //             else window.location = location;
+    //           }
+    //           if(callback && $.isFunction(callback)) callback();
+    //     });
+    //     $ajaxModal.modal('hide');
+    // }});
 });