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

module/common/lang/en.php

@@ -122,8 +122,7 @@ $lang->menu->qa      = 'QA|qa|index';
 $lang->menu->doc     = 'Doc|doc|index';
 $lang->menu->report  = 'Report|report|index';
 $lang->menu->company = 'Company|company|index';
-
-$lang->adminMenu = 'Admin|admin|index';
+$lang->menu->admin   = 'Admin|admin|index';
 
 $lang->dividerMenu = ',qa,';
 

module/story/config.php

@@ -47,7 +47,7 @@ $config->story->custom->batchCreateFields = 'module,plan,spec,pri,estimate,revie
 $config->story->custom->batchEditFields   = 'branch,module,plan,estimate,pri,source,stage,closedBy,closedReason';
 
 $config->story->datatable = new stdclass();
-$config->story->datatable->defaultField = array('id', 'pri', 'title', 'plan', 'openedBy', 'assignedTo', 'estimate', 'status', 'stage', 'taskCount', 'bugCount', 'caseCount', 'actions');
+$config->story->datatable->defaultField = array('id', 'pri', 'title', 'plan', 'assignedTo', 'status', 'stage', 'taskCount', 'bugCount', 'caseCount', 'actions');
 
 $config->story->datatable->fieldList['id']['title']    = 'idAB';
 $config->story->datatable->fieldList['id']['fixed']    = 'left';

www/theme/default/style.css

@@ -17,4 +17,8 @@
 .tree li.active>a{background-color:#fff}
 .tree li>a:hover{background-color:#fff}
 .detail-content{padding: 5px 0 0 0px;}
+<<<<<<< HEAD
+#sidebar>.sidebar-toggle>.icon{color:#2196f3}
+=======
 .body-modal .main-header>h2{font-weight:bold;}
+>>>>>>> c4e473df148639a9cb9f22676ae4a9bdc6e640ac