jap_mag 0.0.4 → 0.0.5

data/app/helpers/jap_mag_widgets_helper.rb

@@ -1,177 +1,175 @@
 module JapMagWidgetsHelper
-  
   def is_mobile_device?
     mobile_user_agents = 'palm|blackberry|nokia|phone|midp|mobi|symbian|chtml|ericsson|minimo|audiovox|motorola|samsung|telit|upg1|windows ce|ucweb|astel|plucker|x320|x240|j2me|sgh|portable|sprint|docomo|kddi|softbank|android|mmp|pdxgw|netfront|xiino|vodafone|portalmmm|sagem|mot-|sie-|ipod|up\\.b|webos|amoi|novarra|cdm|alcatel|pocket|iphone|mobileexplorer|mobile'
     request.user_agent.to_s.downcase =~ Regexp.new(mobile_user_agents)
   end
-  
+
   def get_body_class
     c = []
     c << controller.controller_name
     c << "mobile" if is_mobile_device?
-    
+
     c.collect{|e| e.titleize.gsub(/\s/, "")}.join " "
   end
-  
+
   def get_body_id
     content_for(:id).to_s.titleize.gsub(/\s/, "") unless content_for(:id).blank?
   end
-  
+
   def get_wrapper_class
     c = []
     c << controller.action_name
-    
+
     c.collect{|e| e.titleize.gsub(/\s/, "")}.join " "
   end
 
-  #
-  # navigation helper
-  # by Felix
-  #
-  # the helper matches params with request.request_uri
-  #
-  # example:
-  # sections = {
-  #		'radio'=>{:title => 'Station', :url => radio_path},
-  #		'edit_station'=>{:url => 'Radio', :url => edit_station_path}
-  #	}
-  # options = {
-  #    :id => 'test_menu'
-  #    :current => 'current'
-  # }
-  # outputs:
-  # <ul id="test_menu">
-  #   <li><a href="/station">Station</a></li>
-  #   <li class="current"><a href="/radio/">Radio</a></li>
-  # </ul>
-  #:title
-  def menu(sections, options=nil)
-    items = Array.new
-
-    # default options
-    options ||= Hash.new
-    options[:id] ||= nil
-    options[:class] ||= nil
-    options[:current] ||= 'current' # jquery ui tabs plugin needs the later one
-
-    sections.each do |section|
-      klass = section[:current] ? "#{options[:current]} #{section[:class]}".strip : section[:class]
-      items << content_tag(:li, link_to(section[:title], section[:url], :class => klass))   
-    end
+  def title(*titles)
+    seperator = " - "
 
-    return content_tag :ul, :id => options[:id], :class => options[:class] do
-      items.collect {|item| concat(item)}
-    end
+    default_options = {sitename: _("/logo")}
+    options = titles.last.is_a?(Hash) ? titles.pop : {}
+    options = default_options.merge(options)
+    page_title = page_title_for_return = titles.join(seperator)
+    page_title = options[:sitename] + seperator + page_title_for_return if not options[:sitename].blank?
+
+    content_for(:title, page_title)
+
+    page_title_for_return
   end
 
-  def clearfix options={}
-    opt = {:class => " clearfix"}
-    options[:class] += opt[:class] if options[:class]
-    (options[:class] || opt[:class]).strip!
-    opt = opt.merge(options)
-    content_tag(:div, nil, opt)
+  def paginator(collections, options={})
+    will_paginate collections, options
   end
 
-  def link_to_user(user, options={})
+  def time_difference time
+    "#{distance_of_time_in_words(time, Time.now, true)} ago" if time
+  end
 
-    default_options = {
-      :href => user,
-      :avatar => false,
-      :title => user.name,
-      :class => ""
-    }
+  def current_or_null(condition)
+    condition ? "current" : nil
+  end
 
-    options = default_options.merge(options)
+  def last_deployed_at
+    file = File.join("tmp", "restart.txt")
+    File.exists?(file) ? File.atime(file) : nil
+  end
 
