From 3f394f40e118afce006dd264719462dff55e494d Mon Sep 17 00:00:00 2001
From: RaNaN <Mast3rRaNaN@hotmail.de>
Date: Fri, 18 Jan 2013 22:31:58 +0100
Subject: refractored icons, + generation task

---
 module/web/templates/default/admin.html    | 11 +++++------
 module/web/templates/default/settings.html |  2 +-
 2 files changed, 6 insertions(+), 7 deletions(-)

(limited to 'module/web/templates/default')

diff --git a/module/web/templates/default/admin.html b/module/web/templates/default/admin.html
index 8ed725dda..9bbcc2104 100644
--- a/module/web/templates/default/admin.html
+++ b/module/web/templates/default/admin.html
@@ -10,7 +10,6 @@
 {% endblock %}
 
 {% block require %}
-    App.initSettingsView();
 {% endblock %}
 
 {% block content %}
@@ -20,7 +19,7 @@
             <div class="page-header">
                 <h1>Admin Bereich
                 <small>Userverwaltung, Systeminfos</small>
-                    <a id="btn_newuser" class="btn btn-warning btn-large" type="button"><i class="iconi-plus-sign iconi-large "></i></a>
+                    <a id="btn_newuser" class="btn btn-warning btn-large" type="button"><i class="iconf-plus-sign iconf-large "></i></a>
                 </h1>
                 
 
@@ -29,7 +28,7 @@
 
             <div class="dropdown">        
                 <span class="label name">User</span>
-                <a class="dropdown-toggle" data-toggle="dropdown" href="#"><i class="iconi-user iconi-8x"></i></a>
+                <a class="dropdown-toggle" data-toggle="dropdown" href="#"><i class="iconf-user iconf-8x"></i></a>
                 <ul class="dropdown-menu" role="menu" aria-labelledby="dropdownMenu">
                     <li><a tabindex="-1" id="useredit" href="#" role="button" data-backdrop="true" data-controls-modal="event-modal" data-keyboard="true"><i class="icon-pencil"></i>Edit</a></li>
                     <li><a tabindex="-1" href="#"><i class="icon-tasks"></i>Statistik</a></li>
@@ -48,7 +47,7 @@
                     <table style="width:100%;" class="table ">
                         <td>
                             <div class="input-prepend">
-                                <span class="add-on"><i class="iconi-key"></i></span>
+                                <span class="add-on"><i class="iconf-key"></i></span>
                                 <input class="span2" style="min-width:120px;" id="prependedInput" type="text" placeholder="New Password">
                             </div>
                             <div class="input-prepend">
@@ -190,7 +189,7 @@
       </div>
     </div>
    
-    <script src="static/js/libs/jquery-1.8.3.js"></script>
+    <script src="static/js/libs/jquery-1.9.0.js"></script>
     {##}
     <script src="static/js/libs/bootstrap-2.2.2.js"></script>
     <script type="text/javascript">
@@ -204,7 +203,7 @@
 
             $("#btn_newuser").click(function() {
                  
-                 str = "<div class='dropdown1'><span class='label name'>User</span><a class='dropdown-toggle' data-toggle='dropdown1' href='#'><i class='iconi-user iconi-8x'></i></a><ul class='dropdown-menu' role='menu' aria-labelledby='dropdownMenu'><li><a tabindex='-1' href='#'>Action</a></li><li><a tabindex='-1' href='#'>Another action</a></li><li><a tabindex='-1' href='#'>Something else here</a></li><li class='divider'></li><li><a tabindex='-1' href='#'>Separated link</a></li></ul></div>";
+                 str = "<div class='dropdown1'><span class='label name'>User</span><a class='dropdown-toggle' data-toggle='dropdown1' href='#'><i class='iconf-user iconf-8x'></i></a><ul class='dropdown-menu' role='menu' aria-labelledby='dropdownMenu'><li><a tabindex='-1' href='#'>Action</a></li><li><a tabindex='-1' href='#'>Another action</a></li><li><a tabindex='-1' href='#'>Something else here</a></li><li class='divider'></li><li><a tabindex='-1' href='#'>Separated link</a></li></ul></div>";
 
             $("#userlist").append(str);
 
diff --git a/module/web/templates/default/settings.html b/module/web/templates/default/settings.html
index 77413a222..4c1a3f295 100644
--- a/module/web/templates/default/settings.html
+++ b/module/web/templates/default/settings.html
@@ -108,7 +108,7 @@
             </div>
         </div>
     </div>
-    <script src="static/js/libs/jquery-1.8.3.js"></script>
+    <script src="static/js/libs/jquery-1.9.0.js"></script>
     {#    <script src="static/js/libs/bootstrap-2.1.1.js"></script>#}
     <script type="text/javascript">
         $(".bnmaxspeed").click(function() {
-- 
cgit v1.2.3