Skip to content

Commit

Permalink
Merge pull request #377 from GFDRR/#371_trunk_over2lines
Browse files Browse the repository at this point in the history
#371 explore countries, fix truncate reference when larger than 2 lines
  • Loading branch information
pzwsk authored Dec 20, 2018
2 parents bb419be + 9837f57 commit 933f872
Show file tree
Hide file tree
Showing 3 changed files with 31 additions and 7 deletions.
20 changes: 20 additions & 0 deletions frontend/css/rodi_css.css
Original file line number Diff line number Diff line change
Expand Up @@ -359,6 +359,26 @@ h1 + .lead {
font-weight: 500;
}


/*
==============================================================================
truncate lines
==============================================================================
*/



.trunkate {
display: -webkit-box;
-webkit-line-clamp: 2;
-webkit-box-orient: vertical;
width:100%;
overflow:hidden;
min-height: 50px;

}


/*
==============================================================================
Expand Down
9 changes: 5 additions & 4 deletions frontend/dataset_details.html
Original file line number Diff line number Diff line change
Expand Up @@ -273,10 +273,11 @@ <h2 class="odfri_title_red">Similar datasets for this country</h2>
<tr ng-repeat="istance in istanceList | orderBy: '-score * 1'" ng-click="changepage('dataset_details.html?keyds=' + istance.id)">
<td>
<a ng-href="dataset_details.html?keyds={{istance.id}}">{{istance.keydataset.dataset.name}}</a><br>

<span class="small text-muted rodi_subtitle_datasetlist" ng-show="istance.title"><i>{{istance.title}}, </i></span>
<span class="small text-muted rodi_subtitle_datasetlist" ng-show="istance.is_existing_txt"><i>{{istance.is_existing_txt}}, </i></span>
<span class="small text-muted rodi_subtitle_datasetlist" ng-show="istance.modify_time"><i>{{istance.modify_time}}</i></span>
<div class="rodi_subtitle_datasetlist">
<span class="small text-muted " ng-show="istance.title"><i>{{istance.title}}, </i></span>
<span class="small text-muted " ng-show="istance.is_existing_txt"><i>{{istance.is_existing_txt}}, </i></span>
<span class="small text-muted " ng-show="istance.modify_time"><i>{{istance.modify_time}}</i></span>
</div>
</td>
<td>
<div class="dataset_value">
Expand Down
9 changes: 6 additions & 3 deletions frontend/dataset_list.html
Original file line number Diff line number Diff line change
Expand Up @@ -179,9 +179,12 @@ <h1 class="page_title ">{{objCountry[0].name}}</h1>
<td>
<a href="dataset_details.html?keyds={{item.istance_id}}" ng-if="item.istance_id" title="View details">{{item.name}}</a>
<span ng-if="!item.istance_id">{{item.name}} (<a href="contribute.html?ctr={{idCountry}}&amp;ds={{item.name}}">Contribute</a>)</span><br />
<span class="small text-muted rodi_subtitle_datasetlist" ng-show="item.title"><i>{{item.title}}, </i></span>
<span class="small text-muted rodi_subtitle_datasetlist" ng-show="item.institution"><i>{{item.institution}}, </i></span>
<span class="small text-muted rodi_subtitle_datasetlist" ng-show="item.modify_time"><i>{{item.modify_time}}</i></span>
<div class="rodi_subtitle_datasetlist trunkate">

<span class="small text-muted " ng-show="item.title"><i>{{item.title}}, </i></span>
<span class="small text-muted " ng-show="item.institution"><i>{{item.institution}}, </i></span>
<span class="small text-muted " ng-show="item.modify_time"><i>{{item.modify_time}}</i></span>
</div>
</td>
<td>
<div class="dataset_value">
Expand Down

0 comments on commit 933f872

Please sign in to comment.