]> jfr.im git - z_archive/KronOS.git/commitdiff
Modifications to login window
authorConny Sjöblom <redacted>
Thu, 11 Oct 2012 12:49:57 +0000 (15:49 +0300)
committerConny Sjöblom <redacted>
Thu, 11 Oct 2012 12:49:57 +0000 (15:49 +0300)
video/application/models/core.php
video/application/views/main_view.php

index fcf4cc1bee4ebae399b6a67417f7f8979d182b68..666d573067c331b8faeb627c3f377ac582f3f0f0 100644 (file)
@@ -18,9 +18,9 @@ class Core extends CI_Model {
                        <div class="modal-body">
                                <form class="form-horizontal">
                                        <div class="control-group">
-                                               <label class="control-label" for="inputEmail">Email</label>
+                                               <label class="control-label" for="inputUsername">Username</label>
                                                <div class="controls">
-                                                       <input type="text" id="inputEmail" placeholder="Email">
+                                                       <input type="text" id="inputUsername" placeholder="Username">
                                                </div>
                                        </div>
                                        <div class="control-group">
index b5ccaf89908c52be1093b98107e5d8faab742704..88c1bb60fd74885f4e129aca8b4dc167ef81b99b 100644 (file)
@@ -12,8 +12,6 @@
                <!--[if lt IE 9]>\r
                        <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>\r
                <![endif]-->\r
-               <script src="/public/js/prototype.js" type="text/javascript"></script>\r
-                <script src="/public/js/scriptaculous.js" type="text/javascript"></script>\r
        </head>\r
        <body>\r
                <div class="navbar navbar-inverse navbar-fixed-top">\r
@@ -21,9 +19,9 @@
                                <div class="container-fluid">\r
                                        <a class="brand" href="#">WebOS Dev</a>\r
                                        <div class="nav-collapse collapse menudiv">\r
-                                               <p class="navbar-text pull-right">\r
+                                       <!--<p class="navbar-text pull-right">\r
                                                        Logged in as <a href="#" class="navbar-link">Username</a>\r
-                                               </p>\r
+                                               </p>-->\r
                                        </div>\r
                                </div>\r
                        </div>\r
 <!--           <script src="/public/js/prototype.js" type="text/javascript"></script>\r
                <script src="/public/js/scriptaculous.js" type="text/javascript"></script>-->\r
                <script src="/public/js/jquery.min.js" type="text/javascript"></script>\r
+<!--           <script src="http://code.jquery.com/ui/1.9.0/jquery-ui.js" type="text/javascript"></script>-->\r
                <script src="/public/js/bootstrap.min.js" type="text/javascript"></script>\r
                <script src="/public/js/application.js" type="text/javascript"></script>\r
                <script src="/public/js/less-1.3.0.min.js" type="text/javascript"></script>\r
-\r
-               <script type="text/javascript">\r
-                       new Draggable('drag_demo_1');\r
-                </script>\r
-\r
        </body>\r
 </html>\r