Skip to content

Commit

Permalink
Merge pull request #726 from Cicuta33/ux-improvements
Browse files Browse the repository at this point in the history 
Ux improvements
  • Loading branch information
@fgravin
fgravin committed Jan 23, 2015
2 parents 0f09221 + 00824d0 commit f3d0dd2
Show file tree
Hide file tree
Showing 4 changed files with 85 additions and 73 deletions.
2 changes: 1 addition & 1 deletion web-ui/src/main/resources/catalog/style/gn_editor.less
View file
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ form.gn-editor {
}

.control-label {
color: #999999;
color: #6a6a6a;
font-weight: 200;
padding-top: 0px;
line-height: 1em;
Expand Down
2 changes: 1 addition & 1 deletion web-ui/src/main/resources/catalog/style/gn_search.less
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
.list-group-item {
border-width: 0;
border-radius: 0;
padding: .35em 15px;
padding: .35em 0px;
border-top: 1px dotted lightgrey;
}
.list-group-item:hover {
Expand Down
19 changes: 16 additions & 3 deletions web-ui/src/main/resources/catalog/style/gn_search_default.less
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,12 @@
}
}
.gn-search-page {
.gn-md-view {
padding: 0 20px;
}
.badge {
margin-right: 5px;
}
.nav-pills {
margin-bottom: 1em;
text-align: center;
Expand All @@ -81,7 +87,7 @@
}
}
.badge {
background: @brand-primary;
margin-right: 5px;
}
}
}
Expand Down Expand Up @@ -310,6 +316,7 @@ ul.gn-resultview {
right: 0px;
bottom: 0px;
margin: 5px;
background-color: #ffffff;
}

[gn-main-viewer] {
Expand Down Expand Up @@ -412,10 +419,16 @@ ul.gn-resultview {
Place bottom-bar at the bottom of page; approach is based on http://matthewjamestaylor.com/blog/bottom-footer-demo.htm
*/
.gn-bottom-bar {
bottom:0;height:50px;position:absolute;overflow:hidden;width:100%;margin-bottom:0px;
bottom:0;
height:50px;
position:absolute;
overflow:hidden;
width:100%;
margin-bottom:0px;
border-radius: 0px;
}
.gn-search-page {
margin-bottom:50px;
padding-bottom:70px;
}

.cookie-warning {
Expand Down
135 changes: 67 additions & 68 deletions web-ui/src/main/resources/catalog/views/default/templates/recordView.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,70 +69,6 @@

<div data-ng-show="!usingFormatter" class="gn-metadata-display">

<div class="col-md-3 gn-md-side">

<section data-ng-if="mdView.current.record.overviews.length > 0">
<h4>
<i class="fa fa-image"></i>
<span data-translate="">overview</span>
</h4>
<!-- TODO caroussel on each thumbnails-->
<p data-ng-repeat="img in mdView.current.record.overviews">
<img class="gn-img-thumbnail img-thumbnail"
alt="{{img.label}}"
data-ng-src="{{img.url}}"/>
</p>
</section>

<section data-ng-if="mdView.current.record.contacts.resource">
<h4>
<i class="fa fa-envelope"></i>
<span data-translate="">contact</span>
</h4>
<blockquote>
{{mdView.current.record.contacts.resource}}
</blockquote>
</section>

<section>
<h4>
<i class="fa fa-map-marker"></i>
<span data-translate="">extent</span>
</h4>
<!-- TODO: use map config -->
<img class="gn-img-extent"
data-ng-src="region.getmap.png?mapsrs=EPSG:3857&width=250&background=osm&geomsrs=EPSG:4326&geom={{mdView.current.record.getBoxAsPolygon()}}"/>
</section>

<section>
<h4>
<i class="fa fa-fw"></i>
<span data-translate="">sourceCatalog</span>
</h4>
<img ng-src="../../images/logos/{{mdView.current.record.source}}.gif"
class="gn-source-logo"/>
</section>

<section>
<h4>
<i class="fa fa-share-square"></i>
<span data-translate="">shareOn</span>
</h4>
<a data-ng-href="https://plus.google.com/share?url={{mdView.current.record.encodedUrl}}"
class="btn btn-link"><i class="fa fa-google-plus"></i></a>
<a data-ng-href="https://twitter.com/share?url={{mdView.current.record.encodedUrl}}"
class="btn btn-link"><i class="fa fa-twitter"></i></a>
<a data-ng-href="https://www.facebook.com/sharer.php?u={{mdView.current.record.encodedUrl}}"
class="btn btn-link"><i class="fa fa-facebook"></i></a>

</section>

<section>
<a href="" class="btn btn-link"><i class="fa fa-print"></i></a>
</section>
</div>


<div class="col-md-9 gn-record">
<h1>
<span data-ng-if="mdView.current.record.type.indexOf('dataset')>=0"
Expand All @@ -157,15 +93,14 @@ <h1>

</h1>

<div>
<div class="pull-right">
<i class="fa fa-calendar"></i>
<span data-translate="">updatedOn</span>
<span data-gn-humanize-time="{{mdView.current.record['geonet:info'].changeDate}}"
data-from-now=""></span>
</div>



<div style="clear:both"></div>

<div class="well">
{{mdView.current.record.abstract}}
</div>
Expand Down Expand Up @@ -305,5 +240,69 @@ <h2 data-translate="">metadataInformation</h2>
</tbody>
</table>
</div>

<div class="col-md-3 gn-md-side">

<section data-ng-if="mdView.current.record.overviews.length > 0">
<h4>
<i class="fa fa-image"></i>
<span data-translate="">overview</span>
</h4>
<!-- TODO caroussel on each thumbnails-->
<p data-ng-repeat="img in mdView.current.record.overviews">
<img class="gn-img-thumbnail img-thumbnail"
alt="{{img.label}}"
data-ng-src="{{img.url}}"/>
</p>
</section>

<section data-ng-if="mdView.current.record.contacts.resource">
<h4>
<i class="fa fa-envelope"></i>
<span data-translate="">contact</span>
</h4>
<blockquote>
{{mdView.current.record.contacts.resource}}
</blockquote>
</section>

<section>
<h4>
<i class="fa fa-map-marker"></i>
<span data-translate="">extent</span>
</h4>
<!-- TODO: use map config -->
<img class="gn-img-extent"
data-ng-src="region.getmap.png?mapsrs=EPSG:3857&width=250&background=osm&geomsrs=EPSG:4326&geom={{mdView.current.record.getBoxAsPolygon()}}"/>
</section>

<section>
<h4>
<i class="fa fa-fw"></i>
<span data-translate="">sourceCatalog</span>
</h4>
<img ng-src="../../images/logos/{{mdView.current.record.source}}.gif"
class="gn-source-logo"/>
</section>

<section>
<h4>
<i class="fa fa-share-square"></i>
<span data-translate="">shareOn</span>
</h4>
<a data-ng-href="https://plus.google.com/share?url={{mdView.current.record.encodedUrl}}"
class="btn btn-link"><i class="fa fa-google-plus"></i></a>
<a data-ng-href="https://twitter.com/share?url={{mdView.current.record.encodedUrl}}"
class="btn btn-link"><i class="fa fa-twitter"></i></a>
<a data-ng-href="https://www.facebook.com/sharer.php?u={{mdView.current.record.encodedUrl}}"
class="btn btn-link"><i class="fa fa-facebook"></i></a>

</section>

<section>
<a href="" class="btn btn-link"><i class="fa fa-print"></i></a>
</section>
</div>

</div>
</div>

0 comments on commit f3d0dd2

Please sign in to comment.