-    if options[:avatar]
-      return unless user.avatar?
+  def bootstrap_menu links
+    links.collect do |link|
+      klass = []
+      klass << link[:klass] if link[:klass]
+      klass << "last-child" if link == links.last
 
-      text = image_tag(user.avatar.url(options[:avatar]), :alt => user.name, :class => "avatar")
+      if (link[:controller_action].is_a?(Array) and current_controller_action_in?(*link[:controller_action])) \
+        or (current_controller_action_in?(link[:controller_action]))
+        klass << "active"
+      end
 
-      options[:class] += " avatar".strip
-    else
-      text = user.name
-    end
+      klass = klass.empty? ? nil : klass.join(" ")
 
-    #raise url_for(user)#user_path(:subdomain => "aaa").inspect
-    link_to(text, options[:href], :title => options[:title], :class => options[:class])
+      content_tag :li, class: klass do
+        link_to link[:text], link[:path], link[:html_options]
+      end
+    end.join.html_safe
   end
 
-  def title(*titles)
-    seperator = " - "
+  def bootstrap_scope_button scopes, options = {}
+    content_tag :ul, class: "nav nav-tabs" do
+      scopes.collect do |scope|
+        url = eval("#{options[:path].to_s}(scope: :#{scope[:key]})")
+        current = ((params[:scope] == scope[:key].to_s) or (scope[:default] and scope[:default] == true and params[:scope].blank?))
+        link = link_to("#{content_tag(:span, scope[:text])} (#{scope[:count]})".html_safe, url)
 
-    default_options = {:sitename => true}
-    options = titles.last.is_a?(Hash) ? titles.pop : {}
-    options = default_options.merge(options)
+        concat content_tag(:li, link, class: (current ? :active : nil))
+      end
+    end
+  end
 
-    page_title = page_title_for_return = titles.join(seperator)
-    page_title = t("logo") + seperator + page_title_for_return if options[:sitename]
+  def bootstrap_button_group checkbox, id = nil, status = nil, default = nil
+    status ||= %w(turned_on turned_off)
+    default ||= "turned_off"
 
-    content_for(:title, page_title)
+    content_tag :div, "id" => id, "class" => "bootstrap-toggle" do
+      buttons = content_tag :div, "class" => "btn-group", "data-toggle" => "buttons-radio" do
+        status.collect do |s|
+          content_tag :button, "type" => "button", "class" => "btn btn-default #{s}#{" active" if s == default}", "data-status" => s do
+            _("/page.my.pac.status.#{s}")
+          end
+        end.join.html_safe
+      end
 
-    page_title_for_return
+      buttons + checkbox
+    end
   end
 
-  def random_disable_with_status
-    status = [
-      "Just a moment",
-      "Let's stay together",
-      "On the highway to hell",
-      "Don't worry baby",
-      "Let it be",
-      "Getting you away from here",
-      "Let's get it started",
-      "It's now or never"
-    ]
+  def bootstrap_stacked_progress_bar percent, options = {}
+    klass = if percent < 50
+              :success
+            elsif percent >= 50 and percent < 80
+              :warning
+            else
+              :danger
+            end
 
-    status.shuffle.first + "..."
+    #percent = "#{percent * 100}%"
+    options[:precision] ||= 2
+    percent = number_to_percentage percent, options
+
+    opts_for_container = {class: :progress}
+    if options[:tooltip]
+      placement = options[:tooltip][:placement] || "top"
+      opts_for_container.merge!("data-toggle" => "tooltip", "data-placement" => placement, title: options[:tooltip][:title])
+    end
+
+    content_tag :div, opts_for_container do
+      content_tag :div, class: "progress-bar progress-bar-#{klass}", role: :progressbar, style: "width: #{percent}" do
+        percent
+      end
+    end
   end
 
-  #
-  # call to action
-  #
-  def cta text, url, html_options={}
+  def link_to_external text, link, options={}
+    options.merge!(target: :_blank)
 
-    html_options[:class] = (html_options[:class].to_s + " cta").strip
+    if options[:anonymous]
+      link = "http://anonym.to/?#{link}"
+      options.delete(:anonymous)
+    end
 
