thecore_ui_commons 2.1.9 → 2.1.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ea33b6b025d99acfffd0c7409f2d43afdd08c943b1cde57a91b2ed2be2c39d6e
-  data.tar.gz: 74316d7395c7a3837b7c65588302c749dc1a09dddd1a56bdc17eb2fa2bc1206d
+  metadata.gz: 335ebc71696d91bccc5f8e40c0578f4d57981f38ef3abaf32d804c852f21486b
+  data.tar.gz: f9449c252ca8cf444105fd45186fb3d8071c19eea5c1957f778acf2f1e83011c
 SHA512:
-  metadata.gz: 2ecba4a7144e2797ad4fe9804f0de16206eb624e875317649fc10ade3f4c7880c4927760df332516fef7a05fdbcacb8ff6f209c18f291aae5f19c798e68c661d
-  data.tar.gz: 7ca7ca4aaafdafa5ec1abbf2f5baecf929b66319246c9cbc6d982410cebf030d7548c9161e60d742f20b3b3cdfc22adb615332fcd8f69ca8774fbd9d30cff8dc
+  metadata.gz: f71388796069c082d8f8f6a3455da74dfab15c4132419f37cf3c30e1209fda5d533237f34ccf06fc4f4fa15a30e84e71141270875871063cd458e3b52a968574
+  data.tar.gz: f764ea7a0881c8c8a592d77b19f890cce24414a584493729409fd0f7887b86340cd04a4daa92030d35cd87d9cd6b337bc17f7cb5f31c2cbc7295851dbea75f7f

data/app/assets/stylesheets/thecore_ui_commons/thecore.scss

@@ -16,3 +16,7 @@
  *= require_self
 */
 @import 'actiontext.scss';
+
+#new_user div {
+    margin-bottom: .5em;
+}

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

@@ -1,26 +1,24 @@
 <div class="col-md-4 col-md-offset-4">
 <%= form_for(resource, as: resource_name, url: session_path(resource_name)) do |f| %>
   <div class="field">
-    <%= f.label :login %><br />
-    <%= f.text_field :login, autofocus: true, :class => "form-control" %>
+    <%= f.text_field :login, autofocus: true, :class => "form-control", placeholder: t("devise.sessions.new.login") %>
   </div>
 
   <div class="field">
-    <%= f.label :password %><br />
-    <%= f.password_field :password, autocomplete: "off", :class => "form-control" %>
+    <%= f.password_field :password, autocomplete: "off", :class => "form-control", placeholder: t("devise.sessions.new.password") %>
   </div>
 
   <% if devise_mapping.rememberable? -%>
-  <div class="checkbox">
-    <label>
-        <%= f.check_box :remember_me %>
-        <%=t "activerecord.attributes.user.remember_me" %>
-    </label>
+  <div class="form-check">
+    <%= f.check_box :remember_me, class: "form-check-input" %>
+    <label class="form-check-label" for="defaultCheck1">
+      <%=t "activerecord.attributes.user.remember_me" %>
+   </label>
   </div>
   <% end -%>
 
   <div class="actions">
-    <%= f.submit t("devise.sessions.new.sign_in"), :class => "btn btn-warning" %>
+    <%= f.submit t("devise.sessions.new.sign_in"), class: "btn" %>
 
     <%= render "devise/shared/links" %>
   </div>

data/app/views/layouts/thecore.html.erb

@@ -12,8 +12,8 @@
 
     <%# Getting all the assets needed by thecore from all the gems %>
     <%= get_asset_tags_for("thecore")%>
-    <%= stylesheet_link_tag('application', media: 'all', 'data-turbolinks-track' => true) if ::Rails.application.assets.find_asset("application.css")%>
-    <%= javascript_include_tag('application', 'data-turbolinks-track' => true) if ::Rails.application.assets.find_asset("application.js") %>
+    <%= stylesheet_link_tag('application', media: 'all', 'data-turbolinks-track' => true) if (Rails.application.assets || ::Sprockets::Railtie.build_environment(Rails.application)).find_asset("application.css")%>
+    <%= javascript_include_tag('application', 'data-turbolinks-track' => true) if (Rails.application.assets || ::Sprockets::Railtie.build_environment(Rails.application)).find_asset("application.js") %>
     
     <%= favicon_link_tag 'apple-touch-icon.png', rel: 'apple-touch-icon', sizes: "180x180" %>
     <%= favicon_link_tag 'favicon-32x32.png', rel: 'icon', sizes: "32x32" %>

data/config/initializers/thecore_ui_commons_helper.rb

@@ -2,15 +2,22 @@ module Helpers
     module ThecoreUiCommonsHelper
         def get_asset_tags_for(basename)
             out = []
+
             # Needs to reverse since Paths are traversed in the order they occur in the search path. By default, this means the files in app/assets take precedence, and will mask corresponding paths in lib and vendor.
             Rails.application.config.assets.paths.reverse.each do |basedir|
                 base = "#{basedir}/**/#{basename}"
-                base_s = Dir["#{base}.scss"]
+                base_s = Dir["#{base}.{css,scss}"]
                 base_j = Dir["#{base}.js"]
-                out << stylesheet_link_tag("#{get_folder base_s}/#{basename}", media: 'all', 'data-turbolinks-track' => true) if base_s.any?
-                out << javascript_include_tag("#{get_folder base_j}/#{basename}", 'data-turbolinks-track' => true) if base_j.any?
+                
+                (out << stylesheet_link_tag("#{get_folder base_s}/#{basename}", media: 'all', 'data-turbolinks-track' => true) if base_s.any?) rescue nil
+                (out << javascript_include_tag("#{get_folder base_j}/#{basename}", 'data-turbolinks-track' => true) if base_j.any?) rescue nil
             end
-            out.join("\n    ").html_safe
+
+            # Application level assets
+            (out << stylesheet_link_tag('application', media: 'all', 'data-turbolinks-track' => true)) rescue nil
+            (out << javascript_include_tag('application', 'data-turbolinks-track' => true)) rescue nil
+
+            out.join("\n").html_safe
         end
         
         def get_folder(base)

data/config/locales/en.yml

@@ -1,5 +1,10 @@
 en:
   current_user: Current User
+  devise:
+    sessions:
+      new:
+        login: Login
+        password: Password
   hello: Hello World
   dashboard: Dashboard
   contact: Help us

data/config/locales/it.yml

@@ -7,6 +7,11 @@ it:
   sign_out: "Uscita"
   advanced: Impostazioni
   main_records: Anagrafiche
+  devise:
+    sessions:
+      new:
+        login: Login
+        password: Password
   errors:
     messages:
       invalid: contiene caratteri invalidi

data/lib/thecore_ui_commons/version.rb

@@ -1,3 +1,3 @@
 module ThecoreUiCommons
-  VERSION = '2.1.9'
+  VERSION = '2.1.14'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: thecore_ui_commons
 version: !ruby/object:Gem::Version
-  version: 2.1.9
+  version: 2.1.14
 platform: ruby
 authors:
 - Gabriele Tassoni
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-29 00:00:00.000000000 Z
+date: 2020-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thecore_background_jobs