faalis 1.0.0 → 2.0.0.rc2

data/app/views/angular/nav.html.erb

@@ -1,3 +1,4 @@
+<header>
 <div ng-controller="NavigationController as controller">
   <div class="row">
     <ul class="small-6 columns">
@@ -35,3 +36,4 @@
     </ul>
   </div>
 </div>
+</header>

data/app/views/devise/registrations/new.html.erb

@@ -1,95 +1,36 @@
-<%= content_tag(:div, flash[:error], :id => "flash_error") if flash[:error] %>
-<%= content_tag(:div, flash[:notice], :id => "flash_notice") if flash[:notice] %>
-<%= content_tag(:div, flash[:alert], :id => "flash_alert") if flash[:alert] %>
-
-<div class="wrapper_signup">
-  <div class="row">
-    <div class="layout_signup">
-      <div class="row">
-	<div class="large-7 columns">
-          <h1><%=_("Sign Up") %></h1>
-
-	  <div class="justify row">
-            <i class="fa fa-coffee fa-5x"></i>
-
-            <p>
-	      <%= _("For registration you can fill the form .") %>
-            </p>
-	  </div>
-	  <br />
-
-	  <div class="justify row">
-	    <i class="fa-globe fa fa-5x"></i>
-            <p>
-	      <%= _("You can access the member information by registration on this site.") %>
-            </p>
-	  </div>
-
-	  <br />
-
-	  <div class="justify row">
-            <i class="fa-money fa fa-5x"></i>
-            <p>
-	      <%= _("If you are a registered member you can go to signin page") %>
-            </p>
-	  </div>
-
-	  <br />
+<div class="form-box" id="login-box">
+  <div class="header"><%= t("faalis.sign_up") %></div>
+  <%= form_for(resource, :as => resource_name, :url => registration_path(resource_name)) do |f| %>
+
+    <div class="body bg-gray">
+      <% unless resource.errors.empty? %>
+        <br />
+        <div class="alert alert-danger" role="alert">
+          <i class="fa fa-warning"></i>
+          <%= devise_error_messages! %>
+        </div>
+      <% end %>
+
+      <div class="form-group <% if resource.errors[:email] -%>has-error<% end %>">
+        <%= f.email_field :email, autofocus: true, type: "text", class: "form-control", placeholder: t("faalis.email") %>
+      </div>
 
-	  <div class="justify row">
-	    <i class="fa-group fa fa-5x"></i>
-            <p>
-	      <%= _("some text.") %>
-            </p>
-	  </div>
-<br>
+      <% if resource.send(:password_required?) %>
+        <div class="form-group <% if resource.errors[:password] -%>has-error<% end %>">
+	  <%= f.password_field :password, class: "form-control", placeholder: t("faalis.password")%>
 	</div>
-	<div class="large-4 columns">
-
-	  <div class="row">
-	    <section class="">
-	      <div class="form panel radius">
-		<%= form_for(resource, :as => resource_name, :url => registration_path(resource_name)) do |f| %>
-
-		  <div class="field">
-		    <label><%=_("Email") %></label>
-		    <%= f.email_field :email, :autofocus => true, :type => "text", :class => "input email", :placeholder=>_("E-mail") %>
-
-		    <% if resource.errors[:email] -%>
-		      <dd class="danger abel"><%= resource.errors[:email][0] %></dd>
-		    <% end -%>
-		  </div>
-
-		  <% if resource.send('password_required?'.to_sym) %>
-		    <div class="field">
-		      <label><%=_("Password") %></label>
-		      <%= f.password_field :password, :class => "password input" %>
-		      <% if resource.errors[:password] -%>
-			<dd class="danger abel"><%= resource.errors[:password][0] %></dd>
-		      <% end -%>
-
-		    </div>
-
-		    <div class="field">
-		      <label><%=_("Confim Password") %></label>
-		      <%= f.password_field :password_confirmation, :class => "password input" %>
-
-		    </div>
-
-		  <% end %>
-		  <br>
-		  <div class="submit"><%= f.submit "Sign up" , :class => "button" %></div>
-		<% end %>
-
-	      </div>
-
-	    </section>
-	  </div>
-
-
+        <div class="form-group <% if resource.errors[:password_confirmation] -%>has-error<% end %>">
+	  <%= f.password_field :password_confirmation, class: "form-control", placeholder: t("faalis.confirm_password") %>
 	</div>
+      <% end %>
+    </div>
+    <div class="footer">
+
+      <div class="submit"><%= f.submit t("faalis.sign_up") , class: "btn bg-olive btn-block" %></div>
+      <br /><br />
+      <%= render "devise/shared/links" %>
 
-      </div>
     </div>
-  </div>
+  <% end %>
+  <%= render "devise/shared/omni_link" %>
 </div>

data/app/views/devise/sessions/new.html.erb

