[ARVADOS] updated: 47923b1c6abd4c6d93b62a58dd23960293634b4b

[git at public.curoverse.com]

Summary of changes:
 apps/workbench/app/views/users/_tables.html.erb    |   20 +++++-----
 .../users/{welcome.html.erb => _safe.html.erb}     |    7 ---
 .../themes/curoverse/views/users/home.html.erb     |   14 ++++++
 .../themes/curoverse/views/users/welcome.html.erb  |   43 +-------------------
 .../api/app/controllers/application_controller.rb  |    3 +-
 5 files changed, 26 insertions(+), 61 deletions(-)
 copy apps/workbench/themes/curoverse/views/users/{welcome.html.erb => _safe.html.erb} (71%)
 create mode 100644 apps/workbench/themes/curoverse/views/users/home.html.erb

       via  47923b1c6abd4c6d93b62a58dd23960293634b4b (commit)
       via  3cd04aa61aa63eadd4445fb2e282818c8d5a40d8 (commit)
       via  8e01b57b2c5ce64e30fc8594cf9c27f468c84399 (commit)
       via  2face69c76f5aa42b2204bf89d5194e83fca23c8 (commit)
       via  ce02e1cb45e3189e5dbf9f517cc09ab3aaf1934f (commit)
       via  deef76cfbc581937c2327ba9178a9c84b8b1a97c (commit)
       via  10c628c825ca50e7a054606da85947cbeff2f16f (commit)
      from  7a04c35059601496d1e6c146934f401d0078a0d5 (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 47923b1c6abd4c6d93b62a58dd23960293634b4b
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Thu Jan 9 12:00:47 2014 -0500

    Uses _safe partial

diff --git a/apps/workbench/themes/curoverse/views/users/welcome.html.erb b/apps/workbench/themes/curoverse/views/users/welcome.html.erb
index d4882f0..38ec033 100644
--- a/apps/workbench/themes/curoverse/views/users/welcome.html.erb
+++ b/apps/workbench/themes/curoverse/views/users/welcome.html.erb
@@ -1,45 +1,4 @@
-<% content_for :head do %>
-<link href='http://fonts.googleapis.com/css?family=Open+Sans:300,600' rel='stylesheet' type='text/css'>
-<% end %>
-
-<% content_for :css do %>
-body {
-    background: url("<%= current_theme_image_path("Large-vault-door.jpg") %>") no-repeat center center fixed;
-    background-size: cover;
-
-    /* for older browsers */
-    -webkit-background-size: cover;
-    -moz-background-size: cover;
-    -o-background-size: cover;
-}
-
-.box {
-  color: white;
-  background-color: rgba(0, 0, 0, 0.8);
-  position: fixed;
-  left: 50%;
-  top: 30%;
-  width: 40%;
-  padding: 2em;
-  font-family: 'Open Sans', sans-serif;
-  border-radius: 10px;
-}
-
-.welcome {
-font-size: 2em; 
-font-weight: 600
-}
-
-.copy {
-font-weight: 300; 
-margin-bottom: 1em
-}
-
-.login:link { color: white; }
-.login:visited { color: white; }
-.login:hover { color: #00bf00; text-decoration:none; }
-}
-<% end %>
+<% render :partial => "safe" %>
 
 <div class="box">
   <p class="welcome">Welcome to Curoverse</p>

commit 3cd04aa61aa63eadd4445fb2e282818c8d5a40d8
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Thu Jan 9 11:58:37 2014 -0500

    Inactive user theme

diff --git a/apps/workbench/themes/curoverse/views/users/_safe.html.erb b/apps/workbench/themes/curoverse/views/users/_safe.html.erb
new file mode 100644
index 0000000..94bdc93
--- /dev/null
+++ b/apps/workbench/themes/curoverse/views/users/_safe.html.erb
@@ -0,0 +1,42 @@
+<% content_for :head do %>
+<link href='http://fonts.googleapis.com/css?family=Open+Sans:300,600' rel='stylesheet' type='text/css'>
+<% end %>
+
+<% content_for :css do %>
+body {
+    background: url("<%= current_theme_image_path("Large-vault-door.jpg") %>") no-repeat center center fixed;
+    background-size: cover;
+
+    /* for older browsers */
+    -webkit-background-size: cover;
+    -moz-background-size: cover;
+    -o-background-size: cover;
+}
+
+.box {
+  color: white;
+  background-color: rgba(0, 0, 0, 0.8);
+  position: fixed;
+  left: 50%;
+  top: 30%;
+  width: 40%;
+  padding: 2em;
+  font-family: 'Open Sans', sans-serif;
+  border-radius: 10px;
+}
+
+.welcome {
+font-size: 2em; 
+font-weight: 600
+}
+
+.copy {
+font-weight: 300; 
+margin-bottom: 1em
+}
+
+.login:link { color: white; }
+.login:visited { color: white; }
+.login:hover { color: #00bf00; text-decoration:none; }
+}
+<% end %>
diff --git a/apps/workbench/themes/curoverse/views/users/home.html.erb b/apps/workbench/themes/curoverse/views/users/home.html.erb
new file mode 100644
index 0000000..6d7a3f5
--- /dev/null
+++ b/apps/workbench/themes/curoverse/views/users/home.html.erb
@@ -0,0 +1,14 @@
+<% if current_user.andand.is_active %>
+  <%= render :partial => 'home' %>
+<% else %>
+<% render :partial => "safe" %>
+
+<div class="box">
+  <p class="welcome">Inactive Account</p>
+  <p>You are logged into Curoverse, but your account is not active.  If you
+  have recently registered, you should get an email when your account becomes
+  active.  If you have questions about you account, please email us at 
+    <a href="mailto:support at curoverse.com" class="login">support at curoverse.com</a>.</p>
+</div>
+
+<% end %>

commit 8e01b57b2c5ce64e30fc8594cf9c27f468c84399
Merge: 7a04c35 2face69
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Thu Jan 9 11:03:17 2014 -0500

    Merge branch 'master' into curoverse-theme


-----------------------------------------------------------------------


hooks/post-receive
--