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

module/common/lang/en.php

@@ -528,7 +528,7 @@ $lang->icons['product']   = 'cube';
 $lang->icons['bug']       = 'bug';
 $lang->icons['task']      = 'check-sign';
 $lang->icons['tasks']     = 'tasks';
-$lang->icons['project']   = 'folder-close-alt';
+$lang->icons['project']   = 'stack';
 $lang->icons['doc']       = 'file-text';
 $lang->icons['doclib']    = 'folder-close';
 $lang->icons['story']     = 'lightbulb';

module/common/lang/zh-cn.php

@@ -528,7 +528,7 @@ $lang->icons['product']   = 'cube';
 $lang->icons['bug']       = 'bug';
 $lang->icons['task']      = 'check-sign';
 $lang->icons['tasks']     = 'tasks';
-$lang->icons['project']   = 'folder-close-alt';
+$lang->icons['project']   = 'stack';
 $lang->icons['doc']       = 'file-text';
 $lang->icons['doclib']    = 'folder-close';
 $lang->icons['story']     = 'lightbulb';

module/product/css/common.css

@@ -0,0 +1 @@
+#whitelistBox .checkbox-primary, #whitelistBox .radio-inline{margin-left: 10px; display: inline-block; padding-left: 0px; padding-right: 10px;}

module/project/css/create.css

@@ -3,12 +3,12 @@
 #copyProjectModal {padding: 0}
 #copyProjectModal {padding: 0 2px}
 #copyProjectModal > div {position: relative;}
-#copyProjectModal a {display: block; min-height: 30px; line-height: 30px; padding: 5px 15px; border: 1px solid #e5e5e5; color: #333; margin: 5px 0}
+#copyProjectModal a {display: block; min-height: 30px; line-height: 30px; padding: 5px 15px; border: 1px solid #e5e5e5; color: #333; margin: 5px 0; border-radius: 3px;}
 #copyProjectModal a > i {display: inline-block; margin-right: 5px;}
-#copyProjectModal a:hover {border:1px solid #39B3D7; background-color: #E5F9FF; text-decoration: none}
-#copyProjectModal a.active {border-color: #229F24; color: #229F24; background-color: #E5FFE6}
-#copyProjectModal a.active:after {position: absolute; content: '\e60d'; font-family: NewZenIcon; font-size: 20px; right: 25px;}
-#copyProjectModal a.cancel {color: #D2322D}
+#copyProjectModal a:hover {border:1px solid #00a9fc; background-color: #E9F2FB; text-decoration: none}
+#copyProjectModal a.active {border-color: #00da88; color: #00da88; background-color: #E5FFE6}
+#copyProjectModal a.active:after {position: absolute; content: '\e92f'; font-family: ZentaoIcon; font-size: 20px; right: 25px;}
+#copyProjectModal a.cancel {color: #ff5d5d}
 
 .modal-dialog {margin-top: 10%!important;}
 

module/project/view/create.html.php

@@ -39,7 +39,7 @@
     <div class='main-header'>
       <h2><?php echo $lang->project->create;?></h2>
       <div class="pull-right btn-toolbar">
-        <button type='button' class='btn btn-link' id='cpmBtn'><?php echo html::icon($lang->icons['copy']) . ' ' . $lang->project->copy;?></button>
+        <button type='button' class='btn btn-link' id='cpmBtn'><?php echo html::icon($lang->icons['copy'], 'muted') . ' ' . $lang->project->copy;?></button>
       </div>
     </div>
     <form class='form-indicator main-form' method='post' target='hiddenwin' id='dataform'>
@@ -150,12 +150,12 @@
 <div class='modal fade' id='copyProjectModal'>
   <div class='modal-dialog mw-800px'>
     <div class='modal-header'>
-      <button type='button' class='close' data-dismiss='modal'>&times;</button>
+      <button type='button' class='close' data-dismiss='modal'><i class="icon icon-close"></i></button>
       <h4 class='modal-title' id='myModalLabel'><?php echo $lang->project->copyTitle;?></h4>
     </div>
     <div class='modal-body'>
       <?php if(count($projects) == 1):?>
-      <div class='alert alert-warning with-icon'>
+      <div class='alert with-icon'>
         <i class='icon-exclamation-sign'></i>
         <div class='content'><?php echo $lang->project->copyNoProject;?></div>
       </div>

