From e74e32a0eb4b2bb9691a079d6dc579925d7bb0ce Mon Sep 17 00:00:00 2001 From: Simon Rettberg Date: Wed, 16 Oct 2013 19:34:08 +0200 Subject: New stuff --- config.php | 1 + inc/menu.inc.php | 21 +++++++++++++++ inc/render.inc.php | 22 +++++++++++++-- inc/user.inc.php | 59 +++++++++++++++++++++++++++++++++++++++++ inc/util.inc.php | 7 +++++ index.php | 28 ++++++++++++++----- modules/main.inc.php | 12 +++++++++ modules/session.inc.php | 39 +++++++++++++++++++++++++++ style/default.css | 38 ++++++++++++++++++++++++++ templates/main-menu.html | 36 +++++++++++++++++++++++++ templates/menu-login.html | 1 + templates/menu-logout.html | 1 + templates/messagebox-error.html | 1 + templates/page-login.html | 12 +++++++++ 14 files changed, 270 insertions(+), 8 deletions(-) create mode 100644 inc/menu.inc.php create mode 100644 inc/user.inc.php create mode 100644 modules/main.inc.php create mode 100644 modules/session.inc.php create mode 100644 style/default.css create mode 100644 templates/main-menu.html create mode 100644 templates/menu-login.html create mode 100644 templates/menu-logout.html create mode 100644 templates/messagebox-error.html create mode 100644 templates/page-login.html diff --git a/config.php b/config.php index fd388657..910c14dd 100644 --- a/config.php +++ b/config.php @@ -1,4 +1,5 @@ User::getName())); + } + + public function token() + { + return 123; + } + +} + diff --git a/inc/render.inc.php b/inc/render.inc.php index 455fd87d..41b8e2b8 100644 --- a/inc/render.inc.php +++ b/inc/render.inc.php @@ -46,10 +46,12 @@ class Render , ' +
', self::$body , - ' + '
+ ' ; @@ -74,11 +76,27 @@ class Render /** * Add the given template to the output, using the given params for placeholders in the template */ - public static function parse($template, $params) + public static function addTemplate($template, $params = false) { self::$body .= self::$mustache->render(self::getTemplate($template), $params); } + /** + * Add error message to page + */ + public static function addError($message) + { + self::addTemplate('messagebox-error', array('message' => $message)); + } + + /** + * Parse template with given params and return; do not add to body + */ + public static function parse($template, $params = false) + { + return self::$mustache->render(self::getTemplate($template), $params); + } + /** * Open the given html tag, optionally adding the passed assoc array of params */ diff --git a/inc/user.inc.php b/inc/user.inc.php new file mode 100644 index 00000000..de615932 --- /dev/null +++ b/inc/user.inc.php @@ -0,0 +1,59 @@ + 'wurst kacke')); -Render::closeTag('h1'); +$menu = new Menu; +Render::addTemplate('main-menu', $menu); -Render::parse('helloworld', array('wurst' => 'käse & bier')); +render_module(); Render::output(); diff --git a/modules/main.inc.php b/modules/main.inc.php new file mode 100644 index 00000000..ef83f1c4 --- /dev/null +++ b/modules/main.inc.php @@ -0,0 +1,12 @@ + 'wurst kacke')); + Render::closeTag('h1'); + + Render::addTemplate('helloworld', array('wurst' => 'käse & bier')); +} + diff --git a/modules/session.inc.php b/modules/session.inc.php new file mode 100644 index 00000000..5b8c5f4d --- /dev/null +++ b/modules/session.inc.php @@ -0,0 +1,39 @@ + +
+
+
+ + OpenSLX Admin +
+
+ + +
+
+
+ diff --git a/templates/menu-login.html b/templates/menu-login.html new file mode 100644 index 00000000..c5ee6a2a --- /dev/null +++ b/templates/menu-login.html @@ -0,0 +1 @@ +
  • Anmelden
    • diff --git a/templates/menu-logout.html b/templates/menu-logout.html new file mode 100644 index 00000000..d99fac58 --- /dev/null +++ b/templates/menu-logout.html @@ -0,0 +1 @@ +
  • {{user}} abmelden
    • diff --git a/templates/messagebox-error.html b/templates/messagebox-error.html new file mode 100644 index 00000000..dc2dbc8a --- /dev/null +++ b/templates/messagebox-error.html @@ -0,0 +1 @@ +
    {{message}}
    diff --git a/templates/page-login.html b/templates/page-login.html new file mode 100644 index 00000000..4c2e7220 --- /dev/null +++ b/templates/page-login.html @@ -0,0 +1,12 @@ +
    +
    + + + + + + +
    +
    -- cgit v1.2.3-55-g7522