card 1.15.pre → 1.15.pre2

data/mod/03_machines/set/self/style_bootstrap_compatible.rb

@@ -0,0 +1,9 @@
+view :raw do |args|
+  File.read "#{Cardio.gem_root}/mod/03_machines/lib/stylesheets/#{card.codename}.css"
+end
+
+format :html do
+  view :editor do |args|
+    "Content is stored in file and can't be edited."
+  end
+end

data/mod/03_machines/set/self/{style_functional.rb → style_cards.rb}

@@ -1,6 +1,6 @@
 
 view :raw do |args|
-  File.read "#{Cardio.gem_root}/mod/03_machines/lib/stylesheets/functional.scss"
+  File.read "#{Cardio.gem_root}/mod/03_machines/lib/stylesheets/style_cards.scss"
 end
 
 view :editor do |args|

data/mod/03_machines/spec/set/type/scss_spec.rb

@@ -16,7 +16,7 @@ describe Card::Set::Type::Scss do
   }
   let(:compressed_changed_css) {  "a{color:#fedcba}\n" }
   before do
-    @scss_card = Card[:style_functional]
+    @scss_card = Card[:style_cards]
   end
   
   

data/mod/04_settings/set/type/setting.rb

@@ -72,7 +72,7 @@ view :core do |args|
 end
 
 view :rule_help do |args|
