commit b29e99cfe5f06e9ff62a0eced055093daf46e87e
parent bb43a6c35463811c92d597bfa8ec08c815e15dcc
Author: Marcel <MTRNord@users.noreply.github.com>
Date: Wed, 11 Nov 2015 20:10:08 +0100
Merge pull request #12 from MTRNord/develop
Develop -> Master | Update README
Diffstat:
7 files changed, 38 insertions(+), 29 deletions(-)
diff --git a/README.md b/README.md
@@ -12,7 +12,10 @@ Chats
TODO
----
-- Add View Manager
+- Set all view-manager Vars
+- Fix Administration/Login
+- Add ability to auto install gateways on servers with the puppet script from hamburg and kiel (only in Ubuntu Server yet)
+- Add Router Config mode
Requires
--------
diff --git a/configs/smarty/de_DE/index.conf b/configs/smarty/de_DE/index.conf
@@ -1,8 +1,11 @@
-#Buttons
+#Buttons/Menu
collapseMenu = "Menü umschalten"
#Welcome-Section
welcomeHead = "Willkommen zum Gluon Admin Panel"
-
+##abilytis
abilitysHead = "Was kann ich hiermit machen?"
-abilitys = "Dies ist ein Beispiel-Text"
-\ No newline at end of file
+abilitys = "Dies ist ein Beispiel-Text"
+
+#Login
+login = "Anmeldung"
+\ No newline at end of file
diff --git a/configs/smarty/en_US/index.conf b/configs/smarty/en_US/index.conf
@@ -1,8 +1,11 @@
-#Buttons
+#Buttons/Menu
collapseMenu = "Toggle Menu"
#Welcome-Section
welcomeHead = "Welcome to the Gluon Admin Panel"
-
+##abilytis
abilitysHead = "What can I do here?"
-abilitys = "This is an example Text"
-\ No newline at end of file
+abilitys = "This is an example Text"
+
+#Login
+login = "Login"
+\ No newline at end of file
diff --git a/configs/smarty/templates/index.tpl b/configs/smarty/templates/index.tpl
@@ -47,7 +47,7 @@
<ul>
<li class="active withripple" data-target="#welcome">{#welcomeHead#}</li>
<li class="withripple" data-target="#tests">Tests</li>
- <li class="withripple" data-target="#login">Login</li>
+ <li class="withripple" data-target="#login">{#login#}</li>
</ul>
</nav>
<div class="pages col-xs-9">
@@ -68,7 +68,7 @@
</p>
</div>
<div class="well page" id="login">
- <h1 class="header">Login</h1>
+ <h1 class="header">{#login#}</h1>
{php}
// start login application
new Application();
diff --git a/configs/smarty/templates_c/b5fa129d9cb11e0f32b30c3f5208681e5b178f0c_0.file.index.tpl.php b/configs/smarty/templates_c/b5fa129d9cb11e0f32b30c3f5208681e5b178f0c_0.file.index.tpl.php
@@ -1,7 +1,7 @@
-<?php /* Smarty version 3.1.27, created on 2015-11-08 20:31:20
+<?php /* Smarty version 3.1.27, created on 2015-11-09 18:18:25
compiled from "configs/smarty/templates/index.tpl" */ ?>
<?php
-/*%%SmartyHeaderCode:1443390499563fb1184a9e11_47678132%%*/
+/*%%SmartyHeaderCode:4118014745640e371a07678_11293514%%*/
if(!defined('SMARTY_DIR')) exit('no direct access allowed');
$_valid = $_smarty_tpl->decodeProperties(array (
'file_dependency' =>
@@ -9,20 +9,20 @@ $_valid = $_smarty_tpl->decodeProperties(array (
'b5fa129d9cb11e0f32b30c3f5208681e5b178f0c' =>
array (
0 => 'configs/smarty/templates/index.tpl',
- 1 => 1447014601,
+ 1 => 1447093045,
2 => 'file',
),
),
- 'nocache_hash' => '1443390499563fb1184a9e11_47678132',
+ 'nocache_hash' => '4118014745640e371a07678_11293514',
'has_nocache_code' => false,
'version' => '3.1.27',
- 'unifunc' => 'content_563fb1184c36b3_35332039',
+ 'unifunc' => 'content_5640e371a2c894_60814898',
),false);
/*/%%SmartyHeaderCode%%*/
-if ($_valid && !is_callable('content_563fb1184c36b3_35332039')) {
-function content_563fb1184c36b3_35332039 ($_smarty_tpl) {
+if ($_valid && !is_callable('content_5640e371a2c894_60814898')) {
+function content_5640e371a2c894_60814898 ($_smarty_tpl) {
-$_smarty_tpl->properties['nocache_hash'] = '1443390499563fb1184a9e11_47678132';
+$_smarty_tpl->properties['nocache_hash'] = '4118014745640e371a07678_11293514';
include_once ('indexClass.php');?>
<?php include_once ('libs/login-base/vendor/autoload.php');?>
@@ -76,7 +76,8 @@ include_once ('indexClass.php');?>
<li class="active withripple" data-target="#welcome"><?php echo $_smarty_tpl->getConfigVariable( 'welcomeHead');?>
</li>
<li class="withripple" data-target="#tests">Tests</li>
- <li class="withripple" data-target="#login">Login</li>
+ <li class="withripple" data-target="#login"><?php echo $_smarty_tpl->getConfigVariable( 'login');?>
+</li>
</ul>
</nav>
<div class="pages col-xs-9">
@@ -100,7 +101,8 @@ include_once ('indexClass.php');?>
</p>
</div>
<div class="well page" id="login">
- <h1 class="header">Login</h1>
+ <h1 class="header"><?php echo $_smarty_tpl->getConfigVariable( 'login');?>
+</h1>
<?php
// start login application
new Application();
diff --git a/configs/smarty/templates_c/d1eba7315570afa40cf64407acbbdba556d2fff2_6.file.index.conf.php b/configs/smarty/templates_c/d1eba7315570afa40cf64407acbbdba556d2fff2_6.file.index.conf.php
@@ -1,4 +1,4 @@
-<?php /* Smarty version 3.1.27, created on 2015-11-08 20:31:21
+<?php /* Smarty version 3.1.27, created on 2015-11-09 18:18:54
compiled from "configs/smarty/de_DE/index.conf" */ ?>
<?php
/*%%SmartyHeaderCode:%%*/
@@ -9,18 +9,18 @@ $_valid = $_smarty_tpl->decodeProperties(array (
'd1eba7315570afa40cf64407acbbdba556d2fff2' =>
array (
0 => 'index.conf',
- 1 => 1447014658,
+ 1 => 1447093126,
2 => 'file',
),
),
'nocache_hash' => '',
'has_nocache_code' => false,
'version' => '3.1.27',
- 'unifunc' => 'content_563fb119d6ca97_58285246',
+ 'unifunc' => 'content_5640e38e18a7b5_34918000',
),false);
/*/%%SmartyHeaderCode%%*/
-if ($_valid && !is_callable('content_563fb119d6ca97_58285246')) {
-function content_563fb119d6ca97_58285246 ($_smarty_tpl) {
+if ($_valid && !is_callable('content_5640e38e18a7b5_34918000')) {
+function content_5640e38e18a7b5_34918000 ($_smarty_tpl) {
Smarty_Internal_Extension_Config::loadConfigVars($_smarty_tpl, array (
'sections' =>
@@ -32,6 +32,7 @@ Smarty_Internal_Extension_Config::loadConfigVars($_smarty_tpl, array (
'welcomeHead' => 'Willkommen zum Gluon Admin Panel',
'abilitysHead' => 'Was kann ich hiermit machen?',
'abilitys' => 'Dies ist ein Beispiel-Text',
+ 'login' => 'Anmeldung',
),
));
}
diff --git a/toBeFixed.txt b/toBeFixed.txt
@@ -1,2 +0,0 @@
-index.php line 135
- $(".pages").animate({scrollTop:0}, 0);
-\ No newline at end of file
