--- a/classes/bfw/mvc/view/benutzerverwaltung/anmelden.tpl
+++ b/classes/bfw/mvc/view/benutzerverwaltung/anmelden.tpl
@@ -1,28 +1,28 @@
-<div class="container">
- <form action="" method="post">
- <div class="row">
- <div class="col-lg-12">
- <p>
- <label for="usernameField">Benutzername:</label>
- <input id="usernameField" type="email" name="username" value="{$request->post('username')}"/>
- </p>
-
- <p>
- <label id="passwordField" for="passwordField">Passwort:</label>
- <input type="password" name="password" value="{$request->post('password')}"/>
- </p>
- </div>
- </div>
-
- <div class="row">
- <div class="col-lg-12">
- <p>
- <input type="submit" name="anmelden" value="anmelden"/>
- </p>
- </div>
- </div>
- </form>
-</div>
-
-{$request->printSession()}
-</div>
+<div class="container">
+ <form action="" method="post">
+ <div class="row">
+ <div class="col-lg-12">
+ <div class="form-group">
+ <label for="usernameField">Benutzername:</label>
+ <input id="usernameField" type="email" name="username" value="{$request->post('username')}"/>
+ </div>
+
+ <div class="form-group">
+ <label id="passwordField" for="passwordField">Passwort:</label>
+ <input type="password" name="password" value="{$request->post('password')}"/>
+ </div>
+ </div>
+ </div>
+
+ <div class="row">
+ <div class="col-lg-12">
+ <div class="form-group knopf">
+ <input type="submit" name="anmelden" value="anmelden"/>
+ </div>
+ </div>
+ </div>
+ </form>
+</div>
+
+{$request->printSession()}
+</div>
--- a/classes/bfw/mvc/view/benutzerverwaltung/index.tpl
+++ b/classes/bfw/mvc/view/benutzerverwaltung/index.tpl
@@ -7,21 +7,21 @@
<div class="col-lg-12">
<form action="" method="post" autocomplete="off">
<div class="col-lg-4">
- <p>
+ <div class="form-group">
<label for="usernameField{$user->getId()}">Benutzername<span class="pull-right"></span></label>
<input id="usernameField{$user->getId()}" type="text" name="username" value="{$user->getUsername()}"/>
- </p>
+ </div>
</div>
<div class="col-lg-4">
- <p>
+ <div class="form-group">
<label for="passwordField{$user->getId()}">Password</label>
<input id="passwordField{$user->getId()}" type="password" name="password" value="" autocomplete="off"/>
- </p>
+ </div>
</div>
<div class="col-lg-4">
- <p>
+ <div class="form-group">
<label for="groupBox{$user->getId()}">Gruppenzugehörigkeit</label>
<select id="groupBox{$user->getId()}" name="groupbox">
{foreach $groups as $group}
@@ -32,7 +32,7 @@
{/if}
{/foreach}
</select>
- </p>
+ </div>
</div>
<input type="hidden" name="uid" value="{$user->getId()}"/>
--- a/classes/bfw/mvc/view/benutzerverwaltung/meinprofil.tpl
+++ b/classes/bfw/mvc/view/benutzerverwaltung/meinprofil.tpl
@@ -1,34 +1,34 @@
-<h2 class="text-center">Mein Profil</h2>
-<hr/>
-
-<form action="" method="post">
- <div class="container">
- <div class="row">
- <div class="col-lg-12">
- <p>
- <label for="usernameField">Benutzername</label>
- <input id="usernameField" type="text" name="username" value="{$user->getUsername()}"/>
- </p>
-
- <p>
- <label for="passwordField">Password</label>
- <input id="passwordField" type="password" name="password" value=""/>
- </p>
-
- <p>
- <label for="firstnameField">Vorname</label>
- <input id="firstnameField" type="text" name="firstname" value="{$user->getFirstname()}"/>
- </p>
-
- <p>
- <label for="lastnameField">Nachname</label>
- <input id="lastnameField" type="text" name="lastname" value="{$user->getLastname()}"/>
- </p>
-
- <div class="pull-right">
- <input type="submit" name="aendern" value="Ändern"/>
- </div>
- </div>
- </div>
- </div>
-</form>
+<h2 class="text-center">Mein Profil</h2>
+<hr/>
+
+<form action="" method="post">
+ <div class="container">
+ <div class="row">
+ <div class="col-lg-12">
+ <div class="form-group">
+ <label for="usernameField">Benutzername</label>
+ <input id="usernameField" type="text" name="username" value="{$user->getUsername()}"/>
+ </div>
+
+ <div class="form-group">
+ <label for="passwordField">Password</label>
+ <input id="passwordField" type="password" name="password" value=""/>
+ </div>
+
+ <div class="form-group">
+ <label for="firstnameField">Vorname</label>
+ <input id="firstnameField" type="text" name="firstname" value="{$user->getFirstname()}"/>
+ </div>
+
+ <div class="form-group">
+ <label for="lastnameField">Nachname</label>
+ <input id="lastnameField" type="text" name="lastname" value="{$user->getLastname()}"/>
+ </div>
+
+ <div class="form-group knopf pull-right">
+ <input type="submit" name="aendern" value="Ändern"/>
+ </div>
+ </div>
+ </div>
+ </div>
+</form>
--- a/classes/bfw/mvc/view/benutzerverwaltung/registrieren.tpl
+++ b/classes/bfw/mvc/view/benutzerverwaltung/registrieren.tpl
@@ -1,39 +1,41 @@
-<h2 class="text-center">Benutzerregistrierung</h2>
-<hr/>
-
-<form action="/benutzerverwaltung/registrieren/" method="post">
- <div class="container">
- <div class="row">
- <div class="col-lg-12">
- <p>
- <label for="usernameField">Benutzername</label>
- <input id="usernameField" type="text" name="username" value="{$currentUser->getUsername()}"/>
- </p>
-
- <p>
- <label for="passwordField1">Password</label>
- <input id="passwordField1" type="password" name="password1" value=""/>
- </p>
-
- <p>
- <label for="passwordField2">Password wiederholen</label>
- <input id="passwordField2" type="password" name="password2" value=""/>
- </p>
-
- <p>
- <label for="firstnameField">Vorname</label>
- <input id="firstnameField" type="text" name="firstname" value="{$currentUser->getFirstname()}"/>
- </p>
-
- <p>
- <label for="lastnameField">Nachname</label>
- <input id="lastnameField" type="text" name="lastname" value="{$currentUser->getLastname()}"/>
- </p>
-
- <div class="pull-right">
- <input type="submit" name="registrieren" value="neu registrieren"/>
- </div>
- </div>
- </div>
- </div>
-</form>
+<h2 class="text-center">Registrierung</h2>
+<hr/>
+
+<form action="/benutzerverwaltung/registrieren/" method="post">
+ <div class="container">
+ <div class="row">
+ <div class="col-lg-12">
+ <div class="form-group">
+ <label for="usernameField">Benutzername</label>
+ <input id="usernameField" type="text" name="username" value="{$currentUser->getUsername()}"/>
+ </div>
+
+ <div class="clearfix form-group form-inline">
+ <div class="form-group pull-left">
+ <label for="passwordField1">Password</label>
+ <input id="passwordField1" type="password" name="password1" value=""/>
+ </div>
+
+ <div class="form-group pull-right">
+ <label for="passwordField2">wiederholen</label>
+ <input id="passwordField2" type="password" name="password2" value=""/>
+ </div>
+ </div>
+
+ <div class="form-group">
+ <label for="firstnameField">Vorname</label>
+ <input id="firstnameField" type="text" name="firstname" value="{$currentUser->getFirstname()}"/>
+ </div>
+
+ <div class="form-group">
+ <label for="lastnameField">Nachname</label>
+ <input id="lastnameField" type="text" name="lastname" value="{$currentUser->getLastname()}"/>
+ </div>
+
+ <div class="form-group knopf">
+ <input type="submit" name="registrieren" value="neu registrieren"/>
+ </div>
+ </div>
+ </div>
+ </div>
+</form>
--- a/classes/bfw/mvc/view/benutzerverwaltung/resetpasswort.tpl
+++ b/classes/bfw/mvc/view/benutzerverwaltung/resetpasswort.tpl
@@ -1,25 +1,25 @@
-<div class="container">
- <div class="row">
- <form action="/resetpasswort/" method="post">
- <div class="col-lg-12">
- <p>
- <label for="usernameField">Benutzername:</label>
- <input id="usernameField" type="email" name="username" value="{$request->post('username')}"/>
- </p>
- </div>
-
- <div class="row">
- <div class="col-lg-12">
- <div class="col-lg-6">
- <input type="submit" name="pw-reset" value="Passwort zurück setzten"/>
- </div>
- <div class="col-lg-6">
- <input type="reset" name="verwerfen" value="Eingaben verwerfen"/>
- </div>
- </div>
- </div>
- </form>
- </div>
-
- {$request->printSession()}
+<div class="container">
+ <div class="row">
+ <form action="/resetpasswort/" method="post">
+ <div class="col-lg-12">
+ <p>
+ <label for="usernameField">Benutzername:</label>
+ <input id="usernameField" type="email" name="username" value="{$request->post('username')}"/>
+ </p>
+ </div>
+
+ <div class="row">
+ <div class="col-lg-12">
+ <div class="col-lg-6">
+ <input type="submit" name="pw-reset" value="Passwort zurück setzten"/>
+ </div>
+ <div class="col-lg-6">
+ <input type="reset" name="verwerfen" value="Eingaben verwerfen"/>
+ </div>
+ </div>
+ </div>
+ </form>
+ </div>
+
+ {$request->printSession()}
</div>
\ No newline at end of file
--- a/classes/bfw/mvc/view/dokumentation/index.tpl
+++ b/classes/bfw/mvc/view/dokumentation/index.tpl
@@ -1,2 +1,2 @@
-<h2 class="text-center">Dokumentation</h2>
-<hr/>
+<h2 class="text-center">Dokumentation</h2>
+<hr/>
--- a/classes/bfw/mvc/view/footer.tpl
+++ b/classes/bfw/mvc/view/footer.tpl
@@ -1,13 +1,13 @@
-<div class="col-lg-12">
- <div class="col-lg-4">
- <p class="text-warning bold">{$smarty.session.prefix.msg}</p>
- </div>
-
- <div class="col-lg-4">
- <p class="text-info bold">BFw V0.1 / UID: {$smarty.session.prefix.user_id} / GID: {$smarty.session.prefix.group_id}</p>
- </div>
-
- <div class="col-lg-4">
- <p class="text-danger bold">{$smarty.session.prefix.error}</p>
- </div>
+<div class="col-lg-12">
+ <div class="col-lg-4">
+ <p class="text-warning bold">{$smarty.session.prefix.msg}</p>
+ </div>
+
+ <div class="col-lg-4">
+ <p class="text-info bold">BFw V0.1 / UID: {$smarty.session.prefix.user_id} / GID: {$smarty.session.prefix.group_id}</p>
+ </div>
+
+ <div class="col-lg-4">
+ <p class="text-danger bold">{$smarty.session.prefix.error}</p>
+ </div>
</div>
\ No newline at end of file
--- a/classes/bfw/mvc/view/header.tpl
+++ b/classes/bfw/mvc/view/header.tpl
@@ -1,40 +1,40 @@
-<nav class="navbar navbar-default">
- <div class="container-fluid">
- <div class="navbar-header">
- <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#ticketbar" aria-expanded="false">
- <span class="sr-only">Toggle navigation</span>
- <span class="icon-bar"></span>
- <span class="icon-bar"></span>
- <span class="icon-bar"></span>
- </button>
- <a class="navbar-brand" href="/">Bröker Framework</a>
- </div>
-
- <div class="collapse navbar-collapse" id="ticketbar">
- {if $smarty.session.prefix.group_id == $group::ADMIN}
- <ul class="nav navbar-nav">
- <li class="active"><a href="/benutzerverwaltung/">Benutzerverwaltung <span class="sr-only">(current)</span></a></li>
- </ul>
- {/if}
-
- <ul class="nav navbar-nav">
- <li class="active"><a href="/dokumentation/">Dokumentation<span class="sr-only">(current)</span></a></li>
- </ul>
- <form class="navbar-form navbar-left" role="search" method="get" action="/dokumentation/">
- <div class="form-group">
- <input type="text" class="form-control" placeholder="Suchen..." name="did" value="">
- </div>
- <button type="submit" class="btn btn-default">Volltext-Suche</button>
- </form>
- <ul class="nav navbar-nav navbar-right">
- {if $request->getKey('isLoggedIn')}
- <li><a href="/benutzerverwaltung/meinprofil/">{$user->getFirstname()} {$user->getLastname()}</a></li>
- <li><a href="/benutzerverwaltung/abmelden/">abmelden</a></li>
- {else}
- <li><a href="/benutzerverwaltung/anmelden/">anmelden</a></li>
- <li><a href="/benutzerverwaltung/registrieren/">registrieren</a></li>
- {/if}
- </ul>
- </div>
- </div>
-</nav>
+<nav class="navbar navbar-default">
+ <div class="container-fluid">
+ <div class="navbar-header">
+ <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#ticketbar" aria-expanded="false">
+ <span class="sr-only">Toggle navigation</span>
+ <span class="icon-bar"></span>
+ <span class="icon-bar"></span>
+ <span class="icon-bar"></span>
+ </button>
+ <a class="navbar-brand" href="/">Bröker Framework</a>
+ </div>
+
+ <div class="collapse navbar-collapse" id="ticketbar">
+ {if $smarty.session.prefix.group_id == $group::ADMIN}
+ <ul class="nav navbar-nav">
+ <li class="active"><a href="/benutzerverwaltung/">Benutzerverwaltung <span class="sr-only">(current)</span></a></li>
+ </ul>
+ {/if}
+
+ <ul class="nav navbar-nav">
+ <li class="active"><a href="/dokumentation/">Dokumentation<span class="sr-only">(current)</span></a></li>
+ </ul>
+ <form class="navbar-form navbar-left" role="search" method="get" action="/dokumentation/">
+ <div class="form-group">
+ <input type="text" class="form-control" placeholder="Suchen..." name="did" value="">
+ </div>
+ <button type="submit" class="btn btn-default">Volltext-Suche</button>
+ </form>
+ <ul class="nav navbar-nav navbar-right">
+ {if $request->getKey('isLoggedIn')}
+ <li><a href="/benutzerverwaltung/meinprofil/">{$user->getFirstname()} {$user->getLastname()}</a></li>
+ <li><a href="/benutzerverwaltung/abmelden/">abmelden</a></li>
+ {else}
+ <li><a href="/benutzerverwaltung/anmelden/">anmelden</a></li>
+ <li><a href="/benutzerverwaltung/registrieren/">registrieren</a></li>
+ {/if}
+ </ul>
+ </div>
+ </div>
+</nav>
--- a/classes/bfw/mvc/view/home/index.tpl
+++ b/classes/bfw/mvc/view/home/index.tpl
@@ -1,2 +1,2 @@
-<h2 class="text-center">Das Bröker Framework</h2>
-<hr/>
+<h2 class="text-center">Das Bröker Framework</h2>
+<hr/>
--- a/classes/bfw/mvc/view/layout.tpl
+++ b/classes/bfw/mvc/view/layout.tpl
@@ -1,33 +1,33 @@
-<!DOCTYPE html>
-<html lang="de">
- <head>
- <meta charset="utf-8"/>
- <title>BFW Demo Page</title>
-
- <link href="/js/bootstrap/css/bootstrap.min.css" rel="stylesheet" type="text/css"/>
-
- <link href="/css/main.css" rel="stylesheet" type="text/css"/>
-
- <script type="text/javascript" src="/js/jquery-1.11.3.min.js"></script>
- <script type="text/javascript" src="/js/bootstrap/bootstrap.js"></script>
-
- <script type="text/javascript" src="//tinymce.cachefly.net/4.2/tinymce.min.js"></script>
- <script type="text/javascript" src="/js/main.js"></script>
- </head>
- <body>
- <div id="page">
- {include file="header.tpl"}
- <div class="content">
- {include file="{$controller}/{$action}.tpl"}
- </div>
-
- <div class="footer-area">
- <div class="footer">
- {include file="footer.tpl"}
- </div>
-
- <br class="clearfix"/>
- </div>
- </div>
- </body>
-</html>
+<!DOCTYPE html>
+<html lang="de">
+ <head>
+ <meta charset="utf-8"/>
+ <title>BFW Demo Page</title>
+
+ <link href="/js/bootstrap/css/bootstrap.min.css" rel="stylesheet" type="text/css"/>
+
+ <link href="/css/main.css" rel="stylesheet" type="text/css"/>
+
+ <script type="text/javascript" src="/js/jquery-1.11.3.min.js"></script>
+ <script type="text/javascript" src="/js/bootstrap/bootstrap.js"></script>
+
+ <script type="text/javascript" src="//tinymce.cachefly.net/4.2/tinymce.min.js"></script>
+ <script type="text/javascript" src="/js/main.js"></script>
+ </head>
+ <body>
+ <div id="page">
+ {include file="header.tpl"}
+ <div class="content">
+ {include file="{$controller}/{$action}.tpl"}
+ </div>
+
+ <div class="footer-area">
+ <div class="footer">
+ {include file="footer.tpl"}
+ </div>
+
+ <br class="clearfix"/>
+ </div>
+ </div>
+ </body>
+</html>
--- a/css/main.css
+++ b/css/main.css
@@ -1,110 +1,79 @@
-html, body, p, textarea, input, select {
- margin: 0;
- padding: 0;
-}
-
-p {
- padding: 5px;
-}
-
-label, input, select, textarea {
- width: 100%;
- line-height: 100%;
-}
-
-form textarea {
- min-height: 250px;
-}
-
-.content {
- margin-bottom: 50px;
-}
-
-.text-info {
- color: #080808;
-}
-
-.footer-area {
- height: 30px;
-}
-
-.footer {
- margin: 0;
- padding: 0;
-
- width: 100%;
- text-align: center;
-
- position: fixed;
- bottom: 0;
-
- color: #080808;
- background-color: #e7e7e7;
-
- overflow: hidden;
-}
-
-/* Tabellen Fusch für den Validator */
-table {
- width: 100%;
-}
-
-table, tr, td, th {
- border: 1px solid #000;
-}
-
-.achtel td, .achtel th {
- width: 12.5% !important;
-}
-
-table td, table th {
- text-align: center;
-}
-
-table tr td input {
- text-align: center;
-}
-
-.auto-width {
- width: auto;
-}
-
-.knopf {
- margin-top: 25px;
-
- font-size: 2em;
- border: 2px solid #444;
- background-color: #996666;
-
-}
-
-.knopf a {
- text-decoration: none;
- padding: 20px;
-}
-
-.ellipsis {
- text-overflow: ellipsis;
-}
-
-.bold {
- font-size: 1.5em;
- font-weight: bold;
-}
-
-table input {
- color: #fff;
- background-color: #660000;
-
- padding: 5px;
-}
-
-.red-row, .red-row td input {
- color: #080808;
- background-color: rgb(255, 0, 0);
-}
-
-.yellow-row, .yellow-row td input {
- color: #080808;
- background-color: rgb(255, 255, 0);
+html, body, p, textarea, input, select {
+ margin: 0;
+ padding: 0;
+}
+
+body {
+ font-size: 1.5em;
+ font-family: sans-serif;
+}
+
+p {
+ padding: 5px;
+}
+
+label, input, select, textarea {
+ width: 100%;
+ line-height: 100%;
+}
+
+input, select, textarea {
+ padding: 5px;
+}
+
+form textarea {
+ min-height: 250px;
+}
+
+.content {
+ margin-bottom: 50px;
+}
+
+.text-info {
+ color: #080808;
+}
+
+.footer-area {
+ height: 30px;
+}
+
+.knopf input {
+ color: #fff;
+ background-color: #000;
+
+ padding: 10px;
+ font-size: 1.5em;
+}
+
+.footer {
+ margin: 0;
+ padding: 0;
+
+ width: 100%;
+ text-align: center;
+
+ position: fixed;
+ bottom: 0;
+
+ color: #080808;
+ background-color: #e7e7e7;
+
+ overflow: hidden;
+}
+
+.ellipsis {
+ text-overflow: ellipsis;
+}
+
+.bold {
+ font-size: 1.5em;
+ font-weight: bold;
+}
+
+.form-inline .form-group {
+ width: 100%;
+}
+
+.form-inline .form-group {
+ max-width: 49%;
}
\ No newline at end of file