From 641f1813fd2621e406fa3f145c846c600f11074d Mon Sep 17 00:00:00 2001
From: Ignacio Jonas <ignaciojonas@gmail.com>
Date: Mon, 12 Mar 2018 23:07:54 -0300
Subject: [PATCH] Add close buttons

---
 app/Http/Controllers/ActivityController.php       | 1 -
 app/Http/Controllers/TeachingObjectController.php | 4 +++-
 resources/views/Activity/create.blade.php         | 5 ++---
 resources/views/Activity/index.blade.php          | 5 +++--
 resources/views/Activity/show.blade.php           | 8 +++++++-
 resources/views/Activity/update.blade.php         | 5 ++---
 resources/views/Resource/create.blade.php         | 5 ++---
 resources/views/Resource/index.blade.php          | 1 +
 resources/views/Resource/show.blade.php           | 5 +++++
 resources/views/Resource/update.blade.php         | 5 ++---
 resources/views/Tag/create.blade.php              | 5 ++---
 resources/views/Tag/index.blade.php               | 1 +
 resources/views/Tag/show.blade.php                | 6 +++++-
 resources/views/Tag/update.blade.php              | 5 ++---
 resources/views/teachingObject/create.blade.php   | 5 ++---
 resources/views/teachingObject/home.blade.php     | 3 ++-
 resources/views/teachingObject/index.blade.php    | 5 +++--
 resources/views/teachingObject/show.blade.php     | 6 ++++++
 resources/views/teachingObject/update.blade.php   | 5 ++---
 19 files changed, 52 insertions(+), 33 deletions(-)
 mode change 100644 => 100755 resources/views/Activity/create.blade.php
 mode change 100644 => 100755 resources/views/Activity/index.blade.php
 mode change 100644 => 100755 resources/views/Activity/show.blade.php
 mode change 100644 => 100755 resources/views/Activity/update.blade.php

diff --git a/app/Http/Controllers/ActivityController.php b/app/Http/Controllers/ActivityController.php
index aaefa02..5b739a9 100644
--- a/app/Http/Controllers/ActivityController.php
+++ b/app/Http/Controllers/ActivityController.php
@@ -72,7 +72,6 @@ public function edit(Activity $activity)
     public function update(Request $request, Activity $activity)
     {
       $activity->update($request->all());
-
       return redirect()->route('activity.index');
     }
 
diff --git a/app/Http/Controllers/TeachingObjectController.php b/app/Http/Controllers/TeachingObjectController.php
index 6d378a4..9dc8739 100644
--- a/app/Http/Controllers/TeachingObjectController.php
+++ b/app/Http/Controllers/TeachingObjectController.php
@@ -75,7 +75,9 @@ public function edit(TeachingObject $teachingObject)
       $tags = Tag::all();
       $resources = Resource::all();
       $activities = Activity::all();
