From 792d0ea93cfb1ac2436908337bff8d1e3eff013e Mon Sep 17 00:00:00 2001
From: rylon <rylon@web.de>
Date: Mon, 17 Mar 2014 21:11:56 +0100
Subject: [PATCH] uvote bootstrap update menu fix

---
 uVote/page/default_page/loggedinformtop.tpl |  4 +-
 uVote/page/default_page/page.tpl            | 72 +++++++++------------
 2 files changed, 31 insertions(+), 45 deletions(-)
diff --git a/uVote/page/default_page/loggedinformtop.tpl b/uVote/page/default_page/loggedinformtop.tpl
index 091d50a..60f6b36 100644
--- a/uVote/page/default_page/loggedinformtop.tpl
+++ b/uVote/page/default_page/loggedinformtop.tpl
@@ -1,5 +1,3 @@
 <form class="navbar-form pull-right" id="form_logout">
-     <input class="span2" type="hidden" id="hidden" >
-              <button type="submit" class="btn btn-primary">Logout</button>
-              
+    <button type="submit" class="btn btn-primary">Logout</button>              
 </form>
\ No newline at end of file
diff --git a/uVote/page/default_page/page.tpl b/uVote/page/default_page/page.tpl
index 86ac927..0d4ccf9 100644
--- a/uVote/page/default_page/page.tpl
+++ b/uVote/page/default_page/page.tpl
@@ -20,50 +20,38 @@
 
     </head>
 
-    <body style="padding-top: 51px;">
-<div class="modal fade" id="impressum" style="float: left; display:none;">
-  <div class="modal-dialog">
-    <div class="modal-content">
-      <div class="modal-header">
-        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-        <h4 class="modal-title">Impressum</h4>
-      </div>
-      <div class="modal-body">
-          <div style="background: white;">
-              ${impressum_header}
-              ${impressum_1}
-              ${impressum_2}
-              ${impressum_3}
-              ${impressum_4}
-              ${impressum_5}
-              
-          </div>
-      </div>
-      <div class="modal-footer">
-        <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
-      </div>
-    </div><!-- /.modal-content -->
-  </div><!-- /.modal-dialog -->
-</div><!-- /.modal -->
+    <body style="padding-top: 60px;">
+    <div class="modal fade" id="impressum" style="float: left; display:none;">
+        <div class="modal-dialog">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+                    <h4 class="modal-title">Impressum</h4>
+                </div>
+                <div class="modal-body">
+                    <div style="background: white;">
+                        ${impressum_header}
+                        ${impressum_1}
+                        ${impressum_2}
+                        ${impressum_3}
+                        ${impressum_4}
+                        ${impressum_5}
+                    </div>
+                </div>
+                <div class="modal-footer">
+                    <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
+                </div>
+        </div><!-- /.modal-content -->
+      </div><!-- /.modal-dialog -->
+    </div><!-- /.modal -->
+    
         <div class="navbar navbar-inverse navbar-fixed-top" style="">
             <div class="navbar-inner" style="padding-left: 50px; padding-right: 50px;">                
-                <button type="button" class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
-                    <span class="icon-bar"></span>
-                    <span class="icon-bar"></span>
-                    <span class="icon-bar"></span>
-                </button>
-                <a class="brand" href="" id="menu_uvote">uVote</a>
-                <a data-toggle="modal" class="brand" href="#impressum" id="impressum"><font size="2">impressum</font></a>
-
-                <div class="nav-collapse collapse">
-                    <ul class="nav">              
-<!--
-                            <li><a href="#" url="?action=myvote">myVote</a></li>
-                            <li><a href="#" url="?action=Dokumentation">Dokumentation</a></li>
-                            <li><a href="#" url="?action=Download">Download</a></li>
--->              
-                    </ul>              
-                    ${loginform}
+                    <ul class="nav navbar-nav">              
+                        <li><a class="brand" href="" id="menu_uvote">uVote</a></li>
+                        <li><a data-toggle="modal" class="brand" href="#impressum" id="impressum"><font size="2">impressum</font></a></li>
+                        ${loginform}
+                    </ul>                    
                 </div>                
             </div>
         </div>