@@ -1,63 +1,38 @@
-<%= content_tag(:div, flash[:error], :id => "flash_error") if flash[:error] %>
-<%= content_tag(:div, flash[:notice], :id => "flash_notice") if flash[:notice] %>
-<%= content_tag(:div, flash[:alert], :id => "flash_alert") if flash[:alert] %>
+<p class="login-box-msg"><%= t('sign_in') %></p>
+<% flash.each do |name, msg| %>
+  <div class="alert alert-danger" role='alert'><i class="fa fa-warning"></i> <%= msg %></div>
+<%- end -%>
 
+<%= form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f| %>
 
-<div class="row single-form">
-
-  <div class="large-offset-3 small-6 columns">
-    <%= form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f| %>
-      <fieldset>
-        <legend><%= _("Sign In") %></legend>
-        <%= devise_error_messages! %>
-        <div class="field">
-	  <%= f.email_field :email, :autofocus => true, :class => "input email", :placeholder=>_("E-mail") %>
-          <% if resource.errors[:email] -%>
-	    <dd class="danger abel"><%= resource.errors[:email][0]%></dd>
-          <% end -%>
-
-        </div>
-
-        <div class="field">
-	  <%= f.password_field :password, :class => "input password", :placeholder=>_("Password") %>
-          <% if resource.errors[:password] -%>
-	    <dd class="danger abel"><%= resource.errors[:password][0] %></dd>
-          <% end %>
-        </div>
-        <div class="field">
-	  <% if devise_mapping.rememberable? -%>
-	    <div><%= f.check_box :remember_me, :class=>"checkbox" %> <%= f.label _("Remember me") %></div>
-	  <% end %>
-        </div>
-
-        <div class="right submit">
-	  <%= f.submit _("Sign in"), :class => "button"%><br><br>
-        </div>
-
-        <br>
-        <div class="text-left left">
-          <a href="/auth/google_oauth2/" class="pull_right">
-            <i class="fa-google-plus-square fa fa-3x"></i>
-          </a>
+  <div class="form-group has-feedback <% if resource.errors[:email] -%>has-error<% end %>">
+    <%= f.email_field :email, :autofocus => true, :class => "form-control", :placeholder=>t("faalis.email") %>
+    <span class="glyphicon glyphicon-envelope form-control-feedback"></span>
+  </div>
 
-          <a href="/auth/facebook/" class="pull_right">
-            <i class="fa-facebook-square fa fa-3x"></i>
-          </a>
+  <div class="form-group has-feedback <% if resource.errors[:password] -%>has-error<% end %>">
+    <%= f.password_field :password, :class => "form-control", :placeholder=>t("faalis.password") %>
+    <span class="glyphicon glyphicon-lock form-control-feedback"></span>
+  </div>
 
-          <a href="/auth/twitter/" class="pull_right">
-            <i class="fa-twitter-square fa fa-3x"></i>
-          </a>
-        </div>
-        <br>
-        <br>
-        <div class="text-center">
-        <%= render "devise/shared/links" %>
-        </div>
-      </fieldset>
 
+  <div class="row">
+    <% if devise_mapping.rememberable? -%>
+    <div class="col-xs-8">
+      <div class="checkbox icheck">
+        <label>
+          <%= f.check_box :remember_me, :class=>"checkbox" %> <%= t('faalis.remember_me') %>
+        </label>
+      </div>
+    </div><!-- /.col -->
     <% end %>
-
+    <div class="col-xs-4">
+      <button type="submit" class="btn btn-primary btn-block btn-flat"><%= t('faalis.sign_in') %></button>
+    </div><!-- /.col -->
   </div>
+</form>
 
+<%= render "devise/shared/omni_link" %>
 
-</div>
+<%= render "devise/shared/links" %>
+<% end %>

data/app/views/devise/shared/_links.erb

@@ -1,27 +1,19 @@
-<p>
 <%- if controller_name != 'sessions' %>
-  <%= link_to "Sign in", new_session_path(resource_name) %>   <br>
+  <%= link_to t("sign_in"), new_session_path(resource_name) %><br />
 <% end -%>
 
 <%- if devise_mapping.registerable? && controller_name != 'registrations' %>
-  <%= link_to "Sign up", new_registration_path(resource_name) %>   <br>
+  <%= link_to t("sign_up"), new_registration_path(resource_name) %><br />
 <% end -%>
 
 <%- if devise_mapping.recoverable? && controller_name != 'passwords' && controller_name != 'registrations' %>
-  <%= link_to "Forgot your password?", new_password_path(resource_name) %>  <br>
+  <%= link_to t("forgot_your_password"), new_password_path(resource_name) %><br />
 <% end -%>
 
 <%- if devise_mapping.confirmable? && controller_name != 'confirmations' %>
