climate-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jo...@apache.org
Subject [25/50] git commit: Fix dataset select modal not displaying
Date Mon, 21 Jul 2014 13:25:01 GMT
Fix dataset select modal not displaying


Project: http://git-wip-us.apache.org/repos/asf/climate/repo
Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/93ea9c30
Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/93ea9c30
Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/93ea9c30

Branch: refs/heads/master
Commit: 93ea9c30c7db40dc9c3df48850c6b87060f1cb69
Parents: 5b97450
Author: Michael Joyce <joyce@apache.org>
Authored: Wed Jul 16 19:32:17 2014 -0700
Committer: Michael Joyce <joyce@apache.org>
Committed: Wed Jul 16 19:32:17 2014 -0700

----------------------------------------------------------------------
 ocw-ui/frontend-new/app/views/main.html | 34 ++++++++++++++++------------
 1 file changed, 19 insertions(+), 15 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/climate/blob/93ea9c30/ocw-ui/frontend-new/app/views/main.html
----------------------------------------------------------------------
diff --git a/ocw-ui/frontend-new/app/views/main.html b/ocw-ui/frontend-new/app/views/main.html
index dd18b23..06bc930 100644
--- a/ocw-ui/frontend-new/app/views/main.html
+++ b/ocw-ui/frontend-new/app/views/main.html
@@ -46,7 +46,7 @@
 	              </button>
 	            </div>
 	            <div class="col-md-1">
-	              <button class="btn btn-link no-color-link" ng-click="open()">
+	              <button class="btn btn-link no-color-link" data-toggle="modal" data-target="#datasetSelect">
 	                <span tooltip-placement="left" tooltip-popup-delay="700" tooltip="Add
Dataset">
 	                  <i class="fa fa-plus fa-2x"></i>
 	                </span>
@@ -54,20 +54,24 @@
 	            </div>
             </div>
             <!-- Modal for dataset selection -->
-            <div modal="datasetSelect" close="close()" options="opts">
-              <div class="modal-header">
-                <h3>Dataset Select</h3>
-              </div>
-              <div class="modal-body">
-                <tabset>
-                  <tab ng-repeat="tab in templates" heading="{{tab.title}}" active="tab.active"
disabled="tab.disabled">
-                    <div ng-include src="tab.url"></div>
-                  </tab>
-                  <li class="pull-right">Queued Datasets: {{datasetCount.length}}</li>
-                </tabset>
-              </div>
-              <div class="modal-footer">
-                <button class="btn btn-warning cancel" ng-click="close()">Close</button>
+            <div class="modal fade" id="datasetSelect" role="dialog" aria-labelledby="datasetSelectModalLabel"
aria-hidden="true">
+              <div class="modal-dialog">
+                <div class="modal-content">
+                  <div class="modal-header">
+                    <h3>Dataset Select</h3>
+                  </div>
+                  <div class="modal-body">
+                    <tabset>
+                      <tab ng-repeat="tab in templates" heading="{{tab.title}}" active="tab.active"
disabled="tab.disabled">
+                        <div ng-include src="tab.url"></div>
+                      </tab>
+                      <li class="pull-right">Queued Datasets: {{datasetCount.length}}</li>
+                    </tabset>
+                  </div>
+                  <div class="modal-footer">
+                    <button class="btn btn-warning cancel" data-dismiss="modal">Close</button>
+                  </div>
+                </div>
               </div>
             </div>
             <!-- END - Modal for dataset selection -->


Mime
View raw message