module/score/css/reset.css

@@ -0,0 +1 @@
+.alert{margin-bottom:0px;}

module/score/view/reset.html.php

@@ -11,7 +11,7 @@
 ?>
 <?php include '../../common/view/header.html.php'; ?>
 <div class="alert with-icon" id="scoreStart">
-  <i class="icon-inbox"></i>
+  <i class="icon-cube"></i>
   <div class="content">
     <p><?php echo $lang->score->resetTips; ?></p>
     <p><button class="btn btn-primary" id="scoreReset"><?php echo $lang->score->resetStart; ?></button></p>

module/story/view/edit.html.php

@@ -146,8 +146,10 @@
               <tr>
                 <th><?php echo $lang->story->mailto;?></th>
                 <td>
-                  <?php echo html::select('mailto[]', $users, str_replace(' ' , '', $story->mailto), "class='form-control' multiple");?>
-                  <?php echo $this->fetch('my', 'buildContactLists')?>
+                  <div class='input-group'>
+                    <?php echo html::select('mailto[]', $users, str_replace(' ' , '', $story->mailto), "class='form-control' multiple");?>
+                    <div class='input-group-btn'><?php echo $this->fetch('my', 'buildContactLists')?></div>
+                  </div>
                 </td>
               </tr>
             </table>

module/task/view/edit.html.php

@@ -126,8 +126,10 @@
               <tr>
                 <th><?php echo $lang->task->mailto;?></th>
                 <td>
-                <?php echo html::select('mailto[]', $project->acl == 'private' ? $members : $users, str_replace(' ' , '', $task->mailto), 'class="form-control" multiple');?>
-                <?php echo $this->fetch('my', 'buildContactLists');?>
+                  <div class='input-group'>
+                    <?php echo html::select('mailto[]', $project->acl == 'private' ? $members : $users, str_replace(' ' , '', $task->mailto), 'class="form-control" multiple');?>
+                    <div class='input-group-btn'><?php echo $this->fetch('my', 'buildContactLists');?></div>
+                  </div>
                 </td>
               </tr>
             </table>

module/webhook/view/browse.html.php

@@ -12,7 +12,7 @@
 ?>
 <?php include 'header.html.php';?>
 <?php js::set('confirmDelete', $lang->webhook->confirmDelete);?>
-<div id='mainContent' class='main-content'>
+<div id='mainContent'>
   <form class='main-table' id='ajaxForm' method='post'>
     <table id='webhookList' class='table has-sort-head table-fixed'>
       <thead>
@@ -34,12 +34,12 @@
           <td class='text' title='<?php echo $webhook->url;?>'><?php echo $webhook->url;?></td>
           <td class='c-actions'>
             <?php
-            common::printIcon('webhook', 'log', "webhookID=$id", '', 'list', 'file-text');
+            common::printIcon('webhook', 'log', "webhookID=$id", '', 'list', 'file-text2');
             common::printIcon('webhook', 'edit', "webhookID=$id", '', 'list');
             if(common::hasPriv('webhook', 'delete'))
             {
                 $deleteURL = $this->createLink('webhook', 'delete', "webhookID=$id&confirm=yes");
-                echo html::a("javascript:ajaxDelete(\"$deleteURL\",\"webhookList\",confirmDelete)", '<i class="icon-trash"></i>', '', "title='{$lang->webhook->delete}' class='btn btn-link'");
+                echo html::a("javascript:ajaxDelete(\"$deleteURL\",\"webhookList\",confirmDelete)", '<i class="icon-trash"></i>', '', "title='{$lang->webhook->delete}' class='btn'");
             }
             ?>
           </td>

module/webhook/view/header.html.php

@@ -25,7 +25,7 @@
   <div class='btn-toolbar pull-right'>
     <div class='btn-group'>
       <div class='btn-group' id='createActionMenu'>
-        <?php common::printIcon('webhook', 'create', '', '', 'button', '', '', 'btn-primary');?>
+        <?php if(common::hasPriv('webhook', 'create')) echo html::a($this->createLink('webhook', 'create'), "<i class='icon-plus'></i> {$lang->webhook->create}", '', "class='btn btn-primary'");?>
       </div>
     </div>
   </div>