-  %{<div class="instruction">#{process_content_object "{{+*right+*help}}"}</div>}
+  %{<div class="alert alert-info">#{process_content_object "{{+*right+*help}}"}</div>}
 end
 
 

data/mod/05_email/set/all/notify.rb

@@ -139,7 +139,7 @@ format do
     if args[:followed_set] && (set_card = Card.fetch(args[:followed_set])) && args[:follow_option] && args[:follower]
      rule_name = set_card.follow_rule_name args[:follower]    
      target_name = "#{args[:follower]}+#{Card[:follow].name}"
-     update_path = page_path target_name, :path_opts=>{:action=>:update}, :card=>{:subcards=>{rule_name=>Card[:never].name}}
+     update_path = page_path target_name, :action=>:update, :card=>{:subcards=>{rule_name=>Card[:never].name}}
      card_url update_path # absolutize path
     end
   end

data/mod/05_email/set/self/follow_defaults.rb

@@ -31,9 +31,9 @@ format :html do
   view :edit, :perms=>:update, :tags=>:unknown_ok do |args|
     frame_and_form :update, args do
       [
-        _optional_render( :content_fieldsets, args ),
+        _optional_render( :content_formgroups, args ),
         _optional_render( :confirm_update_all, args ),
-        _optional_render( :button_fieldset,   args )
+        _optional_render( :button_formgroup,   args )
       ]
     end
   end
@@ -41,7 +41,7 @@ format :html do
   
   view :confirm_update_all do |args|
     wrap args do
-      alert 'info'do
+      alert 'info' do
         %{
           <h1>Are you sure you want to change the default follow rules?</h1>
           <p>You may choose to update all existing users. This may take a while. </p>

data/mod/05_standard/set/all/attach.rb

@@ -96,8 +96,8 @@ def self.included(base)
 
     has_attached_file :attach, :preserve_files=>true,
       :default_url => "missing",
-      :url => ":file_path/:basename-:size:action_id.:extension",
-      :path => ":local/:card_id/:size:action_id.:extension",
+      :url => ":web_dir/:basename-:size:action_id.:extension",
+      :path => ":system_path.:extension",
       :styles => { :icon   => '16x16#', :small  => '75x75',
                  :medium => '200x200>', :large  => '500x500>' }
 
@@ -120,23 +120,21 @@ module Paperclip::Interpolations
   
   extend Card::Format::Location
 
-  def local at, style_name
+  def system_path at, style
+    card = at.instance
     if mod = at.instance.attach_mod
       # generalize this to work with any mod (needs design)
-      "#{Cardio.gem_root}/mod/#{mod}/file"
+      codecard = card.cardname.junction? ? card.left : card
+      "#{ Cardio.gem_root}/mod/#{mod}/file/#{codecard.codename}/#{size at, style}#{card.type_code}"
     else
-      Card.paths['files'].existent.first
+      "#{ Card.paths['files'].existent.first }/#{card.id}/#{size at, style}#{action_id at, style}"
     end
   end
       
-  def file_path at, style_name
+  def web_dir at, style_name
     card_path Card.config.files_web_path
   end
 
-  def card_id at, style_name
-    at.instance.id
-  end
-
   def basename at, style_name
     at.instance.name.to_name.url_key
   end

data/mod/05_standard/set/all/comment.rb

@@ -31,7 +31,7 @@ view( :comment_box, :denial=>:blank, :tags=>:unknown_ok, :perms=>lambda { |r| r.
               %{<label>My Name is:</label> #{ text_field :comment_author }}
             end
           }
-          <input type="submit" value="Comment"/>
+          #{ button_tag 'Comment', :type=>:submit, :disable_with=>"Commenting" }
         </div>
       }
     end}

data/mod/05_standard/set/all/error.rb

@@ -68,7 +68,7 @@ format :html do
                 error_cardname
               end
                  
-    content_tag :span, :class=>'render-error' do
+    content_tag :span, :class=>'render-error alert alert-danger' do
       [
         'error rendering',
         details,

data/mod/05_standard/set/all/rich_html/content.rb

@@ -18,13 +18,24 @@ format :html do
   end
 
   view :content do |args|
-    wrap args.merge(:slot_class=>'card-content') do
+    wrap args.reverse_merge(:slot_class=>'card-content') do
       [
         _optional_render( :menu, args, :hide ),
         _render_core( args )
       ]
     end
   end
+  
+  view :content_panel do |args|
+    wrap args.reverse_merge(:slot_class=>'card-content panel panel-default') do
+      wrap_with :div, :class=>'panel-body' do
+        [
+          _optional_render( :menu, args, :hide ),
+          _render_core( args )
+          ]*"\n"
+      end
+    end
+  end
 
   view :titled, :tags=>:comment do |args|
     wrap args do   
@@ -142,7 +153,8 @@ format :html do
         end
       end
     end
-    %{<div class="instruction">#{raw text}</div>} if text
+    klass = [args[:help_class], 'help-text'].compact*' '
+    %{<div class="#{klass}">#{raw text}</div>} if text
   end
 
   

data/mod/05_standard/set/all/rich_html/editing.rb

@@ -4,10 +4,10 @@ format :html do
   view :new, :perms=>:create, :tags=>:unknown_ok do |args|
     frame_and_form :create, args, 'main-success'=>'REDIRECT' do
       [
-        _optional_render( :name_fieldset,     args ),
-        _optional_render( :type_fieldset,     args ),
-        _optional_render( :content_fieldsets, args ),
-        _optional_render( :button_fieldset,   args )
+        _optional_render( :name_formgroup,     args ),
+        _optional_render( :type_formgroup,     args ),
+        _optional_render( :content_formgroups, args ),
+        _optional_render( :button_formgroup,   args )
       ]
     end  
   end
@@ -30,10 +30,10 @@ format :html do
       unless card.rule_card :autoname
         # prompt for name
         hidden[:name_prompt] = true unless hidden.has_key? :name_prompt
-        args[:optional_name_fieldset] ||= :show
+        args[:optional_name_formgroup] ||= :show
       end
     end
-    args[:optional_name_fieldset] ||= :hide
+    args[:optional_name_formgroup] ||= :hide
 
     
     # type field
@@ -41,10 +41,10 @@ format :html do
         ( main? || card.simple? || card.is_template? ) and
         Card.new( :type_id=>card.type_id ).ok? :create #otherwise current type won't be on menu
       )
-      args[:optional_type_fieldset] = :show
+      args[:optional_type_formgroup] = :show
     else
       hidden[:card][:type_id] ||= card.type_id
-      args[:optional_type_fieldset] = :hide
+      args[:optional_type_formgroup] = :hide
     end
 
 
@@ -65,8 +65,8 @@ format :html do
   view :edit, :perms=>:update, :tags=>:unknown_ok do |args|
     frame_and_form :update, args do
       [
-        _optional_render( :content_fieldsets, args ),
-        _optional_render( :button_fieldset,   args )
+        _optional_render( :content_formgroups, args ),
+        _optional_render( :button_formgroup,   args )
       ]
     end
   end
@@ -83,20 +83,20 @@ format :html do
   view :edit_name, :perms=>:update do |args|
     frame_and_form( { :action=>:update, :id=>card.id }, args, 'main-success'=>'REDIRECT' ) do
       [
-        _render_name_fieldset( args ),
+        _render_name_formgroup( args ),
         _optional_render( :confirm_rename, args ),
-        _optional_render( :button_fieldset, args )
+        _optional_render( :button_formgroup, args )
       ]
     end
   end
-  
+
   view :confirm_rename do |args|
     referers = args[:referers]
     dependents = card.dependents
-    wrap args do
+    alert 'warning' do
       %{
-        <h1>Are you sure you want to rename <em>#{card.name}</em>?</h1>
-        #{ %{ <h2>This change will...</h2> } if referers.any? || dependents.any? }
+        <h5>Are you sure you want to rename <em>#{card.name}</em>?</h5>
+        #{ %{ <h6>This change will...</h6> } if referers.any? || dependents.any? }
         <ul>
           #{ %{<li>automatically alter #{ dependents.size } related name(s). } if dependents.any? }
           #{ %{<li>affect at least #{referers.size} reference(s) to "#{card.name}".} if referers.any? }
@@ -106,6 +106,7 @@ format :html do
     end
   end
 
+
   def default_edit_name_args args
     referers = args[:referers] = card.extended_referencers  
     args[:hidden] ||= {}
@@ -128,8 +129,8 @@ format :html do
     frame_and_form :update, args do
     #'main-success'=>'REDIRECT: _self', # adding this back in would make main cards redirect on cardtype changes
       [
-        _render_type_fieldset( args ),
-        optional_render( :button_fieldset, args )
+        _render_type_formgroup( args ),
+        optional_render( :button_formgroup, args )
       ]
     end
   end

data/mod/05_standard/set/all/rich_html/form.rb

@@ -14,9 +14,9 @@ format :html do
       # single-card edit mode
       field = content_field form, args
     
-      if [ args[:optional_type_fieldset], args[:optional_name_fieldset] ].member? :show
-        # display content field in fieldset for consistency with other fields
-        fieldset '', field, :editor=>:content
+      if [ args[:optional_type_formgroup], args[:optional_name_formgroup] ].member? :show
+        # display content field in formgroup for consistency with other fields
+        formgroup '', field, :editor=>:content
       else
         editor_wrap( :content ) { field }
       end
@@ -70,26 +70,27 @@ format :html do
     content_tag( :div, :class=>"editor#{ " #{type}-editor" if type }" ) { yield }
   end
 
-  def fieldset title, content, opts={}
-    if attribs = opts[:attribs]
-      attrib_string = attribs.keys.map do |key| 
-        %{#{key}="#{attribs[key]}"}
-      end * ' '
-    end
-    help_text = case opts[:help]
-      when String ; _render_help :help_text=> opts[:help]
-      when true   ; _render_help
+  def formgroup title, content, opts={}
+    help_text = 
+      case opts[:help]
+      when String ; _render_help :help_class=>'help-block', :help_text=> opts[:help]
+      when true   ; _render_help :help_class=>'help-block'
       else        ; nil
+      end
+      
+    div_args = { :class=>['form-group', opts[:class]].compact*' ' }
+    div_args[:card_id  ] = card.id     if card.real?
+    div_args[:card_name] = h card.name if card.name.present? 
+      
+    wrap_with :div, div_args do
+      %{
+        <label>#{ title }</label>
+        <div>
+          #{ editor_wrap( opts[:editor] ) { content } }
+          #{ help_text }            
+        </div>
+      }
     end
-    %{
-      <fieldset #{ attrib_string }>
-        <legend>
-          <h2>#{ title }</h2>
-          #{ help_text }
-        </legend>
-        #{ editor_wrap( opts[:editor] ) { content } }
-      </fieldset>
-    }
   end
 
   def hidden_tags hash, base=nil
@@ -110,35 +111,29 @@ format :html do
   
   # FIELDSET VIEWS
 
-  view :name_fieldset do |args|
-    fieldset 'name', raw( name_field form ), :editor=>'name', :help=>args[:help]
+  view :name_formgroup do |args|
+    formgroup 'name', raw( name_field form ), :editor=>'name', :help=>args[:help]
   end
 
-  view :type_fieldset do |args|
+  view :type_formgroup do |args|
     field = if args[:variety] == :edit #FIXME dislike this api -ef
       type_field :class=>'type-field edit-type-field'
     else
       type_field :class=>"type-field live-type-field", :href=>path(:view=>:new), 'data-remote'=>true
     end
-    fieldset 'type', field, :editor => 'type', :attribs => { :class=>'type-fieldset'}
+    formgroup 'type', field, :editor => 'type', :class=>'type-formgroup'
   end
 
 
-  view :button_fieldset do |args|
-    %{
-      <fieldset>
-        <div class="button-area">
-          #{ args[:buttons] }
-        </div>
-      </fieldset>
-    }
+  view :button_formgroup do |args|
+    %{<div class="form-group"><div>#{ args[:buttons] }</div></div>}
   end
 
-  view :content_fieldsets do |args|
+  view :content_formgroups do |args|
     raw %{
-      <div class="card-editor editor">
+      <fieldset class="card-editor editor">
         #{ edit_slot args }
-      </div>
+      </fieldset>
     }
   end
 
@@ -184,23 +179,19 @@ format :html do
 # FIELD VIEWS
 
   view :editor do |args|
-    text_area :content, :rows=>3, :class=>'tinymce-textarea card-content', :id=>unique_id
+    text_area :content, :rows=>3, :class=>'tinymce-textarea card-content', :id=>unique_id, "data-card-type-code"=>card.type_code
   end
 
-
   view :edit_in_form, :perms=>:update, :tags=>:unknown_ok do |args|
     eform = form_for_multi
+    
     content = content_field eform, args.merge( :nested=>true )
-    opts = { :editor=>'content', :help=>true, :attribs =>
-      { :class=> "card-editor RIGHT-#{ card.cardname.tag_name.safe_key }" }
-    }
-    if card.new_card?
-      content += raw( "\n #{ eform.hidden_field :type_id }" )
-    else
-      opts[:attribs].merge! :card_id=>card.id, :card_name=>(h card.name)
-    end
+    opts = { :editor=>'content', :help=>true, :class=>'card-editor' }
+    
+    content      += raw( "\n #{ eform.hidden_field :type_id }" )     if card.new_card?
+    opts[:class] += " RIGHT-#{ card.cardname.tag_name.safe_key }"   if card.cardname.junction?
   
-    fieldset fancy_title( args[:title] ), content, opts
+    formgroup fancy_title( args[:title] ), content, opts
   end
 
   def process_relative_tags args

data/mod/05_standard/set/all/rich_html/header.rb

@@ -1,22 +1,27 @@
 format :html do
-  
-  view :toggle do |args|
-    verb, adjective, direction = ( args[:toggle_mode] == :close ? %w{ open open e } : %w{ close closed s } )
-    
-    view_link '', adjective, :title => "#{verb} #{card.name}",
-      :class => "#{verb}-icon ui-icon ui-icon-circle-triangle-#{direction} toggler slotter nodblclick"
-  end
-    
 
   view :header do |args|
     %{
-      <h1 class="card-header">
-        #{ _optional_render :toggle, args, :hide }
-        #{ _optional_render :title, args }
+      <div class="card-header #{ args[:header_class] }">
+        <div class="card-header-title #{ args[:title_class] }">
+          #{ _optional_render :toggle, args, :hide }
+          #{ _optional_render :title, args }
+        </div>
         #{ _optional_render :menu, args }
-      </h1>
+      </div>
     }
   end
+
+  view :toggle do |args|
+    verb, adjective, direction = ( args[:toggle_mode] == :close ? %w{ open open expand } : %w{ close closed collapse-down } )
+  
+    link_to  glyphicon(direction), #content_tag(:span, '', :class=>"glyphicon glyphicon-#{direction}"),
+             path( :view=>adjective ),
+             :remote => true,
+             :title => "#{verb} #{card.name}",
+             :class => "#{verb}-icon toggler slotter nodblclick"
+  end
+
   
   view :menu, :tags=>:unknown_ok do |args|
     return _render_template_closer if args[:menu_hack] == :template_closer
@@ -54,11 +59,29 @@ format :html do
   end
 
   view :menu_link do |args|
-    '<a class="ui-icon ui-icon-gear"></a>'
+    glyphicon 'cog'
+  end
+
+  view :link_list do |args|
+    content_tag :ul, :class=>args[:class] do
+      item_links(args).map do |al|
+        content_tag :li, raw(al)
+      end.join "\n"
+    end
   end
-    
+  
+  view :navbar_right do |args|
+    render_link_list args.merge(:class=>"nav navbar-nav navbar-right")
+  end
+  
+  view :navbar_left do |args|
+    render_link_list args.merge(:class=>"nav navbar-nav navbar-left")
+  end
+  
   def show_follow?
     Auth.signed_in? && !card.new_card?
   end
+  
+  
 end