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

module/common/model.php

@@ -256,13 +256,13 @@ class commonModel extends model
                 echo "<li class='divider'></li>";
             }
 
-            echo "<li class='dropdown-submenu'>";
-            echo "<a href='javascript:;'>" . $lang->theme . "</a><ul class='dropdown-menu pull-left'>";
-            foreach($app->lang->themes as $key => $value)
-            {
-                echo "<li " . ($app->cookie->theme == $key ? "class='selected'" : '') . "><a href='javascript:selectTheme(\"$key\");' data-value='" . $key . "'>" . $value . "</a></li>";
-            }
-            echo '</ul></li>';
+            //echo "<li class='dropdown-submenu'>";
+            //echo "<a href='javascript:;'>" . $lang->theme . "</a><ul class='dropdown-menu pull-left'>";
+            //foreach($app->lang->themes as $key => $value)
+            //{
+            //    echo "<li " . ($app->cookie->theme == $key ? "class='selected'" : '') . "><a href='javascript:selectTheme(\"$key\");' data-value='" . $key . "'>" . $value . "</a></li>";
+            //}
+            //echo '</ul></li>';
 
             echo "<li class='dropdown-submenu'>";
             echo "<a href='javascript:;'>" . $lang->lang . "</a><ul class='dropdown-menu pull-left'>";

module/common/view/chosen.html.php

@@ -6,12 +6,11 @@ var defaultChosenOptions = {no_results_text: noResultsMatch, width:'100%', allow
 $(document).ready(function()
 {
     $("#mailto").attr('data-placeholder', chooseUsersToMail);
-    $("#mailto, .chosen, #productID").chosen(defaultChosenOptions).on('chosen:showing_dropdown', function()
+    $("#mailto, #productID").chosen(defaultChosenOptions).on('chosen:showing_dropdown', function()
     {
         var $this = $(this);
         var $chosen = $this.next('.chosen-container').removeClass('chosen-up');
         var $drop = $chosen.find('.chosen-drop');
-        $chosen.toggleClass('chosen-up', $drop.height() + $drop.offset().top - $(document).scrollTop() > $(window).height());
     });
 });
 </script>

module/common/view/markdown.html.php

@@ -12,9 +12,25 @@ $editor['id'] = explode(',', $editor['id']);
 .CodeMirror,.CodeMirror-scroll{min-height:200px!important;}
 .CodeMirror-fullscreen + .editor-preview-side{display:block;}
 .CodeMirror-fullscreen, .editor-preview-side{margin-bottom:40px;}
-.editor-toolbar .icon-html {position: relative; top: -1px;}
-.editor-toolbar .icon-html:before {content:"HTML"; font-size: 12px; padding: 0 2px;}
 .editor-preview-side table > tbody > tr:last-child td{border:1px solid #e5e5e5 !important}
+.editor-toolbar {padding: 1px;}
+.editor-toolbar .icon-html:before {content:"HTML"; font-size: 12px; padding: 0 2px;}
+.editor-toolbar .icon:before {font-size: 14px;}
+.editor-toolbar a.icon:before {line-height: 22px;}
+.editor-toolbar a {opacity: 0.8}
+.editor-toolbar a:hover {opacity: 1}
+.icon-bold:before {content: '\e953';}
+.icon-italic:before {content: '\e955';}
+.icon-header:before {content: '\e954';}
+.icon-quote-left:before {content: '\e96a';}
+.icon-list-ul:before {content: '\e956';}
+.icon-list-ol:before {content: '\e969';}
+.icon-picture:before {content: '\e96c';}
+.icon-table:before {content: '\e96d';}
+.icon-eye-open:before {content: '\e94e';}
+.icon-columns:before {content: '\f0db';}
+.icon-expand-full:before {content: '\e96b';}
+.icon-question-sign:before {content: '\e968';}
 </style>
 
 <script>

module/doc/view/browse.html.php

@@ -54,7 +54,7 @@ var browseType = '<?php echo $browseType;?>';
               <th class="c-user"><?php echo $lang->doc->addedBy;?></th>
               <th class="c-datetime"><?php echo $lang->doc->addedDate;?></th>
               <th class="c-datetime"><?php echo $lang->doc->editedDate;?></th>
-              <th class="c-actions"></th>
+              <th class="c-actions"><?php echo $lang->actions;?></th>
             </tr>
           </thead>
           <tbody>

module/doc/view/createlib.html.php

@@ -21,7 +21,7 @@
       <table class='table table-form'>
         <tr>
           <th class='w-80px'><?php echo $lang->doc->libType?></th>
-          <td><?php echo html::select('libType', $libTypeList, $type, "class='form-control'")?></td>
+          <td><?php echo html::select('libType', $libTypeList, $type, "class='form-control chosen-simple'")?></td>
         </tr>
         <tr class='product'>
           <th><?php echo $lang->doc->product?></th>

module/my/view/buildcontactlists.html.php

@@ -13,7 +13,7 @@
 <?php 
 if($contactLists)
 {
-    echo html::select('', $contactLists, '', "class='form-control chosen' onchange=\"setMailto('mailto', this.value)\"");
+    echo html::select('contactListMenu', $contactLists, '', "class='form-control chosen' onchange=\"setMailto('mailto', this.value)\"");
 }
 else
 {
@@ -23,3 +23,6 @@ else
     echo '</span>';
 }
 ?>
+<style>
+#contactListMenu + .chosen-container {min-width: 100px;}
+</style>

module/todo/view/edit.html.php

@@ -108,16 +108,16 @@
     <div class="row form-group">
       <label class="col-sm-1"><?php echo $lang->todo->status;?></label>
       <div class="col-sm-2">
-        <?php echo html::select('status', $lang->todo->statusList, $todo->status, "class='form-control'");?>
+        <?php echo html::select('status', $lang->todo->statusList, $todo->status, "class='form-control chosen-simple'");?>
       </div>
     </div>
     <div class="row form-group">
       <label class="col-sm-1"><?php echo $lang->todo->beginAndEnd;?></label>
       <div class="col-sm-2" style='padding-right:0px'>
-        <?php echo html::select('begin', $times, $todo->begin, 'onchange=selectNext(); class="form-control chosen"')?>
+        <?php echo html::select('begin', $times, $todo->begin, 'onchange=selectNext(); class="form-control chosen" data-drop_direction="up"')?>
       </div>
       <div class="col-sm-2" style='padding-left:0px'>
-        <?php echo html::select('end', $times, $todo->end, 'class="form-control chosen"');?>
+        <?php echo html::select('end', $times, $todo->end, 'class="form-control chosen" data-drop_direction="up"');?>
       </div>
       <div class="col-sm-4">
         <div class='checkbox-primary dateSwitcher'>

module/tree/css/common.css

@@ -13,4 +13,5 @@
 .col-module .chosen-container-active .chosen-single {border-right-width: 1px; padding-right: 0;}
 .col-shorts .chosen-container-single .chosen-single {border-radius: 0 2px 2px 0;}
 
-#modulesTree li {padding-left: 20px;}
+#modulesTree li {padding-left: 20px;}
+#modulesTree li > .list-toggle {top: 0}

module/tree/view/browse.html.php

@@ -236,7 +236,6 @@ $(function()
     var $tree = $('#modulesTree').tree(options);
 
     var tree = $tree.data('zui.tree');
-    console.log('tree', tree, options);
     if(<?php echo $currentModuleID ?>)
     if(0)
     {