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

sai menu fix, buttons not hardcoded anymore

Browse Source
This commit is contained in:
Messerbill 2015-06-01 17:18:42 +02:00
parent 372ad45485
commit f1c138da85
18 changed files with 86 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sai/modules/saimod_sys_git/saimod_sys_git.php
View File

@ -32,7 +32,7 @@ class saimod_sys_git extends \SYSTEM\SAI\SaiModule {
}
//public static function html_li_menu(){return '<li><a id="menu_git" href="#!git"><span class="glyphicon glyphicon-saved" aria-hidden="true"></span>${sai_menu_git}</a></li>';}
public static function html_li_menu(){return '<li><a id="menu_git" href="#!git"><span class="glyphicon glyphicon-saved" aria-hidden="true"></span></a></li>';}
public static function html_li_menu(){return '</ul><ul class="nav navbar-nav navbar-right sai_left_divider"><li><a id="menu_git" href="#!git"><span class="glyphicon glyphicon-saved" aria-hidden="true"></span></a></li>';}
public static function right_public(){return false;}
public static function right_right(){return \SYSTEM\SECURITY\Security::check(\SYSTEM\SECURITY\RIGHTS::SYS_SAI);}

10
sai/modules/saimod_sys_log/tpl/saimod_sys_log.tpl
View File

@ -5,9 +5,9 @@
<li class="active"><a href="#!log" id="menu_loglist">${basic_log}</a></li>
<li><a href="#!log(stats)" id="menu_stats">${basic_analytics}</a></li>
<img id="loader" src="${PICPATH}ajax-loader.gif" style="margin-left: 10px; margin-top: 10px; display: none; float: left"/>
<button onClick="system.load('log',true);" class="btn-success btn btn-sm" style="margin-right: 15px; height: 32px; font-size: 13px; float: right;"><span class="glyphicon glyphicon-refresh" aria-hidden="true"></span>&nbsp;${refresh}</button>
</ul>
<div class="tab-content">
<div class="tab-pane active" id="tab_log"></div>
<button onClick="system.load('log',true);" class="btn-success btn btn-sm" style="margin-right: 15px; height: 32px; font-size: 13px; float: right;"><span class="glyphicon glyphicon-refresh" aria-hidden="true"></span>&nbsp;${basic_refresh}</button>
</ul><br>
<div class="tab-content">
<div class="tab-pane active" id="tab_log"></div>
</div>
</div>
</div>

2
sai/modules/saimod_sys_login/saimod_sys_login.php
View File

