# HG changeset patch # User ymh # Date 1478144598 -3600 # Node ID 2204faa0b41a77d09bd873af7f70ae8385962f33 # Parent 202b6f209b9a32d943e3d1ef3a73bb994395248d Correct problem in spaqrl client in php 56 + add line numbering in result table diff -r 202b6f209b9a -r 2204faa0b41a build/build.sh --- a/build/build.sh Thu Nov 03 03:05:43 2016 +0100 +++ b/build/build.sh Thu Nov 03 04:43:18 2016 +0100 @@ -50,12 +50,14 @@ echoblue "---> checking vagrant" if vagrant status | grep -q -v "running"; then echoblue "---> starting vagrant" - if type -t workon > /dev/null 2>&1; then + if which virtualenvwrapper.sh > /dev/null 2>&1 ; then + echoblue "---> activating ansible" + source `which virtualenvwrapper.sh` workon ansible fi vagrant up VAGRANT_STARTED=true - if type -t deactivate > /dev/null 2>&1; then + if type -t deactivate > /dev/null 2>&1 ; then deactivate fi fi @@ -64,6 +66,7 @@ popd > /dev/null + return 0 } function usage() { diff -r 202b6f209b9a -r 2204faa0b41a server/src/app/Http/Controllers/Sparql/SparqlClientController.php --- a/server/src/app/Http/Controllers/Sparql/SparqlClientController.php Thu Nov 03 03:05:43 2016 +0100 +++ b/server/src/app/Http/Controllers/Sparql/SparqlClientController.php Thu Nov 03 04:43:18 2016 +0100 @@ -142,6 +142,7 @@ $countField = $countResult->getFields()[0]; + $countResult->rewind(); $count = $countResult->current()->$countField->getValue(); $fields = $docs->getFields(); diff -r 202b6f209b9a -r 2204faa0b41a server/src/public/css/app.css --- a/server/src/public/css/app.css Thu Nov 03 03:05:43 2016 +0100 +++ b/server/src/public/css/app.css Thu Nov 03 04:43:18 2016 +0100 @@ -5967,6 +5967,10 @@ body, label, .checkbox label { font-weight: 300; } +@-moz-document url-prefix() { + fieldset { + display: table-cell; } } + .doc_details_title { margin-top: 0; } @@ -6070,4 +6074,7 @@ #baseExceptionCollapse { margin-top: 10px; } +table.sparql-results th:first-child { + width: 2.5em; } + /*# sourceMappingURL=app.css.map */ diff -r 202b6f209b9a -r 2204faa0b41a server/src/resources/assets/sass/_app-core.scss --- a/server/src/resources/assets/sass/_app-core.scss Thu Nov 03 03:05:43 2016 +0100 +++ b/server/src/resources/assets/sass/_app-core.scss Thu Nov 03 04:43:18 2016 +0100 @@ -3,6 +3,10 @@ font-weight: 300; } +@-moz-document url-prefix() { + fieldset { display: table-cell; } +} + .doc_details_title { @extend .h3; margin-top: 0; @@ -162,3 +166,8 @@ #baseExceptionCollapse { margin-top: 10px; } + +table.sparql-results th:first-child +{ + width: 2.5em; +} diff -r 202b6f209b9a -r 2204faa0b41a server/src/resources/views/sparql/sparqlClientResultList.blade.php --- a/server/src/resources/views/sparql/sparqlClientResultList.blade.php Thu Nov 03 03:05:43 2016 +0100 +++ b/server/src/resources/views/sparql/sparqlClientResultList.blade.php Thu Nov 03 04:43:18 2016 +0100 @@ -47,6 +47,7 @@ + @foreach ($fields as $field) @endforeach @@ -55,6 +56,11 @@ @foreach ($results as $row) + @if($results instanceof Illuminate\Pagination\LengthAwarePaginator) + + @else + + @endif @foreach ($fields as $field) @endforeach
#{{ $fieldPrefix }}{{ $field }}
{{ $results->firstItem() + $loop->index }}{{ $loop->iteration }}{!! $row[$field] !!}