webcraftmedia/system
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of mojotrollz.eu:system into master2

Browse Source
This commit is contained in:
Ulf Gebhardt 2015-07-01 01:30:13 +02:00
commit b77f6fd190
6 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dbd/sql/mysql/data/system_page.sql
View File

@ -1,3 +1,5 @@
DELETE FROM system_page WHERE `group` = 42;
INSERT INTO `system_page` (`id`, `group`, `name`, `state`, `parent_id`, `login`, `type`, `div`, `url`, `func`, `php_class`) VALUES (0, 42, 'start', 'start', -1, 0, 0, '#content', './sai.php?sai_mod=.SYSTEM.SAI.saistart_sys_sai', 'init_saistart_sys_sai', '\\SYSTEM\\SAI\\saistart_sys_sai');
INSERT INTO `system_page` (`id`, `group`, `name`, `state`, `parent_id`, `login`, `type`, `div`, `url`, `func`, `php_class`) VALUES (1, 42, 'todo', 'start', 0, 1, 0, '#todo_entries', './sai.php?sai_mod=.SYSTEM.SAI.saimod_sys_todo&action=todolist', 'init_saistart_sys_sai_todo', '\\SYSTEM\\SAI\\saistart_sys_sai');
INSERT INTO `system_page` (`id`, `group`, `name`, `state`, `parent_id`, `login`, `type`, `div`, `url`, `func`, `php_class`) VALUES (2, 42, 'log', 'start', 0, 1, 0, '#log_entries', './sai.php?sai_mod=.SYSTEM.SAI.saimod_sys_log&action=filter', 'init_saistart_sys_sai_log', '\\SYSTEM\\SAI\\saistart_sys_sai');

2
dbd/sql/mysql/data/system_text.sql
View File

@ -258,6 +258,7 @@
INSERT INTO `system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time_create`, `time_edit`) VALUES ('basic_placeholder_password', 'jaJA', '丸秘のパスワード', 0, 0, '2015-04-15 18:41:22', '0000-00-00 00:00:00');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_placeholder_password', 'basic');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_placeholder_password', 'sai_login');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_placeholder_password', 'sai_start');
DELETE FROM `system_text` WHERE id = 'basic_placeholder_username';
DELETE FROM `system_text_tag` WHERE id = 'basic_placeholder_username';
@ -269,6 +270,7 @@
INSERT INTO `system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time_create`, `time_edit`) VALUES ('basic_placeholder_username', 'trTR', 'peter@world.org', 0, 0, '2015-04-15 18:29:17', '0000-00-00 00:00:00');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_placeholder_username', 'basic');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_placeholder_username', 'sai_login');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_placeholder_username', 'sai_start');
DELETE FROM `system_text` WHERE id = 'basic_placeholder_search';
DELETE FROM `system_text_tag` WHERE id = 'basic_placeholder_search';

2
sai/modules/saimod_sys_login/tpl/login.tpl
View File

@ -29,5 +29,5 @@
<button class="btn-sm btn btn-primary" style="clear: left; height: 32px; font-size: 13px;" type="submit" id="login_submit"><span class="glyphicon glyphicon-log-in" aria-hidden="true"></span> ${basic_login}</button>
</div>
</form>
<a href="#!login(register)" id="register_link">${basic_text_register}</a></br>
<a href="#!login(register)" id="register_link">${basic_text_register}</a><br/>
<a href="#" id="password_link">${basic_text_password_miss}</a>

4
sai/modules/saimod_sys_todo/saimod_sys_todo.php
View File

@ -143,7 +143,7 @@ class saimod_sys_todo extends \SYSTEM\SAI\SaiModule {
$result['project_closed'] += $data->closed;
$result['project_all'] += $data->all;
}
$result['project'] = round($result['project'] / (count($result['data'])),2);
$result['project'] = sprintf("%.2f",$result['project'] / (count($result['data'])),2);
return $result;
}
@ -157,7 +157,7 @@ class saimod_sys_todo extends \SYSTEM\SAI\SaiModule {
$vars['userstats'] = '';
$userstats = \SYSTEM\DBD\SYS_SAIMOD_TODO_STATS_USERS::QQ();
while($stat = $userstats->next()){
$stat['perc'] = round(($stat['state_closed'] / ($stat['state_open']+$stat['state_closed']))*100,2);
$stat['perc'] = sprintf("%.2f",($stat['state_closed'] / ($stat['state_open']+$stat['state_closed']))*100);
$vars['userstats'] .= \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_todo/tpl/todo_stats_users_entry.tpl'), $stat);
}
return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_todo/tpl/todo_stats.tpl'), $vars);

2
sai/modules/saimod_sys_todo/todo_stats_data.php
View File

@ -11,6 +11,6 @@ class todo_stats_data {
$this->open = $all-$closed;
$this->closed = $closed;
$this->all = $all;
$this->perc = round($this->closed / ($this->all == 0 ? 1 : $this->all) * 100,2);
$this->perc = $this->all == 0 ? 1 : sprintf("%.2f", $this->closed / $this->all * 100);
}
}

1
sai/modules/saistart_sys_sai/tpl/content_loggedin.tpl
View File

@ -56,7 +56,6 @@
</div>
</div>
</div>
<h2 class="muted"><a href="#!login"></a></h2>
</div>
</div>
<div class="row">