@ -39,7 +39,7 @@ class saimod_sys_login extends \SYSTEM\SAI\SaiModule {
return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_login/tpl/register.tpl'), $vars);}
//public static function html_li_menu(){return '<li><a id="menu_login" href="#!login">'.(\SYSTEM\SECURITY\Security::isLoggedIn() ? '<span class="glyphicon glyphicon-log-out" aria-hidden="true"></span> ${sai_menu_logout}' : '<span class="glyphicon glyphicon-log-in" aria-hidden="true"></span> ${sai_menu_login}').'</a></li>';}
public static function html_li_menu(){return '<li><a id="menu_login" href="#!login">'.(\SYSTEM\SECURITY\Security::isLoggedIn() ? '<span class="glyphicon glyphicon-log-out" aria-hidden="true"></span>' : '<span class="glyphicon glyphicon-log-in" aria-hidden="true"></span>').'</a></li>';}
public static function html_li_menu(){return '<li class="sai_left_divider"><a id="menu_login" href="#!login">'.(\SYSTEM\SECURITY\Security::isLoggedIn() ? '<span class="glyphicon glyphicon-log-out" aria-hidden="true"></span>' : '<span class="glyphicon glyphicon-log-in" aria-hidden="true"></span>').'</a></li>';}
public static function right_public(){return true;}
public static function right_right(){return true;}

6
sai/modules/saimod_sys_security/saimod_sys_security.php
View File

@ -15,13 +15,13 @@ class saimod_sys_security extends \SYSTEM\SAI\SaiModule {
$res = \SYSTEM\DBD\SYS_SAIMOD_SECURITY_RIGHTS::QQ();
while($r = $res->next()){
$r['right_edit_btn'] = \SYSTEM\SECURITY\Security::check(\SYSTEM\SECURITY\RIGHTS::SYS_SAI_SECURITY_RIGHTS_EDIT) ?
'<button type="submit" class="btn btn-sm btn-danger right_delete" onClick="system.load(\'security(delright);id.'.$r['ID'].'\');"><span class="glyphicon glyphicon-trash" aria-hidden="true"></span> delete</button>
<button type="submit" class="btn btn-sm btn-default right_edit" right_id="'.$r['ID'].'"><span class="glyphicon glyphicon-pencil" aria-hidden="true"></span> edit</button>' :
'<button type="submit" class="btn btn-sm btn-danger right_delete" onClick="system.load(\'security(delright);id.'.$r['ID'].'\');"><span class="glyphicon glyphicon-trash" aria-hidden="true"></span> ${basic_delete}</button>
<button type="submit" class="btn btn-sm btn-default right_edit" right_id="'.$r['ID'].'"><span class="glyphicon glyphicon-pencil" aria-hidden="true"></span> ${basic_edit}</button>' :
'<font color="red">Missing rights.</font>';
$rows .= \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_security/tpl/saimod_sys_security_right.tpl'),$r);}
$vars['rows'] = $rows;
$vars['addright_btn'] = \SYSTEM\SECURITY\Security::check(\SYSTEM\SECURITY\RIGHTS::SYS_SAI_SECURITY_RIGHTS_EDIT) ?
'<br><button type="submit" onClick="system.load(\'security(newright)\');" class="btn btn-sm"><span class="glyphicon glyphicon-plus" aria-hidden="true"></span> New Right</button>' :
'<br><button type="submit" onClick="system.load(\'security(newright)\');" class="btn btn-sm"><span class="glyphicon glyphicon-plus" aria-hidden="true"></span> ${basic_new_right}</button>' :
'<font color="red">You are missing the required rights for adding or removing rights.</font>';
return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_security/tpl/saimod_sys_security_rights.tpl'),$vars);
}

2
sai/modules/saimod_sys_security/tpl/saimod_sys_security.tpl
View File

@ -5,7 +5,7 @@
<li class="active"><a href="#!security" id="menu_users">Users</a></li>
<li><a href="#!security(rights)" id="menu_rights">Rights</a></li>
<img id="loader" src="${PICPATH}ajax-loader.gif" style="margin-left: 10px; margin-top: 10px; display: none; float: left"/>
<button class="btn-sm btn btn-success" id="user_go" type="submit" style="float: right; margin-left: 10px;"><span class="glyphicon glyphicon-search" aria-hidden="true"></span> ${search}</button>
<button class="btn-sm btn btn-success" id="user_go" type="submit" style="float: right; margin-left: 10px;"><span class="glyphicon glyphicon-search" aria-hidden="true"></span> ${basic_search}</button>
<input class="input-medium search-query" id="user_search" type="text" placeholder="EMail or Username" size="30" style="float: right;"/>
</ul>
<div class="tab-content">

4
sai/modules/saimod_sys_security/tpl/saimod_sys_security_deleteright.tpl
View File

@ -13,5 +13,5 @@
<td>${description}</td>
</tr>
</table>
<button id="deleteright_confirm" class="btn-danger btn btn-sm" right_id="${ID}" type="submit"><span class="glyphicon glyphicon-trash" aria-hidden="true"></span> ${delete}</button>
<button id="deleteright_abort" onClick="system.load('security(rights)');" class="btn-default btn btn-sm" type="submit"><span class="glyphicon glyphicon-remove-sign" aria-hidden="true"></span> ${abort}</button>
<button id="deleteright_confirm" class="btn-danger btn btn-sm" right_id="${ID}" type="submit"><span class="glyphicon glyphicon-trash" aria-hidden="true"></span> ${basic_delete}</button>
<button id="deleteright_abort" onClick="system.load('security(rights)');" class="btn-default btn btn-sm" type="submit"><span class="glyphicon glyphicon-remove-sign" aria-hidden="true"></span> ${basic_abort}</button>

2
sai/modules/saimod_sys_security/tpl/saimod_sys_security_newright.tpl
View File

@ -13,4 +13,4 @@
<td><input id="addright_description" type="text"/></td>
</tr>
</table>
<button id="addright" class="btn btn-sm btn-default" type="submit"><span class="glyphicon glyphicon-plus" aria-hidden="true"></span> ${add}</button>
<button id="addright" class="btn btn-sm btn-default" type="submit"><span class="glyphicon glyphicon-plus" aria-hidden="true"></span> ${basic_add}</button>

2
sai/modules/saimod_sys_security/tpl/saimod_sys_security_user.tpl
View File

@ -11,6 +11,6 @@
<input type="submit" class="btn-danger" value="delete" user="${id}" action="delete">
</td>-->
<td>
<button type="submit" class="btn-sm btn btn-success" value="reset_password" user="${id}" email="${email}"><span class="glyphicon glyphicon-envelope" aria-hidden="true"></span> send EMail</button>
<button type="submit" class="btn-sm btn btn-success" value="reset_password" user="${id}" email="${email}"><span class="glyphicon glyphicon-envelope" aria-hidden="true"></span> ${basic_send_email}</button>
</td>
</tr>

2
sai/modules/saimod_sys_security/tpl/saimod_sys_security_user_rights_add.tpl
View File

@ -1,4 +1,4 @@
<tr>
<td colspan="4"><select id="adduserright_rightid">${right_options}</select></td>
<td><button type="submit" id="adduserright_add" class="btn-sm btn btn-success" user_id="${user_id}"><span class="glyphicon glyphicon-plus" aria-hidden="true"></span> {add_right}</button></td>
<td><button type="submit" id="adduserright_add" class="btn-sm btn btn-success" user_id="${user_id}"><span class="glyphicon glyphicon-plus" aria-hidden="true"></span> ${basic_add_right}</button></td>
</tr>

6
sai/modules/saimod_sys_todo/tpl/saimod_sys_todo.tpl
View File

@ -6,9 +6,9 @@
<li><a href="#!todo(doto)" id="menu_doto">DoTo</a></li>
<li><a href="#!todo(stats)" id="menu_stats">Statistics</a></li>
<img id="img_loader" src="${PICPATH}ajax-loader.gif" style="margin-left: 10px; margin-top: 10px; display: none; float: left"/>
<button id="btn_refresh" class="btn-primary btn btn-sm" onClick="system.load('todo',true);" style="margin-right: 15px; height: 32px; font-size: 13px; float: right;"><span class="glyphicon glyphicon-refresh" aria-hidden="true"></span> ${refresh}</button>
<button id="btn_close_all" class="btn-danger btn btn-sm" style="margin-right: 15px; height: 32px; font-size: 13px; float: right;"><span class="glyphicon glyphicon-minus-sign" aria-hidden="true"></span> ${close_all}</button>
<button id="btn_new" class="btn-success btn btn-sm" onClick="system.load('todo(new)');" style="margin-right: 15px; height: 32px; font-size: 13px; float: right;"><span class="glyphicon glyphicon-plus" aria-hidden="true"></span> ${add}</button>
<button id="btn_refresh" class="btn-primary btn btn-sm" onClick="system.load('todo',true);" style="margin-right: 15px; height: 32px; font-size: 13px; float: right;"><span class="glyphicon glyphicon-refresh" aria-hidden="true"></span> ${basic_refresh}</button>
<button id="btn_close_all" class="btn-danger btn btn-sm" style="margin-right: 15px; height: 32px; font-size: 13px; float: right;"><span class="glyphicon glyphicon-minus-sign" aria-hidden="true"></span> ${basic_close_all}</button>
<button id="btn_new" class="btn-success btn btn-sm" onClick="system.load('todo(new)');" style="margin-right: 15px; height: 32px; font-size: 13px; float: right;"><span class="glyphicon glyphicon-plus" aria-hidden="true"></span> ${basic_add}</button>
</ul>
<div class="tab-content">
<div class="tab-pane active" id="tab_todo"></div>

4
sai/modules/saimod_sys_todo/tpl/saimod_sys_todo_new.tpl
View File

@ -1,5 +1,5 @@
<table class="table table-hover table-condensed">
<tr><td>Message</td><td><textarea style="width: 80%; height: 400px;" id="input_message"></textarea></td></tr>
</table>
<button id="btn_back" class="btn btn-sm btn-success" onClick="system.load('todo');" style="margin-right: 15px; height: 32px; font-size: 13px; float: left;"><span class="glyphicon glyphicon-chevron-left" aria-hidden="true"></span> Back</button>
<button id="btn_add" class="btn btn-sm btn-danger" style="margin-right: 15px; height: 32px; font-size: 13px; float: right;"><span class="glyphicon glyphicon-plus" aria-hidden="true"></span> Add</button>
<button id="btn_back" class="btn btn-sm btn-success" onClick="system.load('todo');" style="margin-right: 15px; height: 32px; font-size: 13px; float: left;"><span class="glyphicon glyphicon-chevron-left" aria-hidden="true"></span> ${basic_back}</button>
<button id="btn_add" class="btn btn-sm btn-danger" style="margin-right: 15px; height: 32px; font-size: 13px; float: right;"><span class="glyphicon glyphicon-plus" aria-hidden="true"></span> ${basic_add}</button>

6
sai/modules/saimod_sys_todo/tpl/saimod_sys_todo_todo.tpl
View File

@ -21,6 +21,6 @@
<tr><td>thrown</td><td>${thrown}</td></tr>
<tr><td>message</td><td>${message}</td></tr>
</table>
<button id="btn_back" onClick="system.load('todo');" class="btn btn-sm btn-success" style="margin-right: 15px; height: 32px; font-size: 13px; float: left;"><span class="glyphicon glyphicon-chevron-left" aria-hidden="true"></span> Back</button>
<button id="btn_close" class="btn btn-sm btn-danger" style="display: none; margin-right: 15px; height: 32px; font-size: 13px; float: right;" todo="${ID}"><span class="glyphicon glyphicon-remove-sign" aria-hidden="true"></span> Close</button>
<button id="btn_open" class="btn btn-sm btn-danger" style="display: none; margin-right: 15px; height: 32px; font-size: 13px; float: right;" todo="${ID}"><span class="glyphicon glyphicon-plus-sign" aria-hidden="true"></span> Open</button>
<button id="btn_back" onClick="system.load('todo');" class="btn btn-sm btn-success" style="margin-right: 15px; height: 32px; font-size: 13px; float: left;"><span class="glyphicon glyphicon-chevron-left" aria-hidden="true"></span> ${basic_back}</button>
<button id="btn_close" class="btn btn-sm btn-danger" style="display: none; margin-right: 15px; height: 32px; font-size: 13px; float: right;" todo="${ID}"><span class="glyphicon glyphicon-remove-sign" aria-hidden="true"></span> ${basic_close}</button>
<button id="btn_open" class="btn btn-sm btn-danger" style="display: none; margin-right: 15px; height: 32px; font-size: 13px; float: right;" todo="${ID}"><span class="glyphicon glyphicon-plus-sign" aria-hidden="true"></span> ${basic_open}</button>

8
sai/modules/saimod_sys_todo/tpl/saimod_sys_todo_todo_user.tpl
View File

@ -10,7 +10,7 @@
<tr><td>user</td><td>${username}</td></tr>
<tr><td>message</td><td><textarea id="ta_message" style="width: 80%; height: 400px;">${message}</textarea></td></tr>
</table>
<button id="btn_back" onClick="system.load('todo');" class="btn btn-sm btn-success" style="margin-right: 15px; height: 32px; font-size: 13px; float: left;"><span class="glyphicon glyphicon-chevron-left" aria-hidden="true"></span> Back</button>
<button id="btn_edit" class="btn btn-sm btn-danger" style="margin-right: 15px; height: 32px; font-size: 13px; float: right;" todo="${ID}"><span class="glyphicon glyphicon-pencil" aria-hidden="true"></span> Edit</button>
<button id="btn_close" class="btn btn-sm btn-danger" style="display: none; margin-right: 15px; height: 32px; font-size: 13px; float: right;" todo="${ID}"><span class="glyphicon glyphicon-remove-sign" aria-hidden="true"></span> Close</button>
<button id="btn_open" class="btn btn-sm btn-danger" style="display: none; margin-right: 15px; height: 32px; font-size: 13px; float: right;" todo="${ID}"><span class="glyphicon glyphicon-plus-sign" aria-hidden="true"></span> Open</button>
<button id="btn_back" onClick="system.load('todo');" class="btn btn-sm btn-success" style="margin-right: 15px; height: 32px; font-size: 13px; float: left;"><span class="glyphicon glyphicon-chevron-left" aria-hidden="true"></span> ${basic_back}</button>
<button id="btn_edit" class="btn btn-sm btn-danger" style="margin-right: 15px; height: 32px; font-size: 13px; float: right;" todo="${ID}"><span class="glyphicon glyphicon-pencil" aria-hidden="true"></span> ${basic_edit}</button>
<button id="btn_close" class="btn btn-sm btn-danger" style="display: none; margin-right: 15px; height: 32px; font-size: 13px; float: right;" todo="${ID}"><span class="glyphicon glyphicon-remove-sign" aria-hidden="true"></span> ${basic_close}</button>
<button id="btn_open" class="btn btn-sm btn-danger" style="display: none; margin-right: 15px; height: 32px; font-size: 13px; float: right;" todo="${ID}"><span class="glyphicon glyphicon-plus-sign" aria-hidden="true"></span> ${basic_open}</button>

2
sai/modules/saistart_sys_sai/saistart_sys_sai.php
View File

@ -7,7 +7,7 @@ class saistart_sys_sai extends \SYSTEM\SAI\SaiModule {
\SYSTEM\PAGE\text::tag(\SYSTEM\DBD\system_text::TAG_SAI_START));
return \SYSTEM\PAGE\replace::replaceFile( \SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'modules/saistart_sys_sai/tpl/saistart.tpl'),$vars);}
//public static function html_li_menu(){return '<li class="active"><a id="menu_start" href="#">${sai_menu_start}</a></li>';}
public static function html_li_menu(){return '<li class="active"><a id="menu_start" href="#"><span class="glyphicon glyphicon-home" aria-hidden="true"></span></a></li>';}
public static function html_li_menu(){return '<li class="active sai_menu_first"><a id="menu_start" href="#"><span class="glyphicon glyphicon-home" aria-hidden="true"></span></a></li>';}
public static function right_public(){return true;}
public static function right_right(){return true;}

