From d620047bbaa2c566333f09b7e0b799609f24eb49 Mon Sep 17 00:00:00 2001 From: wangyidong Date: Tue, 24 Apr 2018 16:11:10 +0800 Subject: [PATCH 1/5] * adjust for admin dev page. --- module/custom/view/ajaxmenu.html.php | 53 +++++++++++++++------------- module/custom/view/flow.html.php | 44 ++++++++++++----------- module/custom/view/required.html.php | 44 ++++++++++++----------- module/custom/view/score.html.php | 37 +++++++++---------- module/custom/view/set.html.php | 36 ++++++++++--------- module/custom/view/working.html.php | 24 +++++++------ 6 files changed, 127 insertions(+), 111 deletions(-) diff --git a/module/custom/view/ajaxmenu.html.php b/module/custom/view/ajaxmenu.html.php index fdb196964d..e6682d01a5 100644 --- a/module/custom/view/ajaxmenu.html.php +++ b/module/custom/view/ajaxmenu.html.php @@ -11,32 +11,35 @@ */ ?> -
-
-
- customMenu ?> +
+
+
+

+ customMenu ?> + +

-
- diff --git a/module/custom/view/flow.html.php b/module/custom/view/flow.html.php index b906fd201d..4a0692fd06 100644 --- a/module/custom/view/flow.html.php +++ b/module/custom/view/flow.html.php @@ -11,31 +11,33 @@ */ ?> -
-
- - - - custom->productProject) ? $config->custom->productProject : '0_0' ?> - - - - - - -
custom->select;?> - custom->productProject->relation as $key => $value):?> -

- -
-
custom->productProject->notice?>
-
-
+
+
+
+ + + + custom->productProject) ? $config->custom->productProject : '0_0' ?> + + + + + + +
custom->select;?> + custom->productProject->relation as $key => $value):?> +

