Version 4.0.2 - UI updates for Bootstrap v4 Alpha 6

shivampaw · Feb 23, 2017 · 6ebe7f6 · 6ebe7f6
2 parents 7096e37 + cce0342
commit 6ebe7f6
Show file tree

Hide file tree

Showing 16 changed files with 32 additions and 47 deletions.
diff --git a/public/js/app.js b/public/js/app.js
@@ -16,7 +16,7 @@
       var httpMethod = link.data('method').toUpperCase();
       var form;
 
-      // If the data-method attribute is not PUT or DELETE,
+      // If the data-method attribute is not PUT, POST or DELETE,
       // then we don't know what to do. Just ignore.
       if ( $.inArray(httpMethod, ['PUT', 'DELETE', 'POST']) === - 1 ) {
         return;

diff --git a/public/js/newInvoice.js b/public/js/newInvoice.js
@@ -2,11 +2,10 @@ $('#recurring_check').click(function() {
   $('.recurring')[this.checked ? "show" : "hide"]();
 });
 
-
-
 var index = 0;
 
-$(document).on('ready', function(){
+$(document).ready(function(){
+  console.log("Adding");
   add();
 });
 

diff --git a/resources/views/adminsOnly/clients/edit.blade.php b/resources/views/adminsOnly/clients/edit.blade.php
@@ -28,6 +28,8 @@
 	</div>
 </form>
 
+<hr />
+
 <p>
 	<a href="/clients/{{ $client->id }}" class="btn btn-info"><span class="fa fa-angle-double-left"></span> Back to Client</a>
 </p>

diff --git a/resources/views/adminsOnly/clients/index.blade.php b/resources/views/adminsOnly/clients/index.blade.php
@@ -8,7 +8,7 @@
 	</p>
 	<div class="row">
 		@foreach($clients as $client)
-			<div class="col-lg-4 col-sm-6">
+			<div class="col-lg-4 col-sm-6 mt-3">
 				<div class="card text-center">
 					<div class="card-block">
 						<h4 class="card-title">{{ $client->name }}</h4>

diff --git a/resources/views/adminsOnly/clients/show.blade.php b/resources/views/adminsOnly/clients/show.blade.php
@@ -5,7 +5,7 @@
 @section('content')
 
     <div class="row text-center">
-		<div class="col-md-6">
+		<div class="col-md-6 mt-3">
 			<div class="card">
 				<div class="card-block">
 					<h4 class="card-title">Client Details</h4>
@@ -18,7 +18,7 @@
 			</div>
 		</div>
 
-		<div class="col-md-6">
+		<div class="col-md-6 mt-3">
 			<div class="card">
 				<div class="card-block">
 					<h4 class="card-title">Client Address</h4>
@@ -31,7 +31,7 @@
 			</div>
 		</div>
 
-		<div class="col-md-6">
+		<div class="col-md-6 mt-3">
 			<div class="card">
 				<div class="card-block">
 					<h4 class="card-title">Invoices</h4>
@@ -44,7 +44,7 @@
 			</div>
 		</div>
 
-		<div class="col-md-6">
+		<div class="col-md-6 mt-3">
 			<div class="card">
 				<div class="card-block">
 					<h4 class="card-title">Projects</h4>

diff --git a/resources/views/adminsOnly/invoices/create.blade.php b/resources/views/adminsOnly/invoices/create.blade.php
@@ -43,6 +43,8 @@
         </div>
     </form>
 
+    <hr />
+
     <p>
         <a href="/clients/{{ $client->id }}/invoices" class="btn btn-info"><span class="fa fa-angle-double-left"></span> Back to Client Invoices</a>
     </p>

diff --git a/resources/views/adminsOnly/invoices/index.blade.php b/resources/views/adminsOnly/invoices/index.blade.php
@@ -10,6 +10,8 @@
 
 @include("layouts.invoices.index")
 
+<hr />
+
 <p>
 	<a href="/clients/{{ $client->id }}" class="btn btn-info"><span class="fa fa-angle-double-left"></span> Back to Client</a>
 </p>

diff --git a/resources/views/adminsOnly/projects/create.blade.php b/resources/views/adminsOnly/projects/create.blade.php
@@ -23,6 +23,12 @@
 	</div>
 </form>
 
+<hr />
+
+<p>
+    <a href="/clients/{{ $client->id }}/projects" class="btn btn-info"><span class="fa fa-angle-double-left"></span> Back to Client Projects</a>
+</p>
+
 @endsection
 
 @section('footer')

diff --git a/resources/views/adminsOnly/projects/edit.blade.php b/resources/views/adminsOnly/projects/edit.blade.php
diff --git a/resources/views/adminsOnly/projects/index.blade.php b/resources/views/adminsOnly/projects/index.blade.php
@@ -10,6 +10,8 @@
 
 @include("layouts.projects.index")
 
+<hr />
+
 <p>
 	<a href="/clients/{{ $client->id }}" class="btn btn-info"><span class="fa fa-angle-double-left"></span> Back to Client</a>
 </p>

diff --git a/resources/views/clientsOnly/invoices/pay.blade.php b/resources/views/clientsOnly/invoices/pay.blade.php
@@ -38,6 +38,9 @@
             <button id="payInvoiceBtn" type="submit" class="btn btn-primary btn-block">Pay Invoice</button>
         </div>
     </form>
+
+    <hr />
+
     <a href="/invoices/{{ $invoice->id }}" class="btn btn-danger"><span class="fa fa-angle-double-left"></span> Back to Invoice</a>
 @endsection
 

diff --git a/resources/views/clientsOnly/invoices/show.blade.php b/resources/views/clientsOnly/invoices/show.blade.php
@@ -6,6 +6,8 @@
 
     @include("layouts.invoices.show")
 
+	<hr />
+
     <div class="text-center">
         <a  href="/invoices" class="btn btn-info float-md-left"><span class="fa fa-angle-double-left"></span> Back to Invoices</a>
         @if(!$invoice->paid)

diff --git a/resources/views/layouts/invoices/index.blade.php b/resources/views/layouts/invoices/index.blade.php
@@ -1,6 +1,6 @@
 <div class="row">
     @foreach($invoices as $invoice)
-        <div class="col-lg-4 col-sm-6">
+        <div class="col-lg-4 col-sm-6 mt-3">
             <div class="card client text-center">
                 <div class="card-block">
                     <h4 class="card-title">Invoice #{{ $invoice->id }}</h4>

diff --git a/resources/views/layouts/projects/index.blade.php b/resources/views/layouts/projects/index.blade.php
@@ -1,6 +1,6 @@
 <div class="row">
     @foreach($projects as $project)
-        <div class="col-lg-4 col-sm-6">
+        <div class="col-lg-4 col-sm-6 mt-3">
             <div class="card client text-center">
                 <div class="card-block">
                     <h5 class="card-title">{{ $project->title }}</h5>

diff --git a/resources/views/superAdminOnly/admins/edit.blade.php b/resources/views/superAdminOnly/admins/edit.blade.php
@@ -20,6 +20,8 @@
 	</div>
 </form>
 
+<hr />
+
 <p>
 	<a href="/admins" class="btn btn-info"><span class="fa fa-angle-double-left"></span> Back to Admins</a>
 </p>

diff --git a/resources/views/superAdminOnly/admins/index.blade.php b/resources/views/superAdminOnly/admins/index.blade.php
@@ -8,7 +8,7 @@
 	</p>
 	<div class="row">
 		@foreach($admins as $admin)
-			<div class="col-lg-4 col-sm-6">
+			<div class="col-lg-4 col-sm-6 mt-3">
 				<div class="card admin text-center">
 					<div class="card-block">
 						<h4 class="card-title">{{ $admin->name }}</h4>
-Original file line number
+Diff line change
@@ Expand Up / @@ -28,6 +28,8 @@ @@
     	</div>
     </form>
+    <hr />
     <p>
     	<a href="/clients/{{ $client->id }}" class="btn btn-info"><span class="fa fa-angle-double-left"></span> Back to Client</a>
     </p>
@@ Expand Down @@