Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Revamped layout for first time user page

  • Loading branch information...
commit d7cc232c21b5870fa632bad046b5062e7fd067f0 1 parent 517f9a2
@brzaik brzaik authored
View
BIN  app/assets/images/elements/logomark.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  app/assets/images/elements/logomark@2x.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
4 app/assets/stylesheets/application/layout/display-blocks.scss.erb
@@ -19,6 +19,10 @@
border: solid 1px #ababab;
border-bottom: 0px;
+ &.light-version {
+ @include vertical-gradient( $grayLightest, $grayLighter );
+ }
+
h1 {
color: darken($gray, 20%);
font-size: 1.4em;
View
11 app/controllers/concerto_devise/registrations_controller.rb
@@ -8,9 +8,18 @@ def check_permissions
# GET /resource/sign_up
def new
+ @show_first_admin_page = ConcertoConfig[:setup_complete] == "false"
+
resource = build_resource({})
@concerto_config = ConcertoConfig.new
- respond_with resource
+
+ if @show_first_admin_page
+ respond_with resource do |format|
+ format.html { render :layout => "no-topmenu" }
+ end
+ else
+ respond_with resource
+ end
end
def create
View
150 app/views/devise/registrations/_new_first_admin.erb
@@ -1,62 +1,100 @@
- <header>
- <h1>Register Initial Administrator Account</h1>
+<section class="viewblock">
+ <header class="viewblock-header light-version">
+ <div class="default-padding" style="padding: 40px 12px; text-align: center;">
+ <%= image_tag("elements/logomark.png", :height => 175, :alt => "") %>
+ <br /><br />
+ <h1 style="font-size: 5em; letter-spacing: -0.025em;">Welcome to Concerto.</h1>
+ <h3>Setting up your new installation is fast and simple! Just follow the instructions below to get started.</h3>
+ </div>
</header>
- <div class="viewblock-cont">
- <article>
-
- <%= form_for(resource, :as => resource_name, :url => registration_path(resource_name)) do |f| %>
- <fieldset>
- <div class="clearfix">
- <%= f.label :first_name %>
- <div class="input">
- <%= f.text_field :first_name %>
- </div>
- </div>
- <div class="clearfix">
- <%= f.label :last_name %>
- <div class="input">
- <%= f.text_field :last_name %>
- </div>
- </div>
- <div class="clearfix">
- <%= f.label :email %>
- <div class="input">
- <%= f.email_field :email %>
- </div>
- </div>
- <div class="clearfix">
- <%= f.label :password %>
- <div class="input">
- <%= f.password_field :password %>
- </div>
- </div>
- <div class="clearfix">
- <%= f.label :password_confirmation, "Confirm Password" %>
- <div class="input">
- <%= f.password_field :password_confirmation %>
- </div>
+
+ <div class="viewblock-cont" style="min-height: 600px;">
+ <div class="default-padding">
+
+ <div class="row-fluid">
+ <div class="span2">
+ &nbsp;
</div>
- </fieldset>
-
- <p>Concerto sends error reports back to the Concerto developers for troubleshooting and development purposes. The reports may
- contain some information (content titles, IP addresses) specific to your installation, but an effort will be made to automatically
- filter out any identifying information from the error reports. <b>To disable remote error reporting, uncheck the box below</b></p>
- <%= fields_for @concerto_config do |c| %>
- <fieldset>
- <div class="clearfix">
- <%= c.label :send_errors %>
- <div class="input">
- <%= check_box 'concerto_config[send_errors]', 'value', {}, 'true', 'false' %>
+ <div class="span8">
+
+ <%= form_for(resource, :as => resource_name, :url => registration_path(resource_name)) do |f| %>
+
+ <br /><br />
+ <h1 class="header-with-icon">1. Register First Admin Account</h1>
+ <br />
+ <h3>Your initial administrator account will allow you to set up groups and manage what happens on your new Concerto network.</h3>
+ <br />
+
+ <fieldset style="padding-left: 20px; padding-top: 0px;">
+ <div class="clearfix">
+ <%= f.label :first_name %>
+ <div class="input">
+ <%= f.text_field :first_name, :class => "xlarge" %>
+ </div>
+ </div>
+ <div class="clearfix">
+ <%= f.label :last_name %>
+ <div class="input">
+ <%= f.text_field :last_name, :class => "xlarge" %>
+ </div>
+ </div>
+ <div class="clearfix">
+ <%= f.label :email %>
+ <div class="input">
+ <%= f.email_field :email, :class => "xlarge" %>
+ </div>
+ </div>
+ <div class="clearfix">
+ <%= f.label :password %>
+ <div class="input">
+ <%= f.password_field :password, :class => "xlarge" %>
+ </div>
+ </div>
+ <div class="clearfix">
+ <%= f.label :password_confirmation, "Confirm Password" %>
+ <div class="input">
+ <%= f.password_field :password_confirmation, :class => "xlarge" %>
+ </div>
+ </div>
+ </fieldset>
+
+ <br /><br />
+ <h1 class="header-with-icon">2. Configure Error Reporting</h1>
+ <br />
+ <h3>Concerto sends error reports to the Concerto team for troubleshooting and development purposes. You can disable this from happening at any time.</h3>
+ <br />
+ <p>The reports may contain some information (content titles, IP addresses) specific to your installation, but an effort will be made to automatically filter out any identifying information from the error reports.</p>
+ <br />
+ <h3><b>To disable remote error reporting, uncheck the box below.</b></h3>
+
+ <%= fields_for @concerto_config do |c| %>
+ <fieldset style="padding-left: 40px; padding-top: 0px;">
+
+ <ul class="inputs-list">
+ <li style="font-size: 1.4em;">
+ <%= check_box 'concerto_config[send_errors]', 'value', {}, 'true', 'false' %> <%= c.label 'send_errors_value', "Send error reports to the Concerto team", :style => "font-size: 1.1em;" %>
+ </li>
+ </ul>
+
+ </fieldset>
+ <% end %>
+
+ <br />
+ <hr />
+
+ <div style="text-align: center;">
+ <%= f.submit "Let's Get Started!", :class => "btn large primary", :style => "font-size: 1.5em;" %>
</div>
- </div>
- </fieldset>
- <% end %>
+ <br /><br />
- <div class="submit_bar actions">
- <%= f.submit "Register Account", :class => "btn primary" "Register Account" %>
- </div>
+ <% end %>
- <% end %>
+ </div>
+ <div class="span2">
+ &nbsp;
+ </div>
+ </div>
- </article>
- </div>
+ </div>
+ </div>
+</section>
View
2  app/views/devise/registrations/new.html.erb
@@ -1,6 +1,6 @@
<%= devise_error_messages! %>
<section class="viewblock no">
- <% if ConcertoConfig[:setup_complete] == "false" && User.all.empty? %>
+ <% if @show_first_admin_page %>
<%= render :partial => 'new_first_admin' %>
<% else %>
<%= render :partial => 'new_user' %>
View
30 app/views/layouts/no-topmenu.html.erb
@@ -0,0 +1,30 @@
+<!DOCTYPE html>
+<html>
+<head>
+ <title><%= yield_for_title(controller.controller_name.titleize) %> - Concerto Panel</title>
+ <meta name="generator" content="Concerto <%= Concerto::VERSION::STRING %>" />
+ <meta name="application-name" content="Concerto" />
+ <meta name="viewport" content="width=device-width, initial-scale=1.0">
+ <%= stylesheet_link_tag "application" %>
+ <%= javascript_include_tag "application" %>
+
+ <%= csrf_meta_tag %>
+ <%= render :partial => 'elements/head' %>
+ <%= render :partial => 'elements/javascript' %>
+
+ <!--[if lt IE 9]>
+ <%= javascript_include_tag "html5_shiv/html5.js" %>
+ <![endif]-->
+</head>
+<body>
+ <% if flash[:notice] %>
+ <div id="flash-banner">
+ <p><%= notice %></p>
+ </div>
+ <% end %>
+
+ <div id="main" class="container-fluid">
+ <%= yield %>
+ </div>
+</body>
+</html>
Please sign in to comment.
Something went wrong with that request. Please try again.