+ +
+
custom->productProject->notice?>
+
+
+
diff --git a/module/custom/view/required.html.php b/module/custom/view/required.html.php index 3ed7744556..b8736cc19a 100644 --- a/module/custom/view/required.html.php +++ b/module/custom/view/required.html.php @@ -11,22 +11,26 @@ */ ?> -
-
- custom->requiredModules as $requiredModule) - { - $requiredModuleName = zget($lang->custom->moduleName, $requiredModule, $lang->$requiredModule->common); - echo "
  • " . html::a(inlink('required', "module=$requiredModule"), $requiredModuleName) . "
    • "; - } - ?> +
    + -
    -
    -
    -
    -
    - $moduleName->common?> +
    + +
    +
    + $moduleName->common?> +
    $requiredField):?> @@ -34,7 +38,7 @@
    custom->getFormFields($moduleName, $method); - + if($moduleName == 'testsuite' and $method == 'createlib') $method = 'createLib'; if($moduleName == 'testsuite' and $method == 'createcase') { @@ -59,14 +63,14 @@
    -
    - + +
    diff --git a/module/custom/view/score.html.php b/module/custom/view/score.html.php index f5f6319945..bd25b56ab4 100644 --- a/module/custom/view/score.html.php +++ b/module/custom/view/score.html.php @@ -10,28 +10,29 @@ */ ?> -
    -
    - - - - - - - - - -
    custom->score;?>custom->scoreStatus, isset($config->global->scoreStatus) ? $config->global->scoreStatus : 0, '', 'block');?>
    - - " . $lang->custom->scoreReset, '', ' id="scoreRefresh" class="btn iframe" data-width="480"', true, true);?> -
    -
    +
    +
    +
    + + + + + + + + + +
    custom->score;?>custom->scoreStatus, isset($config->global->scoreStatus) ? $config->global->scoreStatus : 0, '', 'block');?>
    + + " . $lang->custom->scoreReset, '', ' id="scoreRefresh" class="btn iframe" data-width="480"', true, true);?> +
    +
    +
    diff --git a/module/custom/view/set.html.php b/module/custom/view/set.html.php index 6176e3fa87..3bdc22105c 100644 --- a/module/custom/view/set.html.php +++ b/module/custom/view/set.html.php @@ -31,21 +31,25 @@ EOT; -
    -
    - custom->{$module}->fields as $key => $value) - { - echo "
  • " . html::a(inlink('set', "module=$module&field=$key"), $value) . "
    • "; - } - ?> +
    + -
    -
    -
    -
    -
    - custom->object[$module] . $lang->arrow . $lang->custom->$module->fields[$field]?> +
    + +
    +
    + custom->object[$module] . $lang->arrow . $lang->custom->$module->fields[$field]?> +
    @@ -160,8 +164,8 @@ EOT;
    custom->notice->canNotAdd;?>
    - - + + From 0571e818d908d70b3ecae5f6fc0818f57a487f95 Mon Sep 17 00:00:00 2001 From: wangyidong Date: Tue, 24 Apr 2018 16:17:08 +0800 Subject: [PATCH 2/5] * adjust for cron page. --- module/cron/view/create.html.php | 102 ++++++++++++++++--------------- module/cron/view/edit.html.php | 102 ++++++++++++++++--------------- module/cron/view/index.html.php | 89 +++++++++++++-------------- module/mail/view/test.html.php | 1 + 4 files changed, 148 insertions(+), 146 deletions(-) diff --git a/module/cron/view/create.html.php b/module/cron/view/create.html.php index d54c65b2c5..3f33060fa6 100644 --- a/module/cron/view/create.html.php +++ b/module/cron/view/create.html.php @@ -11,57 +11,59 @@ */ ?> -
    -
    -
    - cron->common?> - cron->create?> +
    +
    +
    +

    + cron->common?> + cron->create?> +

    +
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    cron->m;?>cron->notice->m;?>
    cron->h;?>cron->notice->h;?>
    cron->dom;?>cron->notice->dom;?>
    cron->mon;?>cron->notice->mon;?>
    cron->dow;?>cron->notice->dow;?>
    cron->command;?>
    cron->remark;?>
    cron->type;?>cron->typeList, 'system', "class='form-control'")?>
    +
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    cron->m;?>cron->notice->m;?>
    cron->h;?>cron->notice->h;?>
    cron->dom;?>cron->notice->dom;?>
    cron->mon;?>cron->notice->mon;?>
    cron->dow;?>cron->notice->dow;?>
    cron->command;?>
    cron->remark;?>
    cron->type;?>cron->typeList, 'system', "class='form-control'")?>
    -
    diff --git a/module/cron/view/edit.html.php b/module/cron/view/edit.html.php index 85e80897bc..66072b5604 100644 --- a/module/cron/view/edit.html.php +++ b/module/cron/view/edit.html.php @@ -11,57 +11,59 @@ */ ?> -
    -
    -
    - cron->common?> - cron->edit?> +
    +
    +
    +

    + cron->common?> + cron->edit?> +

    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    cron->m;?>m, "class='form-control' autocomplete='off'")?>cron->notice->m;?>
    cron->h;?>h, "class='form-control' autocomplete='off'")?>cron->notice->h;?>
    cron->dom;?>dom, "class='form-control' autocomplete='off'")?>cron->notice->dom;?>
    cron->mon;?>mon, "class='form-control' autocomplete='off'")?>cron->notice->mon;?>
    cron->dow;?>dow, "class='form-control' autocomplete='off'")?>cron->notice->dow;?>
    cron->command;?>command), "class='form-control' autocomplete='off'")?>
    cron->remark;?>remark, "class='form-control' autocomplete='off'")?>
    cron->type;?>cron->typeList, $cron->type, "class='form-control'")?>
    +
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    cron->m;?>m, "class='form-control' autocomplete='off'")?>cron->notice->m;?>
    cron->h;?>h, "class='form-control' autocomplete='off'")?>cron->notice->h;?>
    cron->dom;?>dom, "class='form-control' autocomplete='off'")?>cron->notice->dom;?>
    cron->mon;?>mon, "class='form-control' autocomplete='off'")?>cron->notice->mon;?>
    cron->dow;?>dow, "class='form-control' autocomplete='off'")?>cron->notice->dow;?>
    cron->command;?>command), "class='form-control' autocomplete='off'")?>
    cron->remark;?>remark, "class='form-control' autocomplete='off'")?>
    cron->type;?>cron->typeList, $cron->type, "class='form-control'")?>
    -
    diff --git a/module/cron/view/index.html.php b/module/cron/view/index.html.php index 33c95dee3d..07075b2ff3 100644 --- a/module/cron/view/index.html.php +++ b/module/cron/view/index.html.php @@ -20,54 +20,52 @@ global->cron)) echo html::a(inlink('turnon'), $lang->cron->turnonList[0], 'hiddenwin', "class='btn'");?>
    -
    +
    global->cron)):?> -
    -
    - cron->list?> -
    - cron->create, '', "class='btn btn-primary'")?> -
    +
    +

    cron->list?>

    +
    + cron->create, '', "class='btn btn-primary'")?>
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    cron->m?>cron->h?>cron->dom?>cron->mon?>cron->dow?>cron->command?>cron->remark?>cron->lastTime?>cron->status?>actions;?>
    m;?>h;?>dom;?>mon;?>dow;?>command;?>remark;?>lastTime, 2);?>cron->statusList, $cron->status, '');?> - command)) echo html::a(inlink('toggle', "id=$cron->id&status=" . ($cron->status == 'stop' ? 'normal' : 'stop')), $cron->status == 'stop' ? $lang->cron->toggleList['start'] : $lang->cron->toggleList['stop'], 'hiddenwin'); - if(!empty($cron->command) and common::hasPriv('cron', 'edit')) echo html::a(inlink('edit', "id=$cron->id"), $lang->edit); - if($cron->buildin == 0 and common::hasPriv('cron', 'delete')) echo html::a(inlink('delete', "id=$cron->id"), $lang->delete, 'hiddenwin'); - ?> -
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    cron->m?>cron->h?>cron->dom?>cron->mon?>cron->dow?>cron->command?>cron->remark?>cron->lastTime?>cron->status?>actions;?>
    m;?>h;?>dom;?>mon;?>dow;?>command;?>remark;?>lastTime, 2);?>cron->statusList, $cron->status, '');?> + command)) echo html::a(inlink('toggle', "id=$cron->id&status=" . ($cron->status == 'stop' ? 'normal' : 'stop')), $cron->status == 'stop' ? $lang->cron->toggleList['start'] : $lang->cron->toggleList['stop'], 'hiddenwin'); + if(!empty($cron->command) and common::hasPriv('cron', 'edit')) echo html::a(inlink('edit', "id=$cron->id"), $lang->edit); + if($cron->buildin == 0 and common::hasPriv('cron', 'delete')) echo html::a(inlink('delete', "id=$cron->id"), $lang->delete, 'hiddenwin'); + ?> +
    cron->notice->help?>
    @@ -81,4 +79,3 @@
    - diff --git a/module/mail/view/test.html.php b/module/mail/view/test.html.php index 1263d4e501..7e0f5f1eb8 100755 --- a/module/mail/view/test.html.php +++ b/module/mail/view/test.html.php @@ -12,6 +12,7 @@ ?> +
    From 3eb0909c4d0757b88df0a63ae8c7d15991df24d7 Mon Sep 17 00:00:00 2001 From: wangyidong Date: Wed, 25 Apr 2018 09:40:09 +0800 Subject: [PATCH 3/5] * adjust for dev page. --- module/dev/css/api.css | 1 - module/dev/css/common.css | 4 +- module/dev/view/api.html.php | 86 ++++++++++++++------------ module/dev/view/db.html.php | 96 +++++++++++++++-------------- module/dev/view/header.html.php | 18 +++--- module/editor/css/edit.css | 3 +- module/editor/css/extend.css | 2 + module/editor/css/index.css | 1 + module/editor/js/edit.js | 5 +- module/editor/js/index.js | 8 ++- module/editor/view/edit.html.php | 34 +++++----- module/editor/view/extend.html.php | 8 +-- module/editor/view/index.html.php | 43 +++++++------ module/editor/view/newpage.html.php | 20 +++--- 14 files changed, 175 insertions(+), 154 deletions(-) diff --git a/module/dev/css/api.css b/module/dev/css/api.css index 5af0574593..e69de29bb2 100644 --- a/module/dev/css/api.css +++ b/module/dev/css/api.css @@ -1 +0,0 @@ -#api { margin-bottom: 10px;} diff --git a/module/dev/css/common.css b/module/dev/css/common.css index b839b0d75e..5715859ac8 100644 --- a/module/dev/css/common.css +++ b/module/dev/css/common.css @@ -1,2 +1,2 @@ -.side .modulegroup {font-weight:bold; padding-top:8px; border-top:1px solid #ddd;} -.side .active {font-weight:bold;} +#sidebar .modulegroup {font-weight:bold; padding-top:8px; border-top:1px solid #ddd;} +#sidebar .active {background-color: #e9f2fb; color: #006af1;} diff --git a/module/dev/view/api.html.php b/module/dev/view/api.html.php index 942d1f72b7..32a5c6bb9c 100644 --- a/module/dev/view/api.html.php +++ b/module/dev/view/api.html.php @@ -1,23 +1,26 @@ -
    -
    -
    dev->moduleList?>
    - dev->groupList as $group => $groupName):?> -
    - - dev->tableList, $module, $module); - ?> - - - +
    + -
    -
    - +
    + - +
    -
    - - - - - - - - - - - - - - - - - - - -
    +
    createLink($selectedModule, $api['name'], $params, 'json'); ?> -
    dev->params?>dev->type?>dev->desc?>
    dev->noParams?>
    +
    +
    + + + + + + + + + + + + + + + + + + +
    dev->params?>dev->type?>dev->desc?>
    dev->noParams?>
    +
    +
    - + +
    diff --git a/module/dev/view/db.html.php b/module/dev/view/db.html.php index 500b1ea07b..7e97cd5db1 100644 --- a/module/dev/view/db.html.php +++ b/module/dev/view/db.html.php @@ -1,49 +1,55 @@ -
    -
    -
    dev->dbList?>
    - dev->groupList as $group => $groupName):?> -
    - $table):?> - dev->tableList, $subTable, $table); - ?> - - - +
    + +
    + +
    +
    +
    + + + + + + + + + + + + + + $field):?> + + + + + + + + + + +
    dev->fields['id']?>dev->fields['name']?>dev->fields['desc']?>dev->fields['type']?>dev->fields['length']?>dev->fields['null']?>
    +
    +
    +
    -
    - - - - - - - - - - - - - - - - - - $field):?> - - - - - - - - - - -
    dev->fields['id']?>dev->fields['name']?>dev->fields['desc']?>dev->fields['type']?>dev->fields['length']?>dev->fields['null']?>
    - -
    diff --git a/module/dev/view/header.html.php b/module/dev/view/header.html.php index caa86c9018..10ab1ccf05 100644 --- a/module/dev/view/header.html.php +++ b/module/dev/view/header.html.php @@ -1,11 +1,11 @@ -
    -
      - '; common::printLink('dev', 'api', "", $lang->dev->api); echo ''; - echo '
    • '; common::printLink('dev', 'db', "", $lang->dev->db); echo '
      • '; - echo "
    • "; common::printLink('editor', 'index', 'type=editor', $lang->dev->editor); echo '
      • '; - ?> -
    + - + diff --git a/module/editor/css/edit.css b/module/editor/css/edit.css index abc3e8d164..b72138a1a8 100644 --- a/module/editor/css/edit.css +++ b/module/editor/css/edit.css @@ -1 +1,2 @@ -.form-condensed textarea.form-control {min-height: 500px; height: auto;} +body{padding-bottom:0px;background-color:#fff;} +.main-content textarea.form-control {min-height: 450px; height: auto;} diff --git a/module/editor/css/extend.css b/module/editor/css/extend.css index b1ba5a96f8..e019a90efa 100644 --- a/module/editor/css/extend.css +++ b/module/editor/css/extend.css @@ -1,3 +1,5 @@ +body{padding-bottom:0px;background-color:#fff;} .expandable > ul {display: none!important} .collapsable > ul {display: block!important} .tree li:before {margin-right: 4px;} +.tree li>a{display:inline;} diff --git a/module/editor/css/index.css b/module/editor/css/index.css index 6456b31bb7..01cd89494e 100644 --- a/module/editor/css/index.css +++ b/module/editor/css/index.css @@ -3,3 +3,4 @@ table tr > td:first-child {padding-left: 0;} table tr > td:last-child {padding-right: 0;} .modulegroup {font-weight:bold; padding-top:8px; border-top:1px solid #ddd;} td.w-200px a:hover {font-weight:bold;} +.w-350px{width:350px;} diff --git a/module/editor/js/edit.js b/module/editor/js/edit.js index f13ed08ae6..6e853d71c2 100644 --- a/module/editor/js/edit.js +++ b/module/editor/js/edit.js @@ -1,4 +1 @@ -$(function() -{ - -}) +$(function(){ }) diff --git a/module/editor/js/index.js b/module/editor/js/index.js index 96c6236e7f..c2b1ddc184 100644 --- a/module/editor/js/index.js +++ b/module/editor/js/index.js @@ -1,8 +1,12 @@ $(function() { - var showHeight = $('.outer').height() - $('#featurebar').height() - 40; + var showHeight = $('#main').height() - $('#mainMenu').height() - 40; $('#editWin').height(showHeight); $('#extendWin').height(showHeight); - $('.panel a.list-group-item').click(function(){$('.panel a.list-group-item.active').removeClass('active'); $(this).addClass('active')}); + $('.side-col a').click(function() + { + $('.side-col a.active').removeClass('active'); + $(this).addClass('active'); + }); }); diff --git a/module/editor/view/edit.html.php b/module/editor/view/edit.html.php index 1f41024665..979d6ebc44 100644 --- a/module/editor/view/edit.html.php +++ b/module/editor/view/edit.html.php @@ -11,17 +11,17 @@ */ ?> -
    '> -
    -
    - - - editor->filePath;?> - - - +
    +
    + + + editor->filePath;?> + +
    -
    +
    +'> +
    @@ -36,7 +36,7 @@
    - +
    editor->fileName;?> @@ -63,15 +63,17 @@
    - - - editor->isOverride?> - + + +
    + +
    +
    -
    diff --git a/module/editor/view/extend.html.php b/module/editor/view/extend.html.php index 9120c40b1b..19d11142e1 100644 --- a/module/editor/view/extend.html.php +++ b/module/editor/view/extend.html.php @@ -11,11 +11,11 @@ */ ?> -
    -
    editor->modules[$module])? $lang->editor->modules[$module] : $module;?>
    -
    +
    +
    editor->modules[$module])? $lang->editor->modules[$module] : $module;?>
    +
    +
    -