-    link_to content_tag(:span, text), url, html_options
+    link_to "#{text}#{fa_icon "external-link"}".html_safe, link, options
+  end
+
+  def input_for_selection text
+    (content_tag :input, nil, value: text, class: "form-input for-selection").html_safe
   end
 
   #
-  # paginator
+  # call to action
   #
-  def paginator(collections, options={})
-    will_paginate collections, options
+  def cta text, url, opts = {}
+    klass = %w(button button-rounded button-caution)
+    klass << opts[:class] if opts[:class].present?
+    opts[:class] = klass.join(" ")
+
+    link_to text, url, opts
   end
 
-  def time_difference time
-    "#{distance_of_time_in_words(time, Time.now, true)} ago" if time
+  def cta_params opts = {}
+    {data: {disable_with: _("/actions.wait")}, class: "button button-rounded button-caution"}.merge opts
   end
-  
-  def current_or_null(condition)
-    condition ? "current" : nil
+
+  def long_date date
+    I18n.l date, format: :long
   end
 
-  def scope_button scopes, options={}
-    content_tag :ul, class: :scopes do
-      scopes.collect do |scope|
-        count = options[:count][scope[:key]]
-        url = eval("#{options[:path].to_s}(scope: :#{scope[:key]})")
-        current = ((params[:scope] == scope[:key].to_s) or (scope[:default] and params[:scope].blank?))
 
-        concat content_tag(:li, link_to("#{content_tag(:span, scope[:text])} (#{count})".html_safe, url, class: current_or_null(current)))
-      end
-    end
-  end
-  
-  def last_deployed_at
-    file = File.join("tmp", "restart.txt")
-    File.exists?(file) ? File.atime(file) : nil
+  def short_date date
+    I18n.l date, format: :short
   end
 
   protected
-  
+
   def current_template
     File.basename(lookup_context.find_all(params[:action], params[:controller]).first.inspect)
   end
-end
+end

data/app/views/layouts/_footer.erb

@@ -1,13 +0,0 @@
-<div id="footer">
-	<div class="gutter">
-		<p><%= t :copyright %></p>
-		<%= clearfix %>
-		<ul class="languages">
-			<%
-			p = params.dup.delete_if{|key| %w(action controller locale).include?(key)}
-			%>
-			<li class="en"><%= link_to_unless_current t(:english), locale: :en, params: p %></li>
-			<li class="zh-CN"><%= link_to_unless_current t(:chinese), locale: "zh-CN", params: p %></li>
-		</ul>
-	</div>
-</div>

data/app/views/layouts/_header.erb

@@ -1,7 +0,0 @@
-<div id="header">
-	<div class="gutter">
-		<h1><%= link_to t("logo"), root_path %></h1>
-		<p class="slogan"><%= t("slogan") %></p>
-		<%= render "layouts/navigation" %>
-	</div>
-</div>

data/app/views/layouts/_navigation.erb

@@ -1,3 +0,0 @@
-<ul class="navigation">
-  <li><%= link_to_unless_current t("navigation.home"), root_path %></li>
-</ul>

data/app/views/layouts/application.haml

