Merge pull request #2 from dansullivan86/glyph

fix glyphicons, text and navbar-toggle
MrJuliuss · Aug 29, 2013 · 1686b90 · 1686b90
2 parents 5207d94 + 2a4ff99
commit 1686b90
Show file tree

Hide file tree

Showing 15 changed files with 82 additions and 73 deletions.
diff --git a/public/assets/css/base.css b/public/assets/css/base.css
@@ -20,7 +20,6 @@ body {
     height: 14px;
     margin-top: 1px;
     line-height: 14px;
-    vertical-align: text-top;
 }
 
 a:hover{
@@ -51,8 +50,8 @@ a:hover{
     margin-bottom: 0;
 }
 
-/* Loggued user Navigation */ 
-.navbar { 
+/* Loggued user Navigation */
+.navbar {
     margin-bottom: 0px;
     border-radius: 0px;
 }
@@ -77,8 +76,8 @@ a:hover{
     color: #fff;
 }
 
-.navbar-default .navbar-nav > .open > a, 
-.navbar-default .navbar-nav > .open > a:hover, 
+.navbar-default .navbar-nav > .open > a,
+.navbar-default .navbar-nav > .open > a:hover,
 .navbar-default .navbar-nav > .open > a:focus {
     background-color: #b94a48;
 }
@@ -95,6 +94,17 @@ a:hover{
     background-color: #b94a48;
 }
 
+.navbar-default .navbar-toggle:hover,
+.navbar-default .navbar-toggle:focus {
+    background-color: #b94a48;
+    border-color: #fff;
+}
+
+.navbar-default .navbar-toggle:hover .icon-bar,
+.navbar-default .navbar-toggle:focus .icon-bar {
+    background-color: #fff;
+}
+
 .navbar-default .navbar-nav .open .dropdown-menu > li > a {
     color: #fff;
 }
@@ -109,8 +119,8 @@ a:hover{
     background-image: none;
 }
 
-.navbar-nav > .open > a, 
-.navbar-nav > .open > a:hover, 
+.navbar-nav > .open > a,
+.navbar-nav > .open > a:hover,
 .navbar-nav > .open > a:focus {
     background-color: #b94a48;
 }
@@ -182,7 +192,7 @@ a:hover{
     color: #666;
 }
 
-.table-bordered > thead > tr > th, 
+.table-bordered > thead > tr > th,
 .table-bordered > thead > tr > td {
     border-bottom-width: 0px;
 }
@@ -193,22 +203,22 @@ a:hover{
     margin-right: 0;
 }
 
-select, 
-textarea, 
-input[type="text"], 
-input[type="password"], 
-input[type="datetime"], 
-input[type="datetime-local"], 
-input[type="date"], 
-input[type="month"], 
-input[type="time"], 
-input[type="week"], 
-input[type="number"], 
-input[type="email"], 
-input[type="url"], 
-input[type="search"], 
-input[type="tel"], 
-input[type="color"], 
+select,
+textarea,
+input[type="text"],
+input[type="password"],
+input[type="datetime"],
+input[type="datetime-local"],
+input[type="date"],
+input[type="month"],
+input[type="time"],
+input[type="week"],
+input[type="number"],
+input[type="email"],
+input[type="url"],
+input[type="search"],
+input[type="tel"],
+input[type="color"],
 .uneditable-input {
     font-family: 'Roboto',Arial,sans-serif;
     font-size: 13px;
@@ -221,7 +231,7 @@ input[type="color"],
     padding: 5px 12px;
 }
 
-.add-input, 
+.add-input,
 .remove-input {
     cursor: pointer;
 }
@@ -239,7 +249,7 @@ input[type="color"],
     display: table;
 }
 
-/** Module part **/ 
+/** Module part **/
 .module {
     border: 1px solid #d2d4d8;
     border-radius: 3px;

diff --git a/...ets/fonts/glyphiconshalflings-regular.eot → ...ts/fonts/glyphicons-halflings-regular.eot b/...ets/fonts/glyphiconshalflings-regular.eot → ...ts/fonts/glyphicons-halflings-regular.eot
diff --git a/...ets/fonts/glyphiconshalflings-regular.otf → ...ts/fonts/glyphicons-halflings-regular.otf b/...ets/fonts/glyphiconshalflings-regular.otf → ...ts/fonts/glyphicons-halflings-regular.otf
diff --git a/...ets/fonts/glyphiconshalflings-regular.svg → ...ts/fonts/glyphicons-halflings-regular.svg b/...ets/fonts/glyphiconshalflings-regular.svg → ...ts/fonts/glyphicons-halflings-regular.svg
diff --git a/...ets/fonts/glyphiconshalflings-regular.ttf → ...ts/fonts/glyphicons-halflings-regular.ttf b/...ets/fonts/glyphiconshalflings-regular.ttf → ...ts/fonts/glyphicons-halflings-regular.ttf
diff --git a/...ts/fonts/glyphiconshalflings-regular.woff → ...s/fonts/glyphicons-halflings-regular.woff b/...ts/fonts/glyphiconshalflings-regular.woff → ...s/fonts/glyphicons-halflings-regular.woff
diff --git a/src/controllers/DashboardController.php b/src/controllers/DashboardController.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 
 namespace MrJuliuss\Syntara\Controllers;
 
@@ -11,18 +11,18 @@
 use Config;
 use Response;
 
-class DashboardController extends BaseController 
+class DashboardController extends BaseController
 {
     /**
     * Index loggued page
     */
     public function getIndex()
     {
         $this->layout = View::make('syntara::dashboard.index');
-        $this->layout->title = 'Index';
+        $this->layout->title = 'Dashboard';
         $this->layout->breadcrumb = Config::get('syntara::breadcrumbs.dashboard');
     }
-    
+
     /**
     * Login page
     */
@@ -44,12 +44,12 @@ public function postLogin()
                 Input::all(),
                 Config::get('syntara::rules.users.login')
             );
-            
+
             if($validator->fails())
             {
                  return Response::json(array('logged' => false, 'errorMessages' => $validator->messages()->getMessages()));
             }
-            
+
             $credentials = array(
                 'email'    => Input::get('email'),
                 'password' => Input::get('pass'),
@@ -62,18 +62,18 @@ public function postLogin()
         {
             return Response::json(array('logged' => false, 'errorMessage' => 'Sorry, login failed... check your credentials.', 'errorType' => 'danger'));
         }
-        
+
         return Response::json(array('logged' => true));
     }
-    
+
     /**
     * Logout user
     */
     public function getLogout()
     {
         Sentry::logout();
-        
-        return Redirect::route('indexDashboard'); 
+
+        return Redirect::route('indexDashboard');
     }
 
     /**

diff --git a/src/views/group/index-group.blade.php b/src/views/group/index-group.blade.php
@@ -22,11 +22,11 @@
                 <div class="module-body">
                     <form id="search-form" onsubmit="return false;">
                         <div class="form-group">
-                            <label for="groupIdSearch">Group id :</label>
+                            <label for="groupIdSearch">Group id</label>
                             <input type="text" class="form-control" id="groupIdSearch" name="groupIdSearch">
                         </div>
                         <div class="form-group">
-                            <label for="groupnameSearch">Group name :</label>
+                            <label for="groupnameSearch">Group name</label>
                             <input type="text" class="form-control" id="groupnameSearch" name="groupnameSearch">
                         </div>
                         <button type="submit" class="btn btn-primary">Search</button>

diff --git a/src/views/group/list-users-group.blade.php b/src/views/group/list-users-group.blade.php
@@ -1,6 +1,6 @@
 <div class="row upper-menu" style="height: 35px;">
     {{ $users->links() }}
-    
+
     <div style="float:right;">
         <a id="delete-item" class="btn btn-danger users">Delete</a>
     </div>
@@ -12,7 +12,7 @@
         @if($currentUser->hasAccess('user-group-management'))
         <th style="width:20px; text-align: center;"><input type="checkbox" class="check-all"></th>
         @endif
-        <th style="width:20px; text-align: center;">Id</th>
+        <th style="width:20px; text-align: center;">ID</th>
         <th style="width:200px;">Username</th>
         <th style="width:30px; text-align: center;">Show</th>
     </tr>

diff --git a/src/views/group/new-group.blade.php b/src/views/group/new-group.blade.php
@@ -14,13 +14,13 @@
                         <div class="row">
                             <div class="col-lg-6">
                                 <div class="form-group">
-                                   <label class="control-label">Group name :</label>
+                                   <label class="control-label">Group name</label>
                                     <input class="col-lg-12 form-control" type="text" id="groupname" name="groupname">
                                </div>
                             </div>
                             <div class="col-lg-6" id="input-container">
                                 <div class="form-group">
-                                <label class="control-label">Permissions :</a></label>
+                                <label class="control-label">Permissions</a></label>
                                 <p class="input-group">
                                     <span class="input-group-addon"><span class="glyphicon glyphicon-plus-sign add-input"></span></span>
                                     <input type="text" class="form-control" name="permission[1]" />

diff --git a/src/views/group/show-group.blade.php b/src/views/group/show-group.blade.php
@@ -1,7 +1,7 @@
 @extends('syntara::layouts.dashboard.master')
 
 @section('content')
-<script src="{{ asset('packages/mrjuliuss/syntara/assets/js/dashboard/group.js') }}"></script> 
+<script src="{{ asset('packages/mrjuliuss/syntara/assets/js/dashboard/group.js') }}"></script>
 <?php $permissions = array_keys($group->getPermissions()) ?>
 <div class="container" id="main-container">
     <div class="row">
@@ -15,13 +15,13 @@
                         <div class="row">
                             <div class="col-lg-6">
                                 <div class="form-group">
-                                   <label class="control-label">Group name :</label>
+                                   <label class="control-label">Group name</label>
                                     <input class="col-lg-12 form-control" type="text" id="groupname" name="groupname" value="{{ $group->name }}">
                                </div>
                             </div>
                             <div class="col-lg-6" id="input-container">
                                 <div class="form-group">
-                                    <label class="control-label">Permissions :</a></label>
+                                    <label class="control-label">Permissions</a></label>
                                     <p class="input-group">
                                         <span class="input-group-addon"><span class="glyphicon glyphicon-plus-sign add-input"></span></span>
                                         <input type="text" class="form-control" name="permission[1]" value="{{ $permissions[0] }}"/>

diff --git a/src/views/layouts/dashboard/master.blade.php b/src/views/layouts/dashboard/master.blade.php
@@ -1,7 +1,6 @@
 <html>
     <head>
         <link rel="stylesheet" href="{{ asset('packages/mrjuliuss/syntara/assets/css/bootstrap.min.css') }}" />
-        <link rel="stylesheet" href="{{ asset('packages/mrjuliuss/syntara/assets/css/bootstrap-glyphicons.css') }}" />
         <link rel="stylesheet" href="{{ asset('packages/mrjuliuss/syntara/assets/css/base.css') }}" media="all">
 
         <script src="{{ asset('packages/mrjuliuss/syntara/assets/js/jquery-2.0.3.min.js') }}"></script>

diff --git a/src/views/user/index-user.blade.php b/src/views/user/index-user.blade.php
@@ -1,7 +1,7 @@
 @extends('syntara::layouts.dashboard.master')
 
 @section('content')
-<script src="{{ asset('packages/mrjuliuss/syntara/assets/js/dashboard/user.js') }}"></script> 
+<script src="{{ asset('packages/mrjuliuss/syntara/assets/js/dashboard/user.js') }}"></script>
 
 <div class="container" id="main-container">
     <div class="row">
@@ -23,15 +23,15 @@
                 <div class="module-body">
                     <form id="search-form" onsubmit="return false;">
                         <div class="form-group">
-                            <label for="userIdSearch">User id :</label>
+                            <label for="userIdSearch">User ID</label>
                             <input type="text" class="form-control" id="userIdSearch" name="userIdSearch">
                         </div>
                         <div class="form-group">
-                            <label for="usernameSearch">User name :</label>
+                            <label for="usernameSearch">Username</label>
                             <input type="text" class="form-control" id="usernameSearch" name="usernameSearch">
                         </div>
                         <div class="form-group">
-                            <label for="emailSearch">Email :</label>
+                            <label for="emailSearch">Email</label>
                             <input type="email" class="form-control" id="emailSearch" name="emailSearch">
                         </div>
                         <button type="submit" class="btn btn-primary">Search</button>

diff --git a/src/views/user/new-user.blade.php b/src/views/user/new-user.blade.php
@@ -1,7 +1,7 @@
 @extends('syntara::layouts.dashboard.master')
 
 @section('content')
-<script src="{{ asset('packages/mrjuliuss/syntara/assets/js/dashboard/user.js') }}"></script> 
+<script src="{{ asset('packages/mrjuliuss/syntara/assets/js/dashboard/user.js') }}"></script>
 <div class="container" id="main-container">
     <div class="row">
         <div class="col-lg-12">
@@ -14,36 +14,36 @@
                         <div class="row">
                             <div class="col-lg-6">
                                  <div class="form-group">
-                                    <label class="control-label">User name :</label>
+                                    <label class="control-label">Username</label>
                                     <p><input class="col-lg-12 form-control" type="text" placeholder="User name" id="username" name="username"></p>
                                 </div>
                                 <div class="form-group">
-                                    <label class="control-label">Email :</label>
+                                    <label class="control-label">Email</label>
                                     <p><input class="col-lg-12 form-control" type="text" placeholder="Email" id="email" name="email"></p>
                                 </div>
                                 <div class="form-group">
-                                    <label class="control-label">Password :</label>
+                                    <label class="control-label">Password</label>
                                     <p><input class="col-lg-12 form-control" type="password" placeholder="Password" id="pass" name="pass"></p>
                                 </div>
                             </div>
                             <div class="col-lg-6">
                                 <div class="form-group">
-                                    <label class="control-label">Last name :</label>
+                                    <label class="control-label">Last name</label>
                                     <p><input class="col-lg-12 form-control" type="text" placeholder="Last name" id="last_name" name="last_name"></p>
                                 </div>
                                 <div class="form-group">
-                                    <label class="control-label">First name : </label>
+                                    <label class="control-label">First name </label>
                                     <p><input class="col-lg-12 form-control" type="text" placeholder="First name" id="first_name" name="first_name"></p>
                                 </div>
                             </div>
                             @if($currentUser->hasAccess('user-group-management'))
                             <div class="col-lg-6">
                                 <div class="form-group">
-                                    <label class="control-label">Groups :</label>
+                                    <label class="control-label">Groups</label>
                                 </div>
                                     @foreach($groups as $group)
                                     <label class="checkbox-inline">
-                                        <input type="checkbox" id="groups[{{ $group->getId() }}]" name="groups[]" value="{{ $group->getId() }}">{{ $group->getName() }} 
+                                        <input type="checkbox" id="groups[{{ $group->getId() }}]" name="groups[]" value="{{ $group->getId() }}">{{ $group->getName() }}
                                     </label>
                                     @endforeach
                             </div>