diff --git a/module/block/view/admin.html.php b/module/block/view/admin.html.php index 463eeff3e5..01a89a8f14 100644 --- a/module/block/view/admin.html.php +++ b/module/block/view/admin.html.php @@ -39,7 +39,7 @@ include '../../common/view/chosen.html.php';
-   +
diff --git a/module/block/view/dashboard.html.php b/module/block/view/dashboard.html.php index c6914f3efb..7a2741cec9 100644 --- a/module/block/view/dashboard.html.php +++ b/module/block/view/dashboard.html.php @@ -38,14 +38,14 @@ $useGuest = $this->app->user->account == 'guest'; @@ -78,14 +78,14 @@ $useGuest = $this->app->user->account == 'guest'; diff --git a/module/block/view/todoblock.html.php b/module/block/view/todoblock.html.php index e508e91628..4d834d0737 100644 --- a/module/block/view/todoblock.html.php +++ b/module/block/view/todoblock.html.php @@ -25,10 +25,10 @@
-
+
- - + +
@@ -47,8 +47,9 @@
-
- +
+ +
diff --git a/module/my/view/editprofile.html.php b/module/my/view/editprofile.html.php index 3fb047d226..1f250130a9 100644 --- a/module/my/view/editprofile.html.php +++ b/module/my/view/editprofile.html.php @@ -18,99 +18,91 @@

my->editProfile;?>

-
- my->form->lblBasic;?> - - - - - - - - - - - - - - - - - -
user->realname;?>realname, "class='form-control' autocomplete='off'");?>user->email;?>email, "class='form-control' autocomplete='off'");?>
user->gender;?>user->genderList, $user->gender);?>user->birthyear;?>birthday,"class='form-date form-control' autocomplete='off'");?>
user->join;?> - join);?> - join);?> -
-
-
- my->form->lblAccount;?> - - - - - - - - - - +
user->account;?>account, "class='form-control' readonly='readonly' autocomplete='off'");?>user->commiter;?>commiter, "class='form-control' autocomplete='off'");?>
user->password;?> - - - safe->mode) ? $lang->user->placeholder->passwordStrength[$config->safe->mode] : '') . "'");?> - - + + + + + + + + + + + + + + + + + - - - -
my->form->lblBasic;?>
user->realname;?>realname, "class='form-control' autocomplete='off'");?>user->email;?>email, "class='form-control' autocomplete='off'");?>
user->gender;?>user->genderList, $user->gender);?>user->birthyear;?>birthday,"class='form-date form-control' autocomplete='off'");?>
user->join;?> + join);?> + join);?> user->password2;?>
- -
- my->form->lblContact;?> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
user->skype;?>skype, "class='form-control' autocomplete='off'");?>user->qq;?>qq, "class='form-control' autocomplete='off'");?>
user->yahoo;?>yahoo, "class='form-control' autocomplete='off'");?>user->gtalk;?>gtalk, "class='form-control' autocomplete='off'");?>
user->wangwang;?>wangwang, "class='form-control' autocomplete='off'");?>user->mobile;?>mobile, "class='form-control' autocomplete='off'");?>
user->phone;?>phone, "class='form-control' autocomplete='off'");?>user->address;?>address, "class='form-control' autocomplete='off'");?>
user->zipcode;?>zipcode, "class='form-control' autocomplete='off'");?>
-
-
- user->verify;?> - - - - - -
user->verifyPassword;?> -
- user->placeholder->verify}'");?> -
-
+
+ + + + + + + + + + + + + + +
my->form->lblAccount;?>
user->account;?>account, "class='form-control' readonly='readonly' autocomplete='off'");?>user->commiter;?>commiter, "class='form-control' autocomplete='off'");?>
user->password;?> + + + safe->mode) ? $lang->user->placeholder->passwordStrength[$config->safe->mode] : '') . "'");?> + + + user->password2;?>
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
my->form->lblContact;?>
user->skype;?>skype, "class='form-control' autocomplete='off'");?>user->qq;?>qq, "class='form-control' autocomplete='off'");?>
user->yahoo;?>yahoo, "class='form-control' autocomplete='off'");?>user->gtalk;?>gtalk, "class='form-control' autocomplete='off'");?>
user->wangwang;?>wangwang, "class='form-control' autocomplete='off'");?>user->mobile;?>mobile, "class='form-control' autocomplete='off'");?>
user->phone;?>phone, "class='form-control' autocomplete='off'");?>user->address;?>address, "class='form-control' autocomplete='off'");?>
user->zipcode;?>zipcode, "class='form-control' autocomplete='off'");?>
+ + + + + + +
user->verify;?>
user->verifyPassword;?> +
+ user->placeholder->verify}'");?> +
diff --git a/module/todo/css/edit.css b/module/todo/css/edit.css index e69de29bb2..f0de69d394 100644 --- a/module/todo/css/edit.css +++ b/module/todo/css/edit.css @@ -0,0 +1,2 @@ +.todoType {margin-top: 6px;} +.dateSwitcher {margin-top: 6px;} diff --git a/module/todo/css/view.css b/module/todo/css/view.css index aff5b64dc7..0873d4764f 100644 --- a/module/todo/css/view.css +++ b/module/todo/css/view.css @@ -1 +1,3 @@ #wrap .outer>table#actionbox>caption {margin-top:0px;} +.table-data tbody > tr > th {width: 80px;} +.modal-footer {text-align: center;} diff --git a/module/todo/view/edit.html.php b/module/todo/view/edit.html.php index 138735f527..5b90b3dc31 100644 --- a/module/todo/view/edit.html.php +++ b/module/todo/view/edit.html.php @@ -78,7 +78,7 @@
-
+
todo->typeList[$todo->type];?>
@@ -109,7 +109,7 @@
- todo->statusList, $todo->status, "class='form-control chosen'");?> + todo->statusList, $todo->status, "class='form-control'");?>
@@ -121,15 +121,19 @@ end, 'class="form-control chosen"');?>
- begin == 2400) echo 'checked';?> > - +
+ begin == 2400) echo 'checked';?> > + +
- private) echo 'checked';?> /> - +
+ private) echo 'checked';?> /> + +
diff --git a/module/todo/view/view.html.php b/module/todo/view/view.html.php index 4ff5808fc0..798851f151 100644 --- a/module/todo/view/view.html.php +++ b/module/todo/view/view.html.php @@ -13,117 +13,118 @@ private or ($todo->private and $todo->account == $app->user->account)):?> -
-
-
- icons['todo']);?> id;?> - name;?> -
+
+
+