@@ -0,0 +1,34 @@
+!!! 5
+-# paulirish.com/2008/conditional-stylesheets-vs-css-hacks-answer-neither/
+<!--[if IE 8 ]>    <html class="ie8" lang="zh-CN"> <![endif]-->
+<!--[if IE 9 ]>    <html class="ie9" lang="zh-CN"> <![endif]-->
+<!--[if (gt IE 9)|!(IE)]><!--> <html lang="zh-CN"> <!--<![endif]-->
+%head
+  %meta{ :charset => "utf-8" }/
+
+  -# Always force latest IE rendering engine (even in intranet) & Chrome Frame
+  -# Remove this if you use the .htaccess
+  %meta{ "http-equiv" => "X-UA-Compatible", :content => "IE=edge,chrome=1" }/
+
+  %title
+    = content_for(:title)
+  %meta{ :name => "description", :content => "" }/
+  %meta{ :name => "keywords", :content => "" }/
+  %meta{ :name => "viewport", :content => "width=device-width, initial-scale=1.0, maximum-scale=1, user-scalable=no" }/
+  = favicon_link_tag "/favicon.ico"
+  = stylesheet_link_tag "application", media: "all", 'data-turbolinks-track' => true
+  = javascript_include_tag "application", 'data-turbolinks-track' => true
+  = csrf_meta_tags
+
+  %body{class: get_body_class, id: get_body_id}
+    #wrapper{class: "#{get_wrapper_class} container"}
+      = render partial: "layouts/header"
+
+      #body
+        = render partial: "layouts/flash", locals: {flash: flash}
+        = content_for(:content).blank? ? yield : yield(:content)
+
+      %footer#footer
+        = render partial: "layouts/footer"
+    = render "layouts/tracking"
+    = render "layouts/javascript"

data/lib/jap_mag/version.rb

@@ -1,3 +1,3 @@
 module JapMag
-  VERSION = "0.0.4"
-end
+  VERSION = "0.0.5"
+end

data/lib/jap_mag.rb

@@ -3,38 +3,61 @@ module JapMag
   def _ key, options={}
     # for absolute pathes /
     if (key[0] == "/")
-      key = key.gsub("/", "")
-    
-    # for all other cases  
+      key = key.sub("/", "")
+
+    # for all other cases
     else
       key = "#{params[:controller]}.#{params[:action]}.#{key}"
     end
 
     t(key, options)
   end
-  
+
+  #
+  # the args can be one of the following:
+  #
+  # String: "page#index"
+  # Array: %w(page#index page#intro)
+  # multiple arguments: "page#index", "page#intro"
+  #
   def current_controller_action_in?(*args)
     controller = params["controller"]
     action = params["action"]
 
-    args.each do |element|
+    if args.size == 1
+      if args.first.is_a?(Array)
+        arguments = args.first.split(" ").first
+      elsif args.first.is_a?(String)
+        if args.first.split(" ").size > 1
+          arguments = args.first.split(" ")
+        else
+          arguments = args
+        end
+      end
+    else
+      arguments = args
+    end
+
+    #raise arguments.inspect
+
+    arguments.each do |element|
       if element.include?("#")