5
sai/modules/saistart_sys_sai/tpl/content.tpl
View File

@ -1,4 +1,4 @@
<div class="container">
<h3 class="muted">Design. Simple. Fast. Reliable. Innovative.</h3>
<h4 class="text-info">We write awesome Software using <a href="https://github.com/ulfgebhardt/system">SYSTEM</a> and <a href="http://getbootstrap.com/">Twitter Bootstrap.</a></h4><hr>
<div clas="row">
@ -57,5 +57,4 @@
</form>
</div>
</div>
</div>
</div>
</div>

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

@ -1,5 +1,5 @@
<div class="container">
<h3 class="muted">${sai_start_welcome}</h3>
<h4 class="muted"><b>${sai_start_welcome}</b></h4>
<h4 class="text-info">${sai_start_welcome_description}</h4><hr>
<div class="row">
<div class="col-md-6">
@ -81,5 +81,4 @@
<h2 class="muted"><a href="#!log">${basic_log}</a></h2>
<h4 class="muted">100 ${sai_log_latest_entries}</h4>
<div id="log_entries"></div>
</div>
</div>
</div>

28
sai/page/css/sai.css
View File

@ -16,6 +16,16 @@
color: #777;
}
#content {
padding-left: 15px;
padding-top: 15px;
box-sizing: border-box;
}
.sai_menu_no_right_margin {
}
.carousel-img{
width: 1200px;
height: 650px;
@ -33,6 +43,24 @@
border-left: 0;
}
.sys_top_padding {
padding-top: 10px;
}
.sai_menu_first {
padding-left: 0;
margin-left: 0;
}
.sai_left_divider {
border-left: 1px solid #e7e7e7;
box-sizing: border-box;
}
.sai_navbar_top {
margin-bottom: 0;
}
/* auto collapsing navbar */
#sys_autocollapse.collapsed .navbar-header {