createLink('todo', 'view', 'todo=' . $todo->id), "TODO #{$todo->id} {$todo->name}");?>

-
-
-
-
- +
+
+
+
+
todo->desc; if($todo->type == 'bug') echo html::a($this->createLink('bug', 'view', "id={$todo->idvalue}"), ' BUG#' . $todo->idvalue); if($todo->type == 'task') echo html::a($this->createLink('task', 'view', "id={$todo->idvalue}"), ' TASK#' . $todo->idvalue); if($todo->type == 'story') echo html::a($this->createLink('story', 'view', "id={$todo->idvalue}"), ' STORY#' . $todo->idvalue); ?> - -
desc;?>
-
- +
+
desc;?>
+
+
-
-
-
- todo->legendBasic;?> - - - - - - - - - - - - - - - - - - - - - - - - - - assignedTo)):?> - - - - - - - - - -
todo->pri;?>todo->priList[$todo->pri];?>
todo->status;?>todo->statusList[$todo->status];?>
todo->type;?>todo->typeList[$todo->type];?>
todo->account;?>account);?>
todo->date;?>date == '20300101' ? $lang->todo->periods['future'] : date(DT_DATE1, strtotime($todo->date));?>
todo->beginAndEnd;?>begin])) echo $times[$todo->begin]; if(isset($times[$todo->end])) echo ' ~ ' . $times[$todo->end];?>
todo->assignTo;?>assignedTo;?>
todo->assignTo . $lang->todo->date;?>assignedDate;?>
-
+
+
+
+
todo->legendBasic;?>
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + assignedTo)):?> + + + + + + + + + +
todo->pri;?>todo->priList[$todo->pri];?>
todo->status;?>todo->statusList[$todo->status];?>
todo->type;?>todo->typeList[$todo->type];?>
todo->account;?>account);?>
todo->date;?>date == '20300101' ? $lang->todo->periods['future'] : formatTime($todo->date);?>
todo->beginAndEnd;?>begin])) echo $times[$todo->begin]; if(isset($times[$todo->end])) echo ' ~ ' . $times[$todo->end];?>
todo->assignTo;?>assignedTo;?>
todo->assignTo . $lang->todo->date;?>assignedDate, DT_DATE1);?>
+
+
cycle):?> config = json_decode($todo->config);?> -
- todo->cycle;?> - - - - - - - - - -
todo->beginAndEnd?>config->begin . " ~ " . $todo->config->end;?>
todo->cycleConfig?> - config->type == 'day') - { - echo $lang->todo->every . $todo->config->day . $lang->day; - } - elseif($todo->config->type == 'week') - { - foreach(explode(',', $todo->config->week) as $week) echo $lang->todo->dayNames[$week] . ' '; - } - elseif($todo->config->type == 'month') - { - foreach(explode(',', $todo->config->month) as $month) echo $month . ' '; - } - echo '
'; - if($todo->config->beforeDays) printf($lang->todo->lblBeforeDays, $todo->config->beforeDays); - ?> -
-
+
+
todo->cycle;?>
+
+ + + + + + + + + +
todo->beginAndEnd?>config->begin . " ~ " . $todo->config->end;?>
todo->cycleConfig?> + config->type == 'day') + { + echo $lang->todo->every . $todo->config->day . $lang->day; + } + elseif($todo->config->type == 'week') + { + foreach(explode(',', $todo->config->week) as $week) echo $lang->todo->dayNames[$week] . ' '; + } + elseif($todo->config->type == 'month') + { + foreach(explode(',', $todo->config->month) as $month) echo $month . ' '; + } + echo '
'; + if($todo->config->beforeDays) printf($lang->todo->lblBeforeDays, $todo->config->beforeDays); + ?> +
+
+
-
+
account == $app->user->account) { - if($todo->status != 'closed') echo html::a($this->createLink('todo', 'edit', "todoID=$todo->id"), " " . $lang->todo->edit, '', "class='btn showinonlybody'"); - if($todo->status == 'done' || $todo->status == 'closed') echo html::a($this->createLink('todo', 'activate', "todoID=$todo->id"), " " . $lang->todo->activate, 'hiddenwin', "class='btn showinonlybody'"); - if($todo->status == 'done') echo html::a($this->createLink('todo', 'close', "todoID=$todo->id"), " " . $lang->todo->close, 'hiddenwin', "class='btn showinonlybody'"); - echo html::a($this->createLink('todo', 'delete', "todoID=$todo->id"), " " . $lang->todo->delete, 'hiddenwin', "class='btn showinonlybody'"); + if($todo->status != 'closed') echo html::a($this->createLink('todo', 'edit', "todoID=$todo->id"), "", '', "title='{$lang->todo->edit}' class='btn showinonlybody'"); + if($todo->status == 'done' || $todo->status == 'closed') echo html::a($this->createLink('todo', 'activate', "todoID=$todo->id"), "", 'hiddenwin', "title='{$lang->todo->activate}' class='btn showinonlybody'"); + if($todo->status == 'done') echo html::a($this->createLink('todo', 'close', "todoID=$todo->id"), "", 'hiddenwin', "title='{$lang->todo->close}' class='btn showinonlybody'"); + echo html::a($this->createLink('todo', 'delete', "todoID=$todo->id"), "", 'hiddenwin', "title='{$lang->todo->delete}' class='btn showinonlybody'"); - echo html::a('#commentBox', '', '', "title='$lang->comment' onclick='setComment()' class='btn'"); + echo html::a('#commentBox', '', '', "title='{$lang->comment}' onclick='setComment()' class='btn'"); } if($this->session->todoList) @@ -142,7 +143,7 @@ if($todo->status != 'done' && $todo->status != 'closed') { echo "
"; - echo html::a($this->createLink('todo', 'finish', "id=$todo->id", 'html', true), " " . $lang->todo->finish, 'hiddenwin', "class='btn showinonlybody btn-success'"); + echo html::a($this->createLink('todo', 'finish', "id=$todo->id", 'html', true), "", 'hiddenwin', "title='{$lang->todo->finish}' class='btn showinonlybody btn-success'"); $createStoryPriv = common::hasPriv('story', 'create'); $createTaskPriv = common::hasPriv('task', 'create'); $createBugPriv = common::hasPriv('bug', 'create');