You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@climate.apache.org by jo...@apache.org on 2014/09/08 18:06:41 UTC
[1/4] git commit: CLIMATE-375 - Truncate long dataset names in
DatasetDisplay
Repository: climate
Updated Branches:
refs/heads/master 2ffc6ecab -> dc57582e6
CLIMATE-375 - Truncate long dataset names in DatasetDisplay
- Long dataset names are now truncated down in the dataset display.
This uses CSS to do the truncation based on row size. It could also be
done with a filter but that was decided against due to the difficulty in
associating a number of characters with a row width given the
semi-dynamic nature of the layout.
Project: http://git-wip-us.apache.org/repos/asf/climate/repo
Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/debe8121
Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/debe8121
Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/debe8121
Branch: refs/heads/master
Commit: debe812189d99b104385dbc5caa908d9dcf9d3d9
Parents: 2ffc6ec
Author: Michael Joyce <jo...@apache.org>
Authored: Thu Sep 4 10:30:58 2014 -0700
Committer: Michael Joyce <jo...@apache.org>
Committed: Thu Sep 4 10:30:58 2014 -0700
----------------------------------------------------------------------
ocw-ui/frontend/app/styles/main.css | 9 +++++++++
ocw-ui/frontend/app/views/main.html | 2 +-
2 files changed, 10 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/climate/blob/debe8121/ocw-ui/frontend/app/styles/main.css
----------------------------------------------------------------------
diff --git a/ocw-ui/frontend/app/styles/main.css b/ocw-ui/frontend/app/styles/main.css
index fb42ccd..b06a9e7 100644
--- a/ocw-ui/frontend/app/styles/main.css
+++ b/ocw-ui/frontend/app/styles/main.css
@@ -46,6 +46,15 @@ body {
overflow-x: hidden;
}
+.datasetNameDisplay {
+ max-width: 320px;
+ display: inline-block;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+ padding-left: 0;
+}
+
#ocw-navbar {
margin-bottom: 0;
}
http://git-wip-us.apache.org/repos/asf/climate/blob/debe8121/ocw-ui/frontend/app/views/main.html
----------------------------------------------------------------------
diff --git a/ocw-ui/frontend/app/views/main.html b/ocw-ui/frontend/app/views/main.html
index 2f428e5..89ca003 100644
--- a/ocw-ui/frontend/app/views/main.html
+++ b/ocw-ui/frontend/app/views/main.html
@@ -110,7 +110,7 @@ under the License.
<div ng-repeat="dataset in datasets">
<div class="row">
<!--Data section-->
- <div class="col-md-8 col-md-offset-1 muted">
+ <div class="datasetNameDisplay col-md-8 col-md-offset-1 muted" tooltip="{{dataset.name}}">
{{dataset.name}}
</div>
<div class="col-md-1 col-md-offset-2">
[2/4] git commit: CLIMATE-517 - Fix start and end date layout overlap
issues
Posted by jo...@apache.org.
CLIMATE-517 - Fix start and end date layout overlap issues
- Fix the start and end date layout problems. An additional column
wrapped around the display of the dates caused labels and values to
overlap.
Project: http://git-wip-us.apache.org/repos/asf/climate/repo
Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/030c5565
Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/030c5565
Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/030c5565
Branch: refs/heads/master
Commit: 030c5565563b5162763069e04af93cca9dfc2797
Parents: 2ffc6ec
Author: Michael Joyce <jo...@apache.org>
Authored: Thu Sep 4 11:07:19 2014 -0700
Committer: Michael Joyce <jo...@apache.org>
Committed: Thu Sep 4 11:07:19 2014 -0700
----------------------------------------------------------------------
ocw-ui/frontend/app/views/main.html | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/climate/blob/030c5565/ocw-ui/frontend/app/views/main.html
----------------------------------------------------------------------
diff --git a/ocw-ui/frontend/app/views/main.html b/ocw-ui/frontend/app/views/main.html
index 2f428e5..bafb2f3 100644
--- a/ocw-ui/frontend/app/views/main.html
+++ b/ocw-ui/frontend/app/views/main.html
@@ -127,13 +127,9 @@ under the License.
<div class="col-md-9">
<div class="row">
<div class="col-md-2 col-md-offset-1 text-center">Start:</div>
- <div class="col-md-2">
- <div class="col-md-2 text-center">{{dataset.timeVals.start | ISODateToMiddleEndian}}</div>
- </div>
+ <div class="col-md-2 text-center">{{dataset.timeVals.start | ISODateToMiddleEndian}}</div>
<div class="col-md-2 text-center">End:</div>
- <div class="col-md-2">
- <div class="col-md-2 text-center">{{dataset.timeVals.end | ISODateToMiddleEndian}}</div>
- </div>
+ <div class="col-md-2 text-center">{{dataset.timeVals.end | ISODateToMiddleEndian}}</div>
</div>
<!--Lat/Long Values!-->
<div class="row">
[3/4] git commit: Resolve CLIMATE-375. Merge PR #109.
Posted by jo...@apache.org.
Resolve CLIMATE-375. Merge PR #109.
Project: http://git-wip-us.apache.org/repos/asf/climate/repo
Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/c6e09bd4
Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/c6e09bd4
Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/c6e09bd4
Branch: refs/heads/master
Commit: c6e09bd4f527e6f471c341afd82a1ac4881a8be0
Parents: 2ffc6ec debe812
Author: Michael Joyce <jo...@apache.org>
Authored: Mon Sep 8 09:03:19 2014 -0700
Committer: Michael Joyce <jo...@apache.org>
Committed: Mon Sep 8 09:03:19 2014 -0700
----------------------------------------------------------------------
ocw-ui/frontend/app/styles/main.css | 9 +++++++++
ocw-ui/frontend/app/views/main.html | 2 +-
2 files changed, 10 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
[4/4] git commit: Resolve CLIMATE-517. Merge PR #110.
Posted by jo...@apache.org.
Resolve CLIMATE-517. Merge PR #110.
Project: http://git-wip-us.apache.org/repos/asf/climate/repo
Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/dc57582e
Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/dc57582e
Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/dc57582e
Branch: refs/heads/master
Commit: dc57582e6fe421e3463e6042107aa471326221dd
Parents: c6e09bd 030c556
Author: Michael Joyce <jo...@apache.org>
Authored: Mon Sep 8 09:05:41 2014 -0700
Committer: Michael Joyce <jo...@apache.org>
Committed: Mon Sep 8 09:05:41 2014 -0700
----------------------------------------------------------------------
ocw-ui/frontend/app/views/main.html | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/climate/blob/dc57582e/ocw-ui/frontend/app/views/main.html
----------------------------------------------------------------------