[ARVADOS] updated: 3fd0f2b1ee83ef0db86a1c1a24cfdc0ec153422c
git at public.curoverse.com
git at public.curoverse.com
Mon Apr 7 14:03:28 EDT 2014
Summary of changes:
.../assets/stylesheets/bootstrap-modal.css.scss | 215 +-------------------
.../workbench/app/views/application/index.html.erb | 4 +-
.../app/views/users/_setup_popup.html.erb | 15 +-
.../workbench/app/views/users/_show_admin.html.erb | 4 +-
apps/workbench/app/views/users/setup.js.erb | 2 +-
apps/workbench/app/views/users/setup_popup.js.erb | 2 +-
6 files changed, 24 insertions(+), 218 deletions(-)
via 3fd0f2b1ee83ef0db86a1c1a24cfdc0ec153422c (commit)
via 810ff7b787384c129c57cf0fecc034fec1e9b162 (commit)
from cd5e5afa6a37320a2d8f3f01e725bc7b18f800a0 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
commit 3fd0f2b1ee83ef0db86a1c1a24cfdc0ec153422c
Author: radhika chippada <radhika at radhika.curoverse>
Date: Mon Apr 7 14:03:01 2014 -0400
Bootstrap modal css updated to include only what is needed.
diff --git a/apps/workbench/app/assets/stylesheets/bootstrap-modal.css.scss b/apps/workbench/app/assets/stylesheets/bootstrap-modal.css.scss
index 41f21c7..6eeb0c9 100644
--- a/apps/workbench/app/assets/stylesheets/bootstrap-modal.css.scss
+++ b/apps/workbench/app/assets/stylesheets/bootstrap-modal.css.scss
@@ -1,233 +1,29 @@
-/*!
-* Bootstrap Modal
-*
-* Copyright Jordan Schroter
-* Licensed under the Apache License v2.0
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-*/
-
-body.modal-open,
-.modal-open .navbar-fixed-top,
-.modal-open .navbar-fixed-bottom {
- margin-right: 0;
-}
+// Place all the styles related to the bootstrap modal here.
.modal {
left: 50%;
bottom: auto;
right: auto;
padding: 0;
- width: 500px;
+ width: 400px;
margin-left: -250px;
background-color: #ffffff;
- border: 1px solid #999999;
- border: 1px solid rgba(0, 0, 0, 0.2);
+ border: 2px solid #999999;
border-radius: 6px;
- -webkit-box-shadow: 0 3px 9px rgba(0, 0, 0, 0.5);
box-shadow: 0 3px 9px rgba(0, 0, 0, 0.5);
background-clip: padding-box;
}
-.modal.container {
- max-width: none;
-}
-
-
-.modal-open {
-overflow: hidden;
-}
-
-
-/* add a scroll bar to stop page from jerking around */
-.modal-open.page-overflow .page-container,
-.modal-open.page-overflow .page-container .navbar-fixed-top,
-.modal-open.page-overflow .page-container .navbar-fixed-bottom,
-.modal-open.page-overflow .modal-scrollable {
-overflow-y: scroll;
-}
-
-#user-setup-modal-window{
- overflow: hidden;
-}
-
-
- at media (max-width: 979px) {
-.modal-open.page-overflow .page-container .navbar-fixed-top,
-.modal-open.page-overflow .page-container .navbar-fixed-bottom {
-overflow-y: visible;
-}
-}
-
-
-.modal-scrollable {
-position: fixed;
-top: 0;
-bottom: 0;
-left: 0;
-right: 0;
-overflow: auto;
-}
-
-.modal.fade {
-top: -100%;
--webkit-transition: opacity 0.3s linear, top 0.3s ease-out, bottom 0.3s ease-out, margin-top 0.3s ease-out;
--moz-transition: opacity 0.3s linear, top 0.3s ease-out, bottom 0.3s ease-out, margin-top 0.3s ease-out;
--o-transition: opacity 0.3s linear, top 0.3s ease-out, bottom 0.3s ease-out, margin-top 0.3s ease-out;
-transition: opacity 0.3s linear, top 0.3s ease-out, bottom 0.3s ease-out, margin-top 0.3s ease-out;
-}
-
.modal.fade.in {
-top: 50%;
-}
-
-.modal-body {
-max-height: none;
-overflow: visible;
-}
-
-.modal.modal-absolute {
-position: absolute;
-z-index: 950;
-}
-
-.modal .loading-mask {
-position: absolute;
-top: 0;
-bottom: 0;
-left: 0;
-right: 0;
-background: #fff;
-border-radius: 6px;
-}
-
-.modal-backdrop.modal-absolute{
-position: absolute;
-z-index: 940;
+ top: 10%;
}
.modal-backdrop,
.modal-backdrop.fade.in{
-opacity: 0.7;
-filter: alpha(opacity=70);
-background: #fff;
+ opacity: 0.7;
+ background: #fff;
}
-/* Modal Overflow */
-
-.modal-overflow.modal {
-top: 1%;
-}
-
-.modal-overflow.modal.fade {
-top: -100%;
-}
-
-.modal-overflow.modal.fade.in {
-top: 1%;
-}
-
-.modal-overflow .modal-body {
-overflow: auto;
--webkit-overflow-scrolling: touch;
-}
-
-/* Responsive */
-
- at media (min-width: 1200px) {
-.modal.container {
-width: 1170px;
-margin-left: -585px;
-}
-}
-
- at media (max-width: 979px) {
-.modal,
-.modal.container,
-.modal.modal-overflow {
-top: 1%;
-right: 1%;
-left: 1%;
-bottom: auto;
-width: auto !important;
-height: auto !important;
-margin: 0 !important;
-padding: 0 !important;
-}
-
-.modal.fade.in,
-.modal.container.fade.in,
-.modal.modal-overflow.fade.in {
-top: 1%;
-bottom: auto;
-}
-
-.modal-body,
-.modal-overflow .modal-body {
-position: static;
-margin: 0;
-height: auto !important;
-max-height: none !important;
-overflow: visible !important;
-}
-
-.modal-footer,
-.modal-overflow .modal-footer {
-position: static;
-}
-}
-
-.loading-spinner {
-position: absolute;
-top: 50%;
-left: 50%;
-margin: -12px 0 0 -12px;
-}
-
-/*
-Animate.css - http://daneden.me/animate
-Licensed under the ☺ license (http://licence.visualidiot.com/)
-
-Copyright (c) 2012 Dan Eden*/
-
-.animated {
--webkit-animation-duration: 1s;
--moz-animation-duration: 1s;
--o-animation-duration: 1s;
-animation-duration: 1s;
--webkit-animation-fill-mode: both;
--moz-animation-fill-mode: both;
--o-animation-fill-mode: both;
-animation-fill-mode: both;
-}
-
- at -webkit-keyframes shake {
-0%, 100% {-webkit-transform: translateX(0);}
-10%, 30%, 50%, 70%, 90% {-webkit-transform: translateX(-10px);}
-20%, 40%, 60%, 80% {-webkit-transform: translateX(10px);}
-}
-
- at -moz-keyframes shake {
-0%, 100% {-moz-transform: translateX(0);}
-10%, 30%, 50%, 70%, 90% {-moz-transform: translateX(-10px);}
-20%, 40%, 60%, 80% {-moz-transform: translateX(10px);}
-}
-
- at -o-keyframes shake {
-0%, 100% {-o-transform: translateX(0);}
-10%, 30%, 50%, 70%, 90% {-o-transform: translateX(-10px);}
-20%, 40%, 60%, 80% {-o-transform: translateX(10px);}
-}
-
- at keyframes shake {
-0%, 100% {transform: translateX(0);}
-10%, 30%, 50%, 70%, 90% {transform: translateX(-10px);}
-20%, 40%, 60%, 80% {transform: translateX(10px);}
-}
-
-.shake {
--webkit-animation-name: shake;
--moz-animation-name: shake;
--o-animation-name: shake;
-animation-name: shake;
+#user-setup-modal-window{
+ overflow: hidden;
}
diff --git a/apps/workbench/app/views/users/_setup_popup.html.erb b/apps/workbench/app/views/users/_setup_popup.html.erb
index 412d211..a1c3f8a 100644
--- a/apps/workbench/app/views/users/_setup_popup.html.erb
+++ b/apps/workbench/app/views/users/_setup_popup.html.erb
@@ -3,7 +3,7 @@
<h3 class="modal-title">Setup User</h4>
</div
- <div class="modal-body" style="max-height:800px;">
+ <div class="modal-body">
<% if @object%>
<% uuid = @object.uuid %>
<% email = @object.email %>
commit 810ff7b787384c129c57cf0fecc034fec1e9b162
Author: radhika chippada <radhika at radhika.curoverse>
Date: Mon Apr 7 11:58:08 2014 -0400
Add header and footer to the setup user modal
diff --git a/apps/workbench/app/assets/stylesheets/bootstrap-modal.css.scss b/apps/workbench/app/assets/stylesheets/bootstrap-modal.css.scss
index 417ca74..41f21c7 100644
--- a/apps/workbench/app/assets/stylesheets/bootstrap-modal.css.scss
+++ b/apps/workbench/app/assets/stylesheets/bootstrap-modal.css.scss
@@ -47,6 +47,11 @@ overflow: hidden;
overflow-y: scroll;
}
+#user-setup-modal-window{
+ overflow: hidden;
+}
+
+
@media (max-width: 979px) {
.modal-open.page-overflow .page-container .navbar-fixed-top,
.modal-open.page-overflow .page-container .navbar-fixed-bottom {
diff --git a/apps/workbench/app/views/application/index.html.erb b/apps/workbench/app/views/application/index.html.erb
index 7108c70..96dc348 100644
--- a/apps/workbench/app/views/application/index.html.erb
+++ b/apps/workbench/app/views/application/index.html.erb
@@ -9,8 +9,8 @@
<% if controller.model_class.name == 'User' %>
<%= link_to "Add a new #{controller.model_class.to_s.underscore.gsub '_', ' '}", setup_user_popup_path,
{class: 'btn btn-primary pull-right', :remote => true, 'data-toggle' => "modal",
- 'data-target' => '#modal-window', return_to: request.url} %>
- <div id="modal-window" class="modal fade" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true"></div>
+ 'data-target' => '#user-setup-modal-window', return_to: request.url} %>
+ <div id="user-setup-modal-window" class="modal fade" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true"></div>
<% else %>
<%= button_to "Add a new #{controller.model_class.to_s.underscore.gsub '_', ' '}",
{ action: 'create', return_to: request.url },
diff --git a/apps/workbench/app/views/users/_setup_popup.html.erb b/apps/workbench/app/views/users/_setup_popup.html.erb
index 90cab2c..412d211 100644
--- a/apps/workbench/app/views/users/_setup_popup.html.erb
+++ b/apps/workbench/app/views/users/_setup_popup.html.erb
@@ -1,4 +1,9 @@
- <div class="modal-body">
+ <div class="modal-header">
+ <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+ <h3 class="modal-title">Setup User</h4>
+ </div
+
+ <div class="modal-body" style="max-height:800px;">
<% if @object%>
<% uuid = @object.uuid %>
<% email = @object.email %>
@@ -60,14 +65,14 @@
</tr>
</tbody></table>
</div>
- <div align="center">
- <br/>
- <button type="submit" id="register" class="btn btn-primary" autofocus>Submit</button>
- <button class="btn btn-primary" data-dismiss="modal" aria-hidden="true">Cancel</button>
- </div>
<% end %>
</div>
+ <div class="modal-footer">
+ <button type="submit" id="register" class="btn btn-primary" autofocus>Submit</button>
+ <button class="btn btn-default" data-dismiss="modal" aria-hidden="true">Cancel</button>
+ </div>
+
<script>
var $input = $('input:text'),
$register = $('#register');
diff --git a/apps/workbench/app/views/users/_show_admin.html.erb b/apps/workbench/app/views/users/_show_admin.html.erb
index 072d7ee..9c803c9 100644
--- a/apps/workbench/app/views/users/_show_admin.html.erb
+++ b/apps/workbench/app/views/users/_show_admin.html.erb
@@ -9,8 +9,8 @@ account.</p>
<p>As an admin, you can setup this user. Please input a VM and repository for the user. If you had previously provided any of these items, they are pre-filled for you and you can leave them as is if you would like to reuse them.</p>
<blockquote>
-<%= link_to "Setup #{@object.full_name}", setup_popup_user_url(id: @object.uuid), {class: 'btn btn-primary', :remote => true, 'data-toggle' => "modal", 'data-target' => '#modal-window'} %>
-<div id="modal-window" class="modal fade" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true"></div>
+<%= link_to "Setup #{@object.full_name}", setup_popup_user_url(id: @object.uuid), {class: 'btn btn-primary', :remote => true, 'data-toggle' => "modal", 'data-target' => '#user-setup-modal-window'} %>
+<div id="user-setup-modal-window" class="modal fade" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true"></div>
</blockquote>
<p>As an admin, you can deactivate and reset this user. This will remove all repository/VM permissions for the user. If you "setup" the user again, the user will have to sign the user agreement again.</p>
diff --git a/apps/workbench/app/views/users/setup.js.erb b/apps/workbench/app/views/users/setup.js.erb
index 9134623..bce71b4 100644
--- a/apps/workbench/app/views/users/setup.js.erb
+++ b/apps/workbench/app/views/users/setup.js.erb
@@ -1,2 +1,2 @@
-$("#modal-window").modal("hide");
+$("#user-setup-modal-window").modal("hide");
document.location.reload();
diff --git a/apps/workbench/app/views/users/setup_popup.js.erb b/apps/workbench/app/views/users/setup_popup.js.erb
index e725a92..77213d4 100644
--- a/apps/workbench/app/views/users/setup_popup.js.erb
+++ b/apps/workbench/app/views/users/setup_popup.js.erb
@@ -1 +1 @@
-$("#modal-window").html("<%= escape_javascript(render partial: 'setup_popup') %>");
+$("#user-setup-modal-window").html("<%= escape_javascript(render partial: 'setup_popup') %>");
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list