Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

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

Browse Source
This commit is contained in:
Catouse
2016-05-04 15:40:34 +08:00
parent 265b6adf9d 3c615c4116
commit c740876991
30 changed files with 126 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/tutorial/css/index.css
+2 -2
View File
@@ -3,9 +3,9 @@
#sidebar {position: absolute; right: 0; top: 0; bottom: 0; width: 300px; background: #f5f5f5; overflow-y: auto; padding-top: 66px; border-left: 1px solid #ddd}
#sidebar > header {background: #3280FC; color: #fff; padding: 15px; position: fixed; top: 0; right: 0; z-index: 10; width: 300px; border-bottom: 1px solid #ddd}
#sidebar > header > h2 {margin: 0 0 0 40px; font-size: 18px; padding: 0; line-height: 36px; color: #fff}
#sidebar > header .start-icon {position: absolute; left: 12px; top: 15px; width: 36px; height: 36px; text-align: center; margin-right: 5px;}
#sidebar > header .start-icon {position: absolute; left: 20px; top: 15px; width: 36px; height: 36px; text-align: center; margin-right: 5px;}
#sidebar > header .start-icon > .icon-front {color: #3280FC; position: absolute; width: 36px; height: 36px; line-height: 36px; top: 0; left: 0; font-size: 12px}
#sidebar > header .start-icon > .icon-back {font-size: 35px; color: #fff; line-height: 36px;}
#sidebar > header .start-icon > .icon-back {font-size: 22px; color: #fff; line-height: 36px;}
#sidebar > header > .actions {position: absolute; right: 15px; top: 15px}
#sidebar > section {padding: 20px 10px; border-top: 1px solid #ddd}
#sidebar > section > h4 {margin: 0 0 10px 0; font-size: 14px; color: #808080; font-weight: normal}
module/tutorial/model.php
+21
View File
@@ -191,4 +191,25 @@ class tutorialModel extends model
$story = $stories[0];
return array($story->id => $story->title);
}
public function getTeamMembers()
{
$member = new stdclass();
$member->project = 1;
$member->account = $this->app->user->account;
$member->role = $this->app->user->role;
$member->join = $this->app->user->join;
$member->days = 10;
$member->hours = 7.0;
$member->totalHours = 70.0;
$member->realname = $this->app->user->realname;
return array($member->account => $member);
}
public function getUserPairs()
{
$users[$this->app->user->account] = $this->app->user->account;
$users['test'] = 'Test';
return $users;
}
}
module/tutorial/view/index.html.php
+1 -1
View File
@@ -36,7 +36,7 @@
<div class='start-icon'><i class='icon icon-certificate icon-back'></i><i class='icon icon-flag icon-front'></i></div>
<h2><?php echo $lang->tutorial->common ?></h2>
<div class='actions'>
<a href='<?php echo helper::createLink('tutorial', 'quit', 'referer=' . base64_encode($referer)) ?>' class='btn btn-sm'><i class="icon icon-signout"></i> <?php echo $lang->tutorial->exit ?></a>
<a href='<?php echo helper::createLink('tutorial', 'quit', 'referer=' . base64_encode($referer)) ?>' class='btn btn-danger btn-sm'><i class="icon icon-signout"></i> <?php echo $lang->tutorial->exit ?></a>
</div>
</header>
<section id='current'>