-      return view('teachingObject.update',['teachingObject'=> $teachingObject, 'users' => $users, 'authors' => $this->getIds($teachingObject->authors), 'tags' => $tags, 'Tags'=> $this->getIds($teachingObject->Tags), 'resources' => $resources, 'Resources' => $this->getIds($teachingObject->Resources), 'activities' => $activities, 'Activities' => $this->getIds($teachingObject->Activities)]);
+      return view('teachingObject.update',['teachingObject'=> $teachingObject, 'users' => $users, 'authors' => $this->getIds($teachingObject->authors),
+       'tags' => $tags, 'Tags'=> $this->getIds($teachingObject->Tags), 'resources' => $resources, 'Resources' => $this->getIds($teachingObject->Resources),
+       'activities' => $activities, 'Activities' => $this->getIds($teachingObject->Activities)]);
     }
 
     /**
diff --git a/resources/views/Activity/create.blade.php b/resources/views/Activity/create.blade.php
old mode 100644
new mode 100755
index 98c0a84..8a7fe97
--- a/resources/views/Activity/create.blade.php
+++ b/resources/views/Activity/create.blade.php
@@ -40,9 +40,8 @@
 
                        <div class="form-group">
                             <div class="col-md-8 col-md-offset-4">
-                                <button type="submit" class="btn btn-primary">
-                                    Grabar
-                                </button>
+                                <button type="submit" class="btn btn-primary">Grabar</button>
+                                <a class='btn btn-primary btn-md' href="{{route('activity.index')}}">Cerrar</a>
                             </div>
                         </div>
 
diff --git a/resources/views/Activity/index.blade.php b/resources/views/Activity/index.blade.php
old mode 100644
new mode 100755
index 5a9e9fc..4c4a54f
--- a/resources/views/Activity/index.blade.php
+++ b/resources/views/Activity/index.blade.php
@@ -8,6 +8,7 @@
                 <div class="panel-heading">
                   Lista de Actividades
                   <a class='btn btn-primary btn-sm pull-right' href="{{route('activity.create')}}">Crear</a>
+                  <a class='btn btn-primary btn-sm' href="{{route('home')}}">Cerrar</a>
                 </div>
                 <table class="table table-striped">
                   <tr>
@@ -20,8 +21,8 @@
                   <tr>
                     <td><a href="{{route('activity.show', $activity)}}">{{$activity->procedure}}</a></td>
                     <td><a href="{{route('activity.show', $activity)}}">{{$activity->suggestions}}</a></td>
-                      <td><a href="{{route('activity.show', $activity)}}">{{$activity->achievementExpectation}}</a></td>
-                        <td><a href="{{route('activity.show', $activity)}}">{{$activity->implementationResult}}</a></td>
+                    <td><a href="{{route('activity.show', $activity)}}">{{$activity->achievementExpectation}}</a></td>
+                    <td><a href="{{route('activity.show', $activity)}}">{{$activity->implementationResult}}</a></td>
                     <td>
                       <form  action="{{route('activity.destroy', $activity)}}" method="post">
                         {{ csrf_field() }}
diff --git a/resources/views/Activity/show.blade.php b/resources/views/Activity/show.blade.php
old mode 100644
new mode 100755
index c243546..41600a3
--- a/resources/views/Activity/show.blade.php
+++ b/resources/views/Activity/show.blade.php
@@ -39,7 +39,13 @@
                             </div>
                         </div>
 
-                    </form>
+                        <div class="form-group">
+                            <div class="col-md-8 col-md-offset-4">
+                               <a class='btn btn-primary btn-md' href="{{route('activity.index')}}">Cerrar</a>
+                            </div>
+                        <div>
+
+                      </form>
                 </div>
             </div>
         </div>
diff --git a/resources/views/Activity/update.blade.php b/resources/views/Activity/update.blade.php
old mode 100644
new mode 100755
index 5e1667c..9903a5b
--- a/resources/views/Activity/update.blade.php
+++ b/resources/views/Activity/update.blade.php
@@ -42,9 +42,8 @@
 
                         <div class="form-group">
                             <div class="col-md-8 col-md-offset-4">
-                                <button type="submit" class="btn btn-primary">
-                                    Actualizar
-                                </button>
+                                <button type="submit" class="btn btn-primary">Actualizar</button>
+                                <a class='btn btn-primary btn-md' href="{{route('activity.index')}}">Cerrar</a>
                             </div>
                         </div>
                     </form>
diff --git a/resources/views/Resource/create.blade.php b/resources/views/Resource/create.blade.php
index 02fecf9..65d22c1 100644
--- a/resources/views/Resource/create.blade.php
+++ b/resources/views/Resource/create.blade.php
@@ -26,9 +26,8 @@
 
                        <div class="form-group">
                             <div class="col-md-8 col-md-offset-4">
-                                <button type="submit" class="btn btn-primary">
-                                    Grabar
-                                </button>
+                                <button type="submit" class="btn btn-primary">Grabar</button>
+                                <a class='btn btn-primary btn-md' href="{{route('resource.index')}}">Cerrar</a>
                             </div>
                         </div>
 
diff --git a/resources/views/Resource/index.blade.php b/resources/views/Resource/index.blade.php
index 86f1b2b..b8a67a9 100644
--- a/resources/views/Resource/index.blade.php
+++ b/resources/views/Resource/index.blade.php
@@ -8,6 +8,7 @@
                 <div class="panel-heading">
                   Lista de Recursos
                   <a class='btn btn-primary btn-sm pull-right' href="{{route('resource.create')}}">Crear</a>
+                  <a class='btn btn-primary btn-sm' href="{{route('home')}}">Cerrar</a>
                 </div>
                 <table class="table table-striped">
                   <tr>
diff --git a/resources/views/Resource/show.blade.php b/resources/views/Resource/show.blade.php
index f179ae4..d58ad6f 100644
--- a/resources/views/Resource/show.blade.php
+++ b/resources/views/Resource/show.blade.php
@@ -25,6 +25,11 @@
                             </div>
                         </div>
 
+                        <div class="form-group">
+                            <div class="col-md-8 col-md-offset-4">
+                               <a class='btn btn-primary btn-md' href="{{route('resource.index')}}">Cerrar</a>
+                            </div>
+                        <div>
                     </form>
                 </div>
             </div>
diff --git a/resources/views/Resource/update.blade.php b/resources/views/Resource/update.blade.php
index ee67d56..50d76e3 100644
--- a/resources/views/Resource/update.blade.php
+++ b/resources/views/Resource/update.blade.php
@@ -28,9 +28,8 @@
 
                         <div class="form-group">
                             <div class="col-md-8 col-md-offset-4">
-                                <button type="submit" class="btn btn-primary">
-                                    Actualizar
-                                </button>
+                                <button type="submit" class="btn btn-primary">Actualizar</button>
+                                <a class='btn btn-primary btn-md' href="{{route('resource.index')}}">Cerrar</a>
                             </div>
                         </div>
                     </form>
diff --git a/resources/views/Tag/create.blade.php b/resources/views/Tag/create.blade.php
index ff50d04..7854176 100644
--- a/resources/views/Tag/create.blade.php
+++ b/resources/views/Tag/create.blade.php
@@ -26,9 +26,8 @@
 
                        <div class="form-group">
                             <div class="col-md-8 col-md-offset-4">
-                                <button type="submit" class="btn btn-primary">
-                                    Grabar
-                                </button>
+                                <button type="submit" class="btn btn-primary">Grabar</button>
+                                <a class='btn btn-primary btn-md' href="{{route('tag.index')}}">Cerrar</a>
                             </div>
                         </div>
 
diff --git a/resources/views/Tag/index.blade.php b/resources/views/Tag/index.blade.php
index 46fc4a1..e57d9c0 100644
--- a/resources/views/Tag/index.blade.php
+++ b/resources/views/Tag/index.blade.php
@@ -8,6 +8,7 @@
                 <div class="panel-heading">
                   Lista de Tags
                   <a class='btn btn-primary btn-sm pull-right' href="{{route('tag.create')}}">Crear</a>
+                  <a class='btn btn-primary btn-sm' href="{{route('home')}}">Cerrar</a>
                 </div>
                 <table class="table table-striped">
                   <tr>
diff --git a/resources/views/Tag/show.blade.php b/resources/views/Tag/show.blade.php
index 8016b94..1fa58b4 100644
--- a/resources/views/Tag/show.blade.php
+++ b/resources/views/Tag/show.blade.php
@@ -23,7 +23,11 @@
                                 <textarea id="description" name="description">{{$tag->description}}</textarea>
                             </div>
                         </div>
-
+                        <div class="form-group">
+                            <div class="col-md-8 col-md-offset-4">
+                               <a class='btn btn-primary btn-md' href="{{route('tag.index')}}">Cerrar</a>
+                            </div>
+                        <div>
                     </form>
                 </div>
             </div>
diff --git a/resources/views/Tag/update.blade.php b/resources/views/Tag/update.blade.php
index ca7dfe0..20f7fa8 100644
--- a/resources/views/Tag/update.blade.php
+++ b/resources/views/Tag/update.blade.php
@@ -28,9 +28,8 @@
 
                         <div class="form-group">
                             <div class="col-md-8 col-md-offset-4">
-                                <button type="submit" class="btn btn-primary">
-                                    Actualizar
-                                </button>
+                                <button type="submit" class="btn btn-primary">Actualizar</button>
+                                <a class='btn btn-primary btn-md' href="{{route('tag.index')}}">Cerrar</a>  
                             </div>
                         </div>
                     </form>
diff --git a/resources/views/teachingObject/create.blade.php b/resources/views/teachingObject/create.blade.php
index b4d1f20..e8233c3 100644
--- a/resources/views/teachingObject/create.blade.php
+++ b/resources/views/teachingObject/create.blade.php
@@ -114,9 +114,8 @@
 
                         <div class="form-group">
                             <div class="col-md-8 col-md-offset-4">
-                                <button type="submit" class="btn btn-primary">
-                                    Grabar
-                                </button>
+                                <button type="submit" class="btn btn-primary">Grabar</button>
+                                <a class='btn btn-primary btn-md' href="{{route('teachingObject.index')}}">Cerrar</a>
                             </div>
                         </div>
                     </form>
diff --git a/resources/views/teachingObject/home.blade.php b/resources/views/teachingObject/home.blade.php
index 98ccb5a..c21a2f3 100644
--- a/resources/views/teachingObject/home.blade.php
+++ b/resources/views/teachingObject/home.blade.php
@@ -18,10 +18,11 @@
                 <div class="panel-body">
                     <a href="/resource">Recursos</a>
                 </div>
-                
+
                 <div class="panel-body">
                     <a href="/activity">Actividades</a>
                 </div>
+
             </div>
         </div>
     </div>
diff --git a/resources/views/teachingObject/index.blade.php b/resources/views/teachingObject/index.blade.php
index acf7006..b4614f1 100644
--- a/resources/views/teachingObject/index.blade.php
+++ b/resources/views/teachingObject/index.blade.php
@@ -7,12 +7,13 @@
             <div class="panel panel-default">
                 <div class="panel-heading">
                   Objeto de Enseñanza
-                  <a class='btn btn-primary btn-sm pull-right' href="{{route('teachingObject.create')}}">Crear</a>
+                  <a class='btn btn-primary btn-sm pull-right' href= "{{route('teachingObject.create')}}">Crear</a>
+                  <a class='btn btn-primary btn-sm' href="{{route('home')}}">Cerrar</a>
                 </div>
 
                 <table class="table table-striped">
                   <tr>
-                    <th>Titulo</th>
+                    <th>Título</th>
                     <th>Autores</th>
                     <th>Acciones</th>
                   </tr>
diff --git a/resources/views/teachingObject/show.blade.php b/resources/views/teachingObject/show.blade.php
index aa5ad06..16883db 100644
--- a/resources/views/teachingObject/show.blade.php
+++ b/resources/views/teachingObject/show.blade.php
@@ -114,6 +114,12 @@
                             </select>
                         </div>
 
+                        <div class="form-group">
+                            <div class="col-md-8 col-md-offset-4">
+                               <a class='btn btn-primary btn-md' href="{{route('teachingObject.index')}}">Cerrar</a>
+                            </div>
+                        <div>
+
                     </form>
                 </div>
             </div>
diff --git a/resources/views/teachingObject/update.blade.php b/resources/views/teachingObject/update.blade.php
index 094e0e6..02d88cf 100644
--- a/resources/views/teachingObject/update.blade.php
+++ b/resources/views/teachingObject/update.blade.php
@@ -134,9 +134,8 @@
 
                         <div class="form-group">
                             <div class="col-md-8 col-md-offset-4">
-                                <button type="submit" class="btn btn-primary">
-                                    Actualizar
-                                </button>
+                                <button type="submit" class="btn btn-primary">Actualizar</button>
+                                <a class='btn btn-primary btn-md' href="{{route('teachingObject.index')}}">Cerrar</a>
                             </div>
                         </div>
                     </form>