-  <%= link_to "Didn't receive confirmation instructions?", new_confirmation_path(resource_name) %>  <br>
+  <%= link_to t("didnt_receive_confirmation_instructions"), new_confirmation_path(resource_name) %><br />
 <% end -%>
 
 <%- if devise_mapping.lockable? && resource_class.unlock_strategy_enabled?(:email) && controller_name != 'unlocks' %>
-  <%= link_to "Didn't receive unlock instructions?", new_unlock_path(resource_name) %> <br>
+  <%= link_to t("didnt_receive_unlock_instructions"), new_unlock_path(resource_name) %><br />
 <% end -%>
-
-<%- if devise_mapping.omniauthable? %>
-  <%- resource_class.omniauth_providers.each do |provider| %>
-    <%= link_to "Sign in with #{provider.to_s.titleize}", faalis.user_omniauth_authorize_path(provider) %>
-  <% end -%>
-<% end -%>
-</p>

data/app/views/devise/shared/_omni_link.erb

@@ -0,0 +1,33 @@
+<%- if devise_mapping.omniauthable? %>
+  <div class="social-auth-links text-center">
+    <p>- OR -</p>
+
+    <%- resource_class.omniauth_providers.each do |service| %>
+      <% if [:facebook, :twitter, :google_oauth2].include? service %>
+        <% if service == :facebook %>
+          <a href='/auth/facebook/' class="btn btn-block btn-social btn-facebook btn-flat">
+            <i class="fa fa-facebook"></i>
+            <%= t('sign_in_using_facebook') %>
+          </a>
+        <% end %>
+
+        <% if service == :twitter %>
+          <a href='/auth/twitter/' class="btn btn-block btn-social btn-twitter btn-flat">
+            <i class="fa fa-twitter"></i>
+            <%= t('sign_in_using_twitter') %>
+          </a>
+        <% end %>
+
+        <% if service == :google_oauth2 %><a href='/auth/google_oauth2/' class="btn btn-block btn-social btn-google btn-flat">
+          <i class="fa fa-google-plus"></i>
+          <%= t('sign_in_using_google') %>
+        </a>
+        <% end %>
+
+      <% else %>
+        <a href='<%= faalis.user_omniauth_authorize_path(service) %>' class="btn btn-circle"><i class="fa fa-<%= service %>"></i></a>
+      <% end %>
+    <% end %>
+  </div><!-- /.social-auth-links -->
+
+<% end %>

data/app/views/faalis/dashboard/groups/_form.html.slim

@@ -5,23 +5,19 @@ div
         .box.box-primary
           .box-header
             .box-title
-              - if @group.new_record?
-                = _('New Group')
-              - else
-                = _('Edit Group')
 
           .box-body
             .row
               .col-sm-12.col-lg-6
                 .form-group data-name="role"
                   label for="group_name"
-                    = ('Group name')
+                    = ('faalis.group.group_name')
 
-                  input#group_name.form-control[placeholder==(_('Enter the name of group you want to create')) name="group[name]" type="text" required value=(@group.name)]
+                  input#group_name.form-control[name="group[name]" type="text" required value=(@group.name)]
 
 
 
-      .col-sm-12.col-lg-3
+      /.col-sm-12.col-lg-3
         .box
           .box-header
             .box-title
@@ -31,7 +27,7 @@ div
         .box.box-warning
           .box-header
             .box-title
-              = _("Permissions")
+              = t("faalis.permission.permissions")
 
           .box-body
             .row
@@ -40,9 +36,9 @@ div
                   tbody
                     tr
                       th.col-md-4
-                        = _('Entity Name')
+                        = t('faalis.permission.entity_name')
                       th.col-md-8
-                        = _('Permission')
+                        = t('faalis.permission.permission')
 
                     - @permissions.each do |perm, actions|
                       tr
@@ -52,21 +48,21 @@ div
                             - actions.each do |action|
                               span.col-sm-3
                                 - if @group.include_permission? action[1]
-                                  input[type="checkbox" checked name=("group[permissions][#{action[1]}]") label=(_(action[0].humanize()))]
-                                    = action[0].humanize()
+                                  input[type="checkbox" checked name=("group[permissions][#{action[1]}]") label=(t(action[0].humanize()))]
+                                    = " #{action[0].humanize()}"
                                 - else
-                                  input[type="checkbox" name=("group[permissions][#{action[1]}]") label=(_(action[0].humanize()))]
-                                    = action[0].humanize()
+                                  input[type="checkbox" name=("group[permissions][#{action[1]}]") label=(t(action[0].humanize()))]
+                                    = " #{action[0].humanize()}"
 
     .row
       .col-sm-2
         button.btn.btn-primary.btn-block type="submit"
           i.fa.fa-check
           |
-          = _('Save')
+          = t('faalis.save')
 
       .col-sm-2
 
         div.btn.btn-danger.btn-block onclick=("redirect_to('#{index}')")
           i.fa.fa-times
-          = _('Cancel')
+          = t('faalis.cancel')