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.

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

Fix/a instead of clickable #409

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions app/views/dataset/collection.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
$collection_name = str_replace(URL::to('/'). '/', '', $collection);
?>

<div class="panel dataset dataset-link collection panel-default clickable-row" data-href='{{ URL::to($collection) }}'>
<a class="panel dataset dataset-link collection panel-default clickable-row" href='{{ URL::to($collection) }}'>
<div class="panel-body">
<div class='icon'>
<i class='fa fa-lg fa-folder-open-o'></i>
Expand All @@ -33,7 +33,7 @@
</div>
</div>
</div>
</div>
</a>

@endforeach

Expand All @@ -42,7 +42,7 @@
$definition_name = str_replace(URL::to('/'). '/', '', $definition);
?>

<div class="panel dataset dataset-link panel-default clickable-row" data-href='{{ URL::to($definition) }}'>
<a class="panel dataset dataset-link panel-default clickable-row" href='{{ URL::to($definition) }}'>
<div class="panel-body">
<div class='icon'>
<i class='fa fa-lg fa-file-text-o'></i>
Expand All @@ -57,7 +57,7 @@
</div>
</div>
</div>
</div>
</a>

@endforeach

Expand Down
6 changes: 3 additions & 3 deletions app/views/ui/datasets/list.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<?php $i = 0; ?>
@foreach($definitions as $definition)

<div class="panel dataset dataset-link button-row panel-default @if(Tdt\Core\Auth\Auth::hasAccess('admin.dataset.update')) clickable-row @endif" data-href='{{ URL::to('api/admin/datasets/edit/' . $definition->id) }}'>
<a class="panel dataset dataset-link button-row panel-default @if(Tdt\Core\Auth\Auth::hasAccess('admin.dataset.update')) clickable-row @endif" href='{{ URL::to('api/admin/datasets/edit/' . $definition->id) }}'>
<div class="panel-body"
@if($i==0)
data-step='3'
Expand Down Expand Up @@ -93,7 +93,7 @@
</div>
</div>
</div>
</div>
</a>

<?php $i++; ?>
@endforeach
Expand Down Expand Up @@ -126,4 +126,4 @@
<i class='fa fa-search'></i>
</div>
@endif
@stop
@stop
6 changes: 0 additions & 6 deletions dev/js/script.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,6 @@
// Syntax highlighting
prettyPrint();

// Clickable rows
$('.clickable-row').on('click', function(){
var url = $(this).data('href');
window.location = url;
});

// Filter datasets and collections
$('#dataset-filter').on('keyup', function(){
var filter = $(this).val();
Expand Down