Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms

module/doc/js/objectlibs.js

@@ -54,7 +54,7 @@ function fullScreen()
             $('#content').addClass('scrollbar-hover');
             $('#content .actions').addClass('hidden');
             $('#content .file-image .right-icon').addClass('hidden');
-            $('#content .files-list .right-icon').addClass('hidden');
+            $('#content .detail').eq(1).addClass('hidden');
             $.cookie('isFullScreen', 1);
         };
         var whenFailEnterFullscreen = function(error)
@@ -92,7 +92,7 @@ function exitFullScreen()
     $('#content').removeClass('scrollbar-hover');
     $('#content .actions').removeClass('hidden');
     $('#content .file-image .right-icon').removeClass('hidden');
-    $('#content .files-list .right-icon').removeClass('hidden');
+    $('#content .detail').eq(1).removeClass('hidden');
     $.cookie('isFullScreen', 0);
 }
 

module/doc/model.php

@@ -1010,7 +1010,7 @@ class docModel extends model
                 }
                 $libs[$docLib->id] = $docLib->name;
 
-                $i++;
+                $i ++;
             }
         }
 
@@ -1983,7 +1983,7 @@ class docModel extends model
   <div class='btn-group'>
     <button data-toggle='dropdown' type='button' class='btn btn-limit' id='currentItem' title='{$objects[$objectID]}'>
     <span class='text'>{$objects[$objectID]}</span> <span class='caret'></span></button><div id='dropMenu' class='dropdown-menu search-list load-indicator' data-ride='searchList'>
-    <div class="input-control search-box has-icon-left has-icon-right search-example"><input type="search" class="form-control search-input"/><label class="input-control-icon-left search-icon"><i class="icon icon-search"></i></label><a class="input-control-icon-right search-clear-btn"><i class="icon icon-close icon-sm"></i></a></div>';
+    <div class="input-control search-box has-icon-left has-icon-right search-example"><input type="search" class="form-control search-input"/><label class="input-control-icon-left search-icon"><i class="icon icon-search"></i></label><a class="input-control-icon-right search-clear-btn"><i class="icon icon-close icon-sm"></i></a></div>
 <div class='list-group'><div class='table-row'><div class='table-col $class'><div class='list-group' style='max-height: $maxHeight'>
 EOT;
             if($type == 'project' and $this->app->openApp == 'doc')
@@ -2175,11 +2175,11 @@ EOT;
         {
             if(!isset($extensionCount[$file->extension])) $extensionCount[$file->extension] = 0;
 
-            $filesCount++;
+            $filesCount ++;
 
             $sizeCount += $file->size;
 
-            $extensionCount[$file->extension]++;
+            $extensionCount[$file->extension] ++;
         }
 
         /* Unit conversion. */
@@ -2187,7 +2187,7 @@ EOT;
         while($sizeCount > 1024)
         {
             $sizeCount = $sizeCount / 1024;
-            $i++;
+            $i ++;
         }
         $unitList  = array('B', 'K', 'M', 'G');
         $sizeCount = round($sizeCount, 1) . $unitList[$i];

module/program/js/edit.js

@@ -51,7 +51,7 @@ $(function()
 
     $('#cancel').click(function()
     {
-        $('#isChangeUnit').val('false');
+        $('#syncPRJUnit').val('false');
         $('#exchangeRate').val('');
     })
 
@@ -69,7 +69,7 @@ $(function()
             return false;
         }
 
-        $('#isChangeUnit').val('true');
+        $('#syncPRJUnit').val('true');
         $('#exchangeRate').val(exchangeRate);
         $('#changeUnitTip').modal('hide');
     })

module/program/model.php

@@ -392,7 +392,7 @@ class programModel extends model
             ->setIF($this->post->budget != 0, 'budget', round($this->post->budget, 2))
             ->join('whitelist', ',')
             ->stripTags($this->config->program->editor->edit['id'], $this->config->allowedTags)
-            ->remove('uid,delta,future,isChangeUnit,exchangeRate')
+            ->remove('uid,delta,future,syncPRJUnit,exchangeRate')
             ->get();
 
         $program  = $this->loadModel('file')->processImgURL($program, $this->config->program->editor->edit['id'], $this->post->uid);
@@ -448,7 +448,7 @@ class programModel extends model
         if(!dao::isError())
         {
             /* If the program changes, the budget unit will be updated to the project and sub-programs simultaneously. */
-            if($program->budgetUnit != $oldProgram->budgetUnit and $_POST['isChangeUnit'] == 'true')
+            if($program->budgetUnit != $oldProgram->budgetUnit and $_POST['syncPRJUnit'] == 'true')
             {
                 $this->dao->update(TABLE_PROJECT)
                     ->set('budgetUnit')->eq($program->budgetUnit)

module/program/view/browsebylist.html.php

@@ -194,7 +194,7 @@ $(function()
 
     $('#programForm').on('tableNestStateChanged', function()
     {
-        /* Ensure visible progress pie inited after toggle nest states */
+        /* Ensure visible progress pie inited after toggle nest states. */
         $('.progress-pie:visible').progressPie();
     });
 });

module/program/view/edit.html.php

@@ -55,7 +55,7 @@
               <?php else:?>
               <span class='input-group-addon'></span>
               <?php echo html::select('budgetUnit', $budgetUnitList, $program->budgetUnit, "class='form-control'");?>
-              <?php echo html::hidden('isChangeUnit', 'false');?>
+              <?php echo html::hidden('syncPRJUnit', 'false');?>
               <?php echo html::hidden('exchangeRate', '');?>
               <?php endif;?>
             </div>