Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add close buttons #11

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add close buttons #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion app/Http/Controllers/ActivityController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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');
}

Expand Down
4 changes: 3 additions & 1 deletion app/Http/Controllers/TeachingObjectController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)]);
}

/**
Expand Down
5 changes: 2 additions & 3 deletions resources/views/Activity/create.blade.php
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
5 changes: 3 additions & 2 deletions resources/views/Activity/index.blade.php
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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() }}
Expand Down
8 changes: 7 additions & 1 deletion resources/views/Activity/show.blade.php
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
5 changes: 2 additions & 3 deletions resources/views/Activity/update.blade.php
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
5 changes: 2 additions & 3 deletions resources/views/Resource/create.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
1 change: 1 addition & 0 deletions resources/views/Resource/index.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
5 changes: 5 additions & 0 deletions resources/views/Resource/show.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
5 changes: 2 additions & 3 deletions resources/views/Resource/update.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
5 changes: 2 additions & 3 deletions resources/views/Tag/create.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
1 change: 1 addition & 0 deletions resources/views/Tag/index.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
6 changes: 5 additions & 1 deletion resources/views/Tag/show.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
5 changes: 2 additions & 3 deletions resources/views/Tag/update.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
5 changes: 2 additions & 3 deletions resources/views/teachingObject/create.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
3 changes: 2 additions & 1 deletion resources/views/teachingObject/home.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
5 changes: 3 additions & 2 deletions resources/views/teachingObject/index.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
6 changes: 6 additions & 0 deletions resources/views/teachingObject/show.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
5 changes: 2 additions & 3 deletions resources/views/teachingObject/update.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down