57
sai/page/tpl/sai.tpl
View File

@ -9,9 +9,8 @@
${js}
</head>
<body>
<nav id="sys_autocollapse" class="navbar navbar-default" role="navigation">
<div class="container-fluid">
<div class="row">
<div class="container-fluid">
<nav id="sys_autocollapse" class="navbar navbar-default sai_navbar_top" role="navigation">
<div class="col-md-2">
<div class="navbar-header">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navHeaderCollapse">
@ -22,40 +21,32 @@
<a id="sai_brand" class="navbar-brand" href="#!start">SAI</a>
</div>
</div>
<div class="col-md-10">
<!-- div class="col-md-10 sai_menu_first sai_left_divider" -->
<!-- Collect the nav links, forms, and other content for toggling -->
<div class="collapse navbar-collapse navHeaderCollapse">
<ul class="nav navbar-nav">
${menu_start}
${menu_sys}
</ul>
</div><!-- /.navbar-collapse -->
<div class="col-md-10">
<div class="collapse navbar-collapse navHeaderCollapse">
<ul class="nav navbar-nav sai_menu_first sai_left_divider">
${menu_start}
${menu_sys}
</ul>
</div><!-- /.navbar-collapse -->
</div>
</div>
</div>
</nav>
<div class="sai_wrapper">
<div class="container-fluid">
<div class="clearfix">
<div class="col-md-2">
<ul class="nav nav-tabs nav-stacked sai_project_modules">
${menu_proj}
</ul>
</div>
<div class="col-md-10">
<div id="content-wrapper">
<div id="container">
<div class="clearfix">
<div id="content">
</div>
</div>
<div class="clearfix">
<hr>
<div id="footer"><p>${sai_copyright}</p></div>
</div>
</div>
</nav>
<div class="row">
<div class="col-md-2">
<ul class="nav nav-tabs nav-stacked sai_project_modules">
${menu_proj}
</ul>
</div>
<div class="col-md-10 sai_left_divider">
<div class="row">
<div id="content">
</div>
</div>
<div class="row">
<hr>
<div id="footer"><p>${sai_copyright}</p></div>
</div>
</div>
</div>
</div>