-        array = element.match(/([a-z\-\_]*)#([a-z\-\_]*)/).to_a
+        array = element.match(/([a-z\-\_\/]*)#([a-z\-\_]*)/).to_a
         c, a = array[1], array[2]
         return true if controller == c && action == a
       else
         return true if controller == element
       end
     end
-  
+
     false
   end
-  
+
   def self.included base
     base.helper_method :_
     base.helper_method :current_controller_action_in?
   end
-  
+
   class Engine < Rails::Engine
   end
 end

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jap_mag
 version: !ruby/object:Gem::Version
-  version: 0.0.4
-  prerelease: 
+  version: 0.0.5
 platform: ruby
 authors:
 - Felix Ding
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-29 00:00:00.000000000 Z
+date: 2015-01-13 00:00:00.000000000 Z
 dependencies: []
 description: JapMag is the design language created by Felix Ding. This gem helps designers
   start a project that follows JapMag.
@@ -27,45 +26,42 @@ files:
 - app/assets/javascripts/jap_mag.js
 - app/assets/javascripts/jap_mag/base.js
 - app/assets/stylesheets/jap_mag.css
-- app/assets/stylesheets/jap_mag/base.scss
+- app/assets/stylesheets/jap_mag/buttons.css
 - app/assets/stylesheets/jap_mag/mixins.scss
-- app/assets/stylesheets/jap_mag/reset.scss
-- app/assets/stylesheets/jap_mag/variables.scss
 - app/assets/stylesheets/jap_mag/widgets.scss
 - app/helpers/jap_mag_widgets_helper.rb
 - app/views/layouts/_flash.erb
 - app/views/layouts/_footer.erb
 - app/views/layouts/_header.erb
+- app/views/layouts/_javascript.html
 - app/views/layouts/_navigation.erb
-- app/views/layouts/_rss.erb
 - app/views/layouts/_tracking.erb
-- app/views/layouts/application.erb
+- app/views/layouts/application.haml
 - config/locales/en.yml
 - jap_mag.gemspec
 - lib/jap_mag.rb
 - lib/jap_mag/version.rb
 homepage: https://github.com/felixding/JapMag
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.1.11
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: jap_mag-
 test_files: []

data/app/assets/stylesheets/jap_mag/base.scss

@@ -1,174 +0,0 @@
-@import 'variables';
-@import "mixins";
-
-body {
-	font: 12px / 130% "Lucida Grande", Arial, Helvetica, Verdana, sans-serif;
-	color: $color_body;
-}
-
-#wrapper {
-	width: $base_width;
-	padding: 10px;
-	margin: 0 auto;
-}
-
-a {
-	color: $color_blue;
-	text-decoration: none;
-
-	&.dangerous {
-		color: red;
-	}
-	
-	&.edit {
-		color: $color_yellow;
-	}
-	
-	&:hover {
-		color: #fff;
-	  background-color: #000;
-	}
-
-	img {
-		border: none;
-	}	
-}
-
-em {
-	font-style: italic;
-}
-
-.hidden {
-	display: none;
-}
-
-h1, h2, h3, h4 {
-	font-weight: normal;
-	line-height: 1em;
-	margin: 0 0 1em;
-	-webkit-font-smoothing: antialiased;
-}
-
-h1 {
-	margin: 0 0 15px 0;
-	font-size: (40px / 12px) * 100%;
-
-	a {
-		color: black;
-	}
-}
-
-h2 {
-	font-size: 1.6em;
-	line-height: 1.6em;
-}
-
-h3 {
-	font-size: 1.4em;
-	line-height: 1.4em;
-}
-
-p {
-	margin: 0.5em 0;
-}
-
-blockquote {
-	border-left: 2px solid #ccc;
-	margin: 0 0 0 3em;
-	padding: 0 0px 0 1em;
-}
-
-#header {
-	overflow: hidden;
-	padding: 0 0 10px;
-	margin: 0 0 20px;
-	
-	.slogan {
-		font-size: (20px / 12px) * 100%;
-	}
-	
-	.navigation {
-		overflow: hidden;
-		margin: 20px 0 0;
-		
-		&.left {
-			float: left;
-		}
-		
-		li {
-			float: left;
-			margin: 0 10px 0 0;
-			padding: 0 10px 0 0;
-			border-right: 1px solid #ccc;
-			
-			&:last-child {
-				border: none;
-				margin-right: 0;
-				padding-right: 0;
-			}
-			
-			.highlight {
-				color: red;
-				
-				&:hover {
-					color: white;
-				}
-			}
-		}
-	}
-	
-	.admin-navigation {
-		@extend .navigation;
-		margin: 10px 0 0;
-		padding: 10px;
-		background: #eee;
-		float: left;
-		
-		li {
-			border: none;
-		}
-	}
-}
-
-#body {
-	margin: 0;
-	padding: 0;
-	overflow: hidden;
-	
-	.primary {
-		width: (720px / $base_width) * 100%;
-		margin-right: 30px;
-		float: right;
-		overflow: hidden;
-	}
-	
-	.secondary {
-		float: left;
-		width: (150px / $base_width) * 100%;
-		overflow: hidden;
-	}
-}
-
-#footer {
-	margin: 50px 0 10px;
-	color: #666;
-	
-	.languages {
-		overflow: hidden;
-		margin: 5px 0 0;
-		
-		li {
-			float: left;
-			margin: 0 20px 0 0;
-			padding: 0 0 0 20px;
-		}
-
-		.zh-CN {
-			background: url($flag_zh-cn) no-repeat 0 2px;
-		}
-		
-		.en {
-			background: url($flag_en) no-repeat 0 2px;
-		}
-	}
-}