tida_template 0.1.2 → 0.1.3

data/lib/generators/tida_template/install_generator.rb

@@ -22,6 +22,14 @@ module TidaTemplate #:nodoc:
         end
       end
 
+      def run_other_generators
+        generate 'devise:install'
+        generate 'devise user'
+        generate 'simple_form:install --bootstrap'
+        generate 'wice_grid:install'
+        generate 'navigation_config'
+      end
+
       def copy_stuff #:nodoc:
         # copy layouts
         copy_file 'app/views/layouts/single.html.erb', 'app/views/layouts/single.html.erb'
@@ -36,20 +44,10 @@ module TidaTemplate #:nodoc:
         copy_file 'app/views/shared/components/_page_title.html.erb', 'app/views/shared/components/_page_title.html.erb'
         copy_file 'app/views/shared/components/_toolbar.html.erb', 'app/views/shared/components/_toolbar.html.erb'
 
-        # copy devise view
-        copy_file 'app/views/devise/sessions/new.html.erb', 'app/views/devise/sessions/new.html.erb'
-
-        # copy rails template files
-        copy_file 'rails_templates/erb/scaffold/_form.html.erb', 'lib/templates/erb/scaffold/_form.html.erb'
-        copy_file 'rails_templates/erb/scaffold/index.html.erb', 'lib/templates/erb/scaffold/index.html.erb'
-        copy_file 'rails_templates/erb/scaffold/new.html.erb', 'lib/templates/erb/scaffold/new.html.erb'
-        copy_file 'rails_templates/erb/scaffold/edit.html.erb', 'lib/templates/erb/scaffold/edit.html.erb'
-        copy_file 'rails_templates/erb/scaffold/show.html.erb', 'lib/templates/erb/scaffold/show.html.erb'
-        copy_file 'rails_templates/rails/scaffold_controller/controller.rb', 'lib/templates/rails/scaffold_controller/controller.rb'
-
         # copy renders
         copy_file 'renderers/sub_navigation_bar_renderer.rb', 'lib/tida/renderers/sub_navigation_bar_renderer.rb'
         copy_file 'renderers/top_navigation_bar_renderer.rb', 'lib/tida/renderers/top_navigation_bar_renderer.rb'
+        copy_file 'renderers/component_renderer.rb', 'lib/tida/renderers/component_renderer.rb'
 
         # copy paperclip attachment access token
         copy_file 'paperclip/attachment_access_token.rb', 'lib/tida/paperclip/attachment_access_token.rb'
@@ -66,16 +64,18 @@ module TidaTemplate #:nodoc:
         #copy other configurations
         copy_file 'config/application.yml', 'config/application.yml'
         copy_file 'settingslogic/settings.rb', 'lib/settings.rb'
-      end
 
-      def run_other_generators
-        generate 'devise:install'
-        generate 'devise user'
-        generate 'simple_form:install --bootstrap'
-        generate 'wice_grid:install'
-        generate 'navigation_config'
-      end
+        # copy devise view
+        copy_file 'app/views/devise/sessions/new.html.erb', 'app/views/devise/sessions/new.html.erb'
 
+        # copy rails template files
+        copy_file 'rails_templates/erb/scaffold/_form.html.erb', 'lib/templates/erb/scaffold/_form.html.erb'
+        copy_file 'rails_templates/erb/scaffold/index.html.erb', 'lib/templates/erb/scaffold/index.html.erb'
+        copy_file 'rails_templates/erb/scaffold/new.html.erb', 'lib/templates/erb/scaffold/new.html.erb'
+        copy_file 'rails_templates/erb/scaffold/edit.html.erb', 'lib/templates/erb/scaffold/edit.html.erb'
+        copy_file 'rails_templates/erb/scaffold/show.html.erb', 'lib/templates/erb/scaffold/show.html.erb'
+        copy_file 'rails_templates/rails/scaffold_controller/controller.rb', 'lib/templates/rails/scaffold_controller/controller.rb'
+      end
     end
   end
 end

data/lib/generators/tida_template/templates/app/inputs/date_picker_input.rb

@@ -0,0 +1,9 @@
+class DatePickerInput < SimpleForm::Inputs::Base
+  def input
+    content = []
+    content << @builder.text_field(attribute_name, input_html_options)
+    icon_content = template.content_tag(:i, nil, 'data-time-icon' => 'icon-time', 'data-date-icon' => 'icon-calendar')
+    content << template.content_tag(:span, icon_content.html_safe, :class => 'add-on')
+    template.content_tag(:div, content.join.html_safe, :class => 'date datepicker input-append date-picker')
+  end
+end

data/lib/generators/tida_template/templates/app/inputs/date_time_picker_input.rb

@@ -0,0 +1,9 @@
+class DateTimePickerInput < SimpleForm::Inputs::Base
+  def input
+    content = []
+    content << @builder.text_field(attribute_name, input_html_options)
+    icon_content = template.content_tag(:i, nil, 'data-time-icon' => 'icon-time', 'data-date-icon' => 'icon-calendar')
+    content << template.content_tag(:span, icon_content.html_safe, :class => 'add-on')
+    template.content_tag(:div, content.join.html_safe, :class => 'date datetimepicker input-append date-time-picker')
+  end
+end

data/lib/generators/tida_template/templates/renderers/component_renderer.rb

@@ -0,0 +1,49 @@
+module Tida
+  module Renderers
+    module ComponentRenderer
+      def render_component(options = {})
+        render partial: options[:partial], object: options
+      end
+
+      def render_page_title(title)
+        toolbar = []
+        if block_given?
+          yield toolbar
+        end
+        data = {title: title.html_safe, toolbar: toolbar, partial: 'shared/components/page_title'}
+        render_component data
+      end
+
+      def render_article_title(title, class_name = nil)
+        toolbar = []
+        if block_given?
+          yield toolbar
+        end
+        data = {title: title.html_safe, class: class_name, toolbar: toolbar, partial: 'shared/components/article_title'}
+        render_component data
+      end
+
+      def render_modal_window(name, title, inner_partial)
+        data = {name: name, title: title, inner_partial: inner_partial, partial: 'shared/components/modal'}
+        render_component data
+      end
+
+      def render_icon_and_text_content(icon_name, text)
+        content = []
+        content << content_tag(:i, nil, class: icon_name)
+        content << content_tag(:span, text)
+        content.join(" ").html_safe
+      end
+
+      def render_icon_content(icon_name)
+        content_tag(:i, nil, class: icon_name)
+      end
+
+      def render_progress_bar(label)
+        label_content = content_tag :span, label
+        bar_content = content_tag :div, label_content, class: 'bar', style: 'width: 100%;'
+        content_tag :div, bar_content, class: 'progress progress-striped active'
+      end
+    end
+  end
+end

data/lib/tida_template/version.rb

@@ -1,3 +1,3 @@
 module TidaTemplate
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/vendor/assets/stylesheets/_buttons.scss

@@ -7,8 +7,8 @@
   text-shadow: none;
   background: $btnBackground;
   @include box-shadow(none);
-  border: none;
-  border-bottom: 2px solid darken($btnBackground, 10%);
+  border: 1px solid darken($btnBackground, 5%);
+  border-bottom: 4px solid darken($btnBackground, 10%);
   outline: none !important;
 
   &.disabled,
@@ -37,7 +37,8 @@
   @include box-shadow(none);
   background: $backgroundColor;
   color: $foreColor;
-  border-bottom-color: darken($backgroundColor, 10%);
+  border: 1px solid darken($backgroundColor, 5%);
+  border-bottom: 3px solid darken($backgroundColor, 10%);
   &:hover, &:active {
     background: darken($backgroundColor, 10%);
   }

data/vendor/assets/stylesheets/_modals.scss

@@ -7,11 +7,16 @@ $modalHeaderFontColor: $pageTitleFontColor;
   .modal-header {
     border: none;
     color: $modalHeaderFontColor;
-    padding: 0px $bigPadding;
-    border-top: 5px solid #ccc;
+    padding: $bigPadding;
     h4 {
-      font-weight: normal;
-      line-height: 40px;
+      font-weight: normal !important;
+      font-size: 24px;
+    }
+    background: $borderColor;
+    .close {
+      position: absolute;
+      right: 10px;
+      top: 5px;
     }
   }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tida_template
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-15 00:00:00.000000000 Z
+date: 2013-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -275,6 +275,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/generators/tida_template/install_generator.rb
+- lib/generators/tida_template/templates/app/inputs/date_picker_input.rb
+- lib/generators/tida_template/templates/app/inputs/date_time_picker_input.rb
 - lib/generators/tida_template/templates/app/views/devise/sessions/new.html.erb
 - lib/generators/tida_template/templates/app/views/layouts/application.html.erb
 - lib/generators/tida_template/templates/app/views/layouts/single.html.erb
@@ -298,6 +300,7 @@ files:
 - lib/generators/tida_template/templates/rails_templates/erb/scaffold/new.html.erb
 - lib/generators/tida_template/templates/rails_templates/erb/scaffold/show.html.erb
 - lib/generators/tida_template/templates/rails_templates/rails/scaffold_controller/controller.rb
+- lib/generators/tida_template/templates/renderers/component_renderer.rb
 - lib/generators/tida_template/templates/renderers/sub_navigation_bar_renderer.rb
 - lib/generators/tida_template/templates/renderers/top_navigation_bar_renderer.rb
 - lib/generators/tida_template/templates/settingslogic/settings.rb
@@ -376,7 +379,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3051026336874167931
+      hash: 390698480970998465
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -385,7 +388,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3051026336874167931
+      hash: 390698480970998465
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25