From f6450d8c37f55f3ef3d66eb22cd4e6b6db771f14 Mon Sep 17 00:00:00 2001 From: daitingting Date: Fri, 18 May 2018 10:56:23 +0800 Subject: [PATCH 1/6] * Adjust button. --- module/story/view/activate.html.php | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/module/story/view/activate.html.php b/module/story/view/activate.html.php index e7591a1fae..82bfe8b8c5 100644 --- a/module/story/view/activate.html.php +++ b/module/story/view/activate.html.php @@ -43,11 +43,10 @@ - - + icons['activate']) . ' ' . $lang->story->activate, '', 'btn btn-success'); - echo html::linkButton($lang->goback, $app->session->storyList ? $app->session->storyList : inlink('view', "storyID=$story->id")); + echo html::submitButton($lang->story->activate, '', 'btn btn-wide btn-success'); + echo html::linkButton($lang->goback, $app->session->storyList ? $app->session->storyList : inlink('view', "storyID=$story->id"), '', '', 'btn btn-wide'); ?> From 10433564c2561f19654a246cbd9d14ec8a34d8f3 Mon Sep 17 00:00:00 2001 From: daitingting Date: Fri, 18 May 2018 11:03:45 +0800 Subject: [PATCH 2/6] * Adjust style. --- module/story/css/edit.css | 1 - 1 file changed, 1 deletion(-) diff --git a/module/story/css/edit.css b/module/story/css/edit.css index b3b121cff7..c632e0be00 100644 --- a/module/story/css/edit.css +++ b/module/story/css/edit.css @@ -1,4 +1,3 @@ .col-side .chosen-container .chosen-drop {width: 216px!important} .col-side .chosen-container {width: 218px!important} -#linkStoriesBox > li ,#childStoriesBox > li {margin-left:-56px} .table-form>tbody>tr>th{padding-top:7px;} From 3ca7269f8b369b4a981afbad1b45e2449224bb7a Mon Sep 17 00:00:00 2001 From: daitingting Date: Fri, 18 May 2018 11:06:21 +0800 Subject: [PATCH 3/6] * Adjust btn. --- module/story/view/linkstory.html.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/story/view/linkstory.html.php b/module/story/view/linkstory.html.php index 71a75f01ec..d9a5717c0f 100644 --- a/module/story/view/linkstory.html.php +++ b/module/story/view/linkstory.html.php @@ -67,7 +67,7 @@
- +
id);?>
From 36a1bec64888d043b76ffd124adf9f85ac160c3d Mon Sep 17 00:00:00 2001 From: wangyidong Date: Fri, 18 May 2018 11:07:19 +0800 Subject: [PATCH 4/6] * adjust for style. --- module/testsuite/view/library.html.php | 18 ++++++-------- module/todo/view/edit.html.php | 34 +++++++++++++------------- 2 files changed, 25 insertions(+), 27 deletions(-) diff --git a/module/testsuite/view/library.html.php b/module/testsuite/view/library.html.php index 385b184383..d4b0d9c40a 100644 --- a/module/testsuite/view/library.html.php +++ b/module/testsuite/view/library.html.php @@ -22,7 +22,6 @@ js::set('flow', $this->config->global->flow); config->global->flow == 'onlyTest'):?> diff --git a/module/todo/view/edit.html.php b/module/todo/view/edit.html.php index f9f35c1e15..10a2d0e6f5 100644 --- a/module/todo/view/edit.html.php +++ b/module/todo/view/edit.html.php @@ -19,8 +19,8 @@
- -
+ +
date, "class='form-control form-date'");?> @@ -30,8 +30,8 @@ cycle):?> config = json_decode($todo->config);?>
- -
+ +
- -
+ +
config->end, "class='form-control form-date'");?>
- -
+ +
todo->typeList[$todo->type];?>
- +
todo->priList, $todo->pri, "class='form-control chosen'");?>
- -
+ +
type == 'bug' or $todo->type == 'task') ? 'readonly' : ''; @@ -100,19 +100,19 @@
- -
+ +
desc), "rows='8' class='form-control'");?>
- +
todo->statusList, $todo->status, "class='form-control'");?>
- +
begin, 'onchange=selectNext(); class="form-control chosen"')?>
@@ -127,8 +127,8 @@
- -
+ +
private) echo 'checked';?> /> From 770db7df1313f4f2bcf2d3d178dc4fae652a405e Mon Sep 17 00:00:00 2001 From: liugang Date: Fri, 18 May 2018 11:19:01 +0800 Subject: [PATCH 5/6] * Hide theme menu. --- module/common/model.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/module/common/model.php b/module/common/model.php index 5ca42b2b7f..8486cdbdd3 100644 --- a/module/common/model.php +++ b/module/common/model.php @@ -256,13 +256,13 @@ class commonModel extends model echo "
  • "; } - echo "
  • "; - echo "" . $lang->theme . "
      "; - foreach($app->lang->themes as $key => $value) - { - echo "
    • cookie->theme == $key ? "class='selected'" : '') . ">" . $value . "
      • "; - } - echo '
    • '; + //echo "
  • "; + //echo "" . $lang->theme . "
      "; + //foreach($app->lang->themes as $key => $value) + //{ + // echo "
    • cookie->theme == $key ? "class='selected'" : '') . ">" . $value . "
      • "; + //} + //echo '
    • '; echo "
  • "; echo "" . $lang->lang . "
      "; From 82ce0b3d84d7a43b12d096514a335a094ac0b812 Mon Sep 17 00:00:00 2001 From: daitingting Date: Fri, 18 May 2018 11:27:12 +0800 Subject: [PATCH 6/6] * Add th for actions. --- module/doc/view/browse.html.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/doc/view/browse.html.php b/module/doc/view/browse.html.php index 9c0dc9ade4..a87378a352 100644 --- a/module/doc/view/browse.html.php +++ b/module/doc/view/browse.html.php @@ -54,7 +54,7 @@ var browseType = ''; doc->addedBy;?> doc->addedDate;?> doc->editedDate;?> - + actions;?>