12.diff (7209B)
1 diff --git a/README.md b/README.md 2 index 2160539..d548a07 100755 3 --- a/README.md 4 +++ b/README.md 5 @@ -12,7 +12,10 @@ Chats 6 7 TODO 8 ---- 9 -- Add View Manager 10 +- Set all view-manager Vars 11 +- Fix Administration/Login 12 +- Add ability to auto install gateways on servers with the puppet script from hamburg and kiel (only in Ubuntu Server yet) 13 +- Add Router Config mode 14 15 Requires 16 -------- 17 diff --git a/configs/smarty/de_DE/index.conf b/configs/smarty/de_DE/index.conf 18 index 0d0ffd6..6cffe74 100644 19 --- a/configs/smarty/de_DE/index.conf 20 +++ b/configs/smarty/de_DE/index.conf 21 @@ -1,8 +1,11 @@ 22 -#Buttons 23 +#Buttons/Menu 24 collapseMenu = "Menü umschalten" 25 26 #Welcome-Section 27 welcomeHead = "Willkommen zum Gluon Admin Panel" 28 - 29 +##abilytis 30 abilitysHead = "Was kann ich hiermit machen?" 31 -abilitys = "Dies ist ein Beispiel-Text" 32 \ No newline at end of file 33 +abilitys = "Dies ist ein Beispiel-Text" 34 + 35 +#Login 36 +login = "Anmeldung" 37 \ No newline at end of file 38 diff --git a/configs/smarty/en_US/index.conf b/configs/smarty/en_US/index.conf 39 index cd6f7ae..bde10fd 100644 40 --- a/configs/smarty/en_US/index.conf 41 +++ b/configs/smarty/en_US/index.conf 42 @@ -1,8 +1,11 @@ 43 -#Buttons 44 +#Buttons/Menu 45 collapseMenu = "Toggle Menu" 46 47 #Welcome-Section 48 welcomeHead = "Welcome to the Gluon Admin Panel" 49 - 50 +##abilytis 51 abilitysHead = "What can I do here?" 52 -abilitys = "This is an example Text" 53 \ No newline at end of file 54 +abilitys = "This is an example Text" 55 + 56 +#Login 57 +login = "Login" 58 \ No newline at end of file 59 diff --git a/configs/smarty/templates/index.tpl b/configs/smarty/templates/index.tpl 60 index bc88090..50d89c2 100755 61 --- a/configs/smarty/templates/index.tpl 62 +++ b/configs/smarty/templates/index.tpl 63 @@ -47,7 +47,7 @@ 64 <ul> 65 <li class="active withripple" data-target="#welcome">{#welcomeHead#}</li> 66 <li class="withripple" data-target="#tests">Tests</li> 67 - <li class="withripple" data-target="#login">Login</li> 68 + <li class="withripple" data-target="#login">{#login#}</li> 69 </ul> 70 </nav> 71 <div class="pages col-xs-9"> 72 @@ -68,7 +68,7 @@ 73 </p> 74 </div> 75 <div class="well page" id="login"> 76 - <h1 class="header">Login</h1> 77 + <h1 class="header">{#login#}</h1> 78 {php} 79 // start login application 80 new Application(); 81 diff --git a/configs/smarty/templates_c/b5fa129d9cb11e0f32b30c3f5208681e5b178f0c_0.file.index.tpl.php b/configs/smarty/templates_c/b5fa129d9cb11e0f32b30c3f5208681e5b178f0c_0.file.index.tpl.php 82 index add27d0..55b5000 100644 83 --- a/configs/smarty/templates_c/b5fa129d9cb11e0f32b30c3f5208681e5b178f0c_0.file.index.tpl.php 84 +++ b/configs/smarty/templates_c/b5fa129d9cb11e0f32b30c3f5208681e5b178f0c_0.file.index.tpl.php 85 @@ -1,7 +1,7 @@ 86 -<?php /* Smarty version 3.1.27, created on 2015-11-08 20:31:20 87 +<?php /* Smarty version 3.1.27, created on 2015-11-09 18:18:25 88 compiled from "configs/smarty/templates/index.tpl" */ ?> 89 <?php 90 -/*%%SmartyHeaderCode:1443390499563fb1184a9e11_47678132%%*/ 91 +/*%%SmartyHeaderCode:4118014745640e371a07678_11293514%%*/ 92 if(!defined('SMARTY_DIR')) exit('no direct access allowed'); 93 $_valid = $_smarty_tpl->decodeProperties(array ( 94 'file_dependency' => 95 @@ -9,20 +9,20 @@ 96 'b5fa129d9cb11e0f32b30c3f5208681e5b178f0c' => 97 array ( 98 0 => 'configs/smarty/templates/index.tpl', 99 - 1 => 1447014601, 100 + 1 => 1447093045, 101 2 => 'file', 102 ), 103 ), 104 - 'nocache_hash' => '1443390499563fb1184a9e11_47678132', 105 + 'nocache_hash' => '4118014745640e371a07678_11293514', 106 'has_nocache_code' => false, 107 'version' => '3.1.27', 108 - 'unifunc' => 'content_563fb1184c36b3_35332039', 109 + 'unifunc' => 'content_5640e371a2c894_60814898', 110 ),false); 111 /*/%%SmartyHeaderCode%%*/ 112 -if ($_valid && !is_callable('content_563fb1184c36b3_35332039')) { 113 -function content_563fb1184c36b3_35332039 ($_smarty_tpl) { 114 +if ($_valid && !is_callable('content_5640e371a2c894_60814898')) { 115 +function content_5640e371a2c894_60814898 ($_smarty_tpl) { 116 117 -$_smarty_tpl->properties['nocache_hash'] = '1443390499563fb1184a9e11_47678132'; 118 +$_smarty_tpl->properties['nocache_hash'] = '4118014745640e371a07678_11293514'; 119 include_once ('indexClass.php');?> 120 121 <?php include_once ('libs/login-base/vendor/autoload.php');?> 122 @@ -76,7 +76,8 @@ function content_563fb1184c36b3_35332039 ($_smarty_tpl) { 123 <li class="active withripple" data-target="#welcome"><?php echo $_smarty_tpl->getConfigVariable( 'welcomeHead');?> 124 </li> 125 <li class="withripple" data-target="#tests">Tests</li> 126 - <li class="withripple" data-target="#login">Login</li> 127 + <li class="withripple" data-target="#login"><?php echo $_smarty_tpl->getConfigVariable( 'login');?> 128 +</li> 129 </ul> 130 </nav> 131 <div class="pages col-xs-9"> 132 @@ -100,7 +101,8 @@ function content_563fb1184c36b3_35332039 ($_smarty_tpl) { 133 </p> 134 </div> 135 <div class="well page" id="login"> 136 - <h1 class="header">Login</h1> 137 + <h1 class="header"><?php echo $_smarty_tpl->getConfigVariable( 'login');?> 138 +</h1> 139 <?php 140 // start login application 141 new Application(); 142 diff --git a/configs/smarty/templates_c/d1eba7315570afa40cf64407acbbdba556d2fff2_6.file.index.conf.php b/configs/smarty/templates_c/d1eba7315570afa40cf64407acbbdba556d2fff2_6.file.index.conf.php 143 index 8589695..5f413c3 100644 144 --- a/configs/smarty/templates_c/d1eba7315570afa40cf64407acbbdba556d2fff2_6.file.index.conf.php 145 +++ b/configs/smarty/templates_c/d1eba7315570afa40cf64407acbbdba556d2fff2_6.file.index.conf.php 146 @@ -1,4 +1,4 @@ 147 -<?php /* Smarty version 3.1.27, created on 2015-11-08 20:31:21 148 +<?php /* Smarty version 3.1.27, created on 2015-11-09 18:18:54 149 compiled from "configs/smarty/de_DE/index.conf" */ ?> 150 <?php 151 /*%%SmartyHeaderCode:%%*/ 152 @@ -9,18 +9,18 @@ 153 'd1eba7315570afa40cf64407acbbdba556d2fff2' => 154 array ( 155 0 => 'index.conf', 156 - 1 => 1447014658, 157 + 1 => 1447093126, 158 2 => 'file', 159 ), 160 ), 161 'nocache_hash' => '', 162 'has_nocache_code' => false, 163 'version' => '3.1.27', 164 - 'unifunc' => 'content_563fb119d6ca97_58285246', 165 + 'unifunc' => 'content_5640e38e18a7b5_34918000', 166 ),false); 167 /*/%%SmartyHeaderCode%%*/ 168 -if ($_valid && !is_callable('content_563fb119d6ca97_58285246')) { 169 -function content_563fb119d6ca97_58285246 ($_smarty_tpl) { 170 +if ($_valid && !is_callable('content_5640e38e18a7b5_34918000')) { 171 +function content_5640e38e18a7b5_34918000 ($_smarty_tpl) { 172 173 Smarty_Internal_Extension_Config::loadConfigVars($_smarty_tpl, array ( 174 'sections' => 175 @@ -32,6 +32,7 @@ function content_563fb119d6ca97_58285246 ($_smarty_tpl) { 176 'welcomeHead' => 'Willkommen zum Gluon Admin Panel', 177 'abilitysHead' => 'Was kann ich hiermit machen?', 178 'abilitys' => 'Dies ist ein Beispiel-Text', 179 + 'login' => 'Anmeldung', 180 ), 181 )); 182 } 183 diff --git a/toBeFixed.txt b/toBeFixed.txt 184 deleted file mode 100644 185 index d9e04ff..0000000 186 --- a/toBeFixed.txt 187 +++ /dev/null 188 @@ -1,2 +0,0 @@ 189 -index.php line 135 190 - $(".pages").animate({scrollTop:0}, 0); 191 \ No newline at end of file