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

Merge branch 'master' of github.com:gebhardtdasense/system into newapi

Browse Source
This commit is contained in:
Ulf Gebhardt 2013-12-06 14:30:08 +01:00
commit 04f1264895
7 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sai/modules/saimod_sys_api/tabs.tpl
View File

@ -1,5 +1,3 @@
<h3>Api Tables</h3>
<br>
<div class="tabbable"> <div class="tabbable">
<ul class="nav nav-tabs" id="localetab"> <ul class="nav nav-tabs" id="localetab">
${tabopts} ${tabopts}

2
sai/modules/saimod_sys_docu/tabs.tpl
View File

@ -1,5 +1,3 @@
<h3>Documentation</h3>
<br>
<div class="tabbable"> <div class="tabbable">
<ul class="nav nav-tabs" id="documaintab"> <ul class="nav nav-tabs" id="documaintab">
${tabopts} ${tabopts}

4
sai/modules/saimod_sys_locale/list_entry.tpl
View File

@ -1,8 +1,10 @@
<tr> <tr>
<td style="padding-bottom: 5px;"> <td style="padding-bottom: 5px;">
${id}<br><br> ${id}
<div style="float:right;">
<input type="submit" class="btn-danger content_delete" value="delete" name="${id}"> <input type="submit" class="btn-danger content_delete" value="delete" name="${id}">
<input type="submit" class="btn content_edit" value="edit" style="margin-left: 3px;" name="${id}"> <input type="submit" class="btn content_edit" value="edit" style="margin-left: 3px;" name="${id}">
</div>
</td> </td>
<td>${category}</td> <td>${category}</td>
${content} ${content}

3
sai/modules/saimod_sys_locale/tabs.tpl
View File

@ -1,8 +1,7 @@
<h3>Locale String <input type="submit" value="Add" class="btn content_add"></h3>
<br>
<div class="tabbable"> <div class="tabbable">
<ul class="nav nav-tabs" id="localetab"> <ul class="nav nav-tabs" id="localetab">
${tabopts} ${tabopts}
<input type="submit" value="Add" class="btn content_add" style="margin-left: 15px;">
</ul> </ul>
<div class="tab-content"> <div class="tab-content">
${tabs} ${tabs}

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

@ -40,7 +40,7 @@ class saimod_sys_log extends \SYSTEM\SAI\SaiModule {
$now = microtime(true); $now = microtime(true);
$result = '<div id="table-wrapper"><table class="table table-hover table-condensed" style="overflow: auto;">'. $result = '<div id="table-wrapper"><table class="table table-hover table-condensed">'.
'<tr>'.'<th>'.'time ago'.'</th>'.'<th>'.'time'.'</th>'.'<th>'.'class'.'</th>'.'<th>'.'message'.'</th>'.'<th>'.'code'.'</th>'.'<th>'.'file'.'</th>'.'<th>'.'line'.'</th>'.'<th>'.'ip'.'</th>'.'<th>'.'querytime'.'</tr>'; '<tr>'.'<th>'.'time ago'.'</th>'.'<th>'.'time'.'</th>'.'<th>'.'class'.'</th>'.'<th>'.'message'.'</th>'.'<th>'.'code'.'</th>'.'<th>'.'file'.'</th>'.'<th>'.'line'.'</th>'.'<th>'.'ip'.'</th>'.'<th>'.'querytime'.'</tr>';
while($r = $res->next()){ while($r = $res->next()){
//TODO make time conversion on database //TODO make time conversion on database

2
sai/sai/SaiModule.php
View File

@ -2,7 +2,7 @@
namespace SYSTEM\SAI; namespace SYSTEM\SAI;
abstract class SaiModule extends \SYSTEM\API\api_login{ abstract class SaiModule extends \SYSTEM\API\api_system{
public static function default_page(){ public static function default_page(){
$sai = new \SYSTEM\SAI\default_page(); $sai = new \SYSTEM\SAI\default_page();
return $sai->html();} return $sai->html();}

2
sai/sai/saigui.php
View File

@ -21,7 +21,7 @@ class saigui extends \SYSTEM\PAGE\Page {
\call_user_func(array($classname, 'right_right')))){ \call_user_func(array($classname, 'right_right')))){
return \SYSTEM\API\api::run('\SYSTEM\API\verify', $classname , $pg, 42, false, false); return \SYSTEM\API\api::run('\SYSTEM\API\verify', $classname , $pg, 42, false, false);
} else { } else {
return "Could not find Module";} return '<meta http-equiv="refresh" content="5">You are no longer logged in. Page reload in 5sec...';}
} else { } else {
return \SYSTEM\API\api::run('\SYSTEM\API\verify', '\SYSTEM\SAI\SaiModule', array(), 42, false, true);} return \SYSTEM\API\api::run('\SYSTEM\API\verify', '\SYSTEM\SAI\SaiModule', array(), 42, false, true);}
} }