card 1.15.pre → 1.15.pre2

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

@@ -25,7 +25,7 @@ format :html do
       card.safe_set_keys
     ].compact
   
-    div = %{<div id="#{card.cardname.url_key}" data-card-id="#{card.id}" data-card-name="#{h card.name}" data-card-type-code="#{card.type_code}" style="#{h args[:style]}" class="#{classes*' '}" } +
+    div = %{<div id="#{card.cardname.url_key}" data-card-id="#{card.id}" data-card-name="#{h card.name}" style="#{h args[:style]}" class="#{classes*' '}" } +
       %{data-slot='#{html_escape_except_quotes slot_options( args )}'>#{ output yield }</div>}
 
     if params[:debug] == 'slot' && !tagged( @current_view, :no_wrap_comments )
@@ -52,7 +52,7 @@ format :html do
       %{
         #{ _render_header args }
         #{ %{ <div class="card-subheader">#{ args[:subheader] }</div> } if args[:subheader] }
-        #{ _optional_render :help, args, :hide }
+        #{ _optional_render :help, args.merge(:help_class=>'alert alert-info'), :hide }
         #{ wrap_body args do output( yield args ) end }
       }
     end
@@ -90,7 +90,7 @@ format :html do
   
   def wrap_with tag, html_args={}
     content_tag( tag, html_args ) do 
-      output( yield )
+      output( yield ).html_safe
     end
   end
   

data/mod/05_standard/set/rstar/rules.rb

@@ -64,7 +64,7 @@ format :html do
             #{ card_link setting_name, :text=>"all #{setting_name} rules", :class=>'setting-link', :target=>'wagn_setting' }
           </div>
           
-          <div class="instruction rule-instruction">
+          <div class="alert alert-info rule-instruction">
             #{ process_content "{{#{setting_name}+*right+*help}}" }
           </div>
           
@@ -110,7 +110,7 @@ format :html do
         {:class=>"card-form card-rule-form slotter" } do |form|
       @form = form
       %{
-        #{ hidden_success_fieldset args[:success]}
+        #{ hidden_success_formgroup args[:success]}
         #{ editor args }
       }
     end
@@ -137,16 +137,16 @@ format :html do
   def editor args      
     wrap_with( :div, :class=>'card-editor' ) do
       [
-        (type_fieldset( args ) if card.right.rule_type_editable),
-        fieldset( 'rule', content_field( form, args.merge(:skip_rev_id=>true) ), :editor=>'content' ),
-        set_fieldset( args )
+        (type_formgroup( args ) if card.right.rule_type_editable),
+        formgroup( 'rule', content_field( form, args.merge(:skip_rev_id=>true) ), :editor=>'content' ),
+        set_formgroup( args )
       ]
     end + edit_buttons( args )
   end
 
 
-  def type_fieldset args
-    fieldset 'type', type_field(
+  def type_formgroup args
+    formgroup 'type', type_field(
       :href         => path(:name=>args[:success][:card].name, :view=>args[:success][:view], :type_reload=>true),
       :class        => 'type-field rule-type-field live-type-field',
       'data-remote' => true
@@ -154,7 +154,7 @@ format :html do
   end
   
   
-  def hidden_success_fieldset args
+  def hidden_success_formgroup args
     %{
       #{ hidden_field_tag 'success[id]', args[:id] || args[:card].name }
       #{ hidden_field_tag 'success[view]', args[:view] }
@@ -162,12 +162,12 @@ format :html do
     }
   end
   
-  def set_fieldset args
+  def set_formgroup args
     current_set_key = card.new_card? ? Card[:all].cardname.key : card.rule_set_key   # (should have a constant for this?)
     tag = args[:rule_context].rule_user_setting_name
     narrower_rules = []
     option_list = 
-      wrap_each_with :li do
+      wrap_each_with :li, :class=>'radio' do
         args[:set_options].map do |set_name, state|
           
           checked    = ( args[:set_selected] == set_name or current_set_key && args[:set_options].length==1 )
@@ -183,16 +183,16 @@ format :html do
           end
           rule_name  = "#{set_name}+#{tag}"
           radio_button( :name, rule_name, :checked=>checked, :warning=>warning ) + %{
-              <span class="set-label" #{'current-set-label' if is_current }>
+              <label class="set-label" #{'current-set-label' if is_current }>
                 #{ card_link set_name, :text=> Card.fetch(set_name).label, :target=>'wagn_set' }
                 #{'<em>(current)</em>' if is_current }
                 #{"<em> #{card_link "#{set_name}+#{card.rule_user_setting_name}", :text=>"(overwritten)"}</em>" if state == :overwritten }
-              </span>
+              </label>
              }.html_safe
          end
 
        end
-    fieldset 'set', "<ul>#{ option_list }</ul>", :editor => 'set'
+    formgroup 'set', "<ul>#{ option_list }</ul>", :editor => 'set'
   end
   
   def edit_buttons  args
@@ -205,7 +205,7 @@ format :html do
                       %{<span class="rule-delete-section">#{ button_tag 'Delete', b_args }</span>}
                     end
     cancel_path = path :view=>( card.new_card? ? :closed_rule : :open_rule )
-    wrap_with( :div, :class=>'edit-button-area' ) do
+    wrap_with( :div, :class=>'button-area' ) do
      [
        delete_button,
        button_tag( 'Submit', :class=>'rule-submit-button' ),
@@ -220,10 +220,10 @@ format :html do
     
     card_form :update do
       [
-        _optional_render( :type_fieldset,    args ),
-        _optional_render( :content_fieldset, args ),
-        _optional_render( :set_fieldset,     args ),
-        _optional_render( :button_fieldset,  args )
+        _optional_render( :type_formgroup,    args ),
+        _optional_render( :content_formgroup, args ),
+        _optional_render( :set_formgroup,     args ),
+        _optional_render( :button_formgroup,  args )
       ]
     end
   end

data/mod/05_standard/set/self/account_links.rb

@@ -1,7 +1,7 @@
 
 format :html do
 
-  def account_links args
+  def item_links args
     [
       optional_render( :my_card, args),
       optional_render( :invite, args),
@@ -38,24 +38,12 @@ format :html do
   end
   
   view :raw do |args|
-    content_tag :span, :id=>'logging' do
-      account_links(args).join ' '
-    end
+    item_links(args).join ' '
   end
-  
-  view :list do |args|
-    content_tag :ul, :class=>args[:class] do
-      account_links(args).map do |al|
-        content_tag :li, al
-      end.join "\n"
+
+  view :core do |args|
+    content_tag :span, :id=>'logging' do
+      render_raw args
     end
   end
-  
-  view :navbar_right do |args|
-    render_list args.merge(:class=>"nav navbar-nav navbar-right")
-  end
-  
-  view :navbar_left do |args|
-    render_list args.merge(:class=>"nav navbar-nav navbar-left")
-  end
 end

data/mod/05_standard/set/self/navbox.rb

@@ -1,20 +1,33 @@
 
 format :html do
-
+  
   view :raw do |args|
-    input_args = { :class=>'navbox' }
+    input_args = { :class=>'navbox form-control' }
     @@placeholder ||= begin
       p = Card["#{Card[:navbox].name}+*placeholder"] and p.raw_content
     end
-    
     input_args[:placeholder] = @@placeholder if @@placeholder
-
-    %{
-      <form action="#{Card.path_setting '/:search'}" method="get" class="navbox-form nodblclick">
-        #{ text_field_tag :_keyword, '', input_args }
-     </form>
-    }
+    
+    content_tag :div, :class=>'form-group' do
+      text_field_tag :_keyword, '', input_args
+    end
   end
+  
+  view :navbar_left do |args|
+    _render_core args.merge(:navbar_class=>'navbar-form navbar-left')
+  end
+  
+  view :navbar_right do |args|
+    _render_core args.merge(:navbar_class=>'navbar-form navbar-right')
+  end
+  
+  view :core do |args|
+    tag_args = { :method=>'get', :role=>'search', :class=>"nodblclick navbox-form #{args[:navbar_class]}"}
+    form_tag Card.path_setting('/:search'), tag_args do
+      _render_raw args
+    end
 
-  view :core, :raw
+  end
+  
 end
+

data/mod/05_standard/set/self/recent.rb

@@ -9,7 +9,7 @@ format :html do
     search_vars[:item] ||= :change
 
     cards_by_day = Hash.new { |h, day| h[day] = [] }
-    search_vars[:results].each do |card|
+    search_results.each do |card|
       begin
         stamp = card.updated_at
         day = Date.new(stamp.year, stamp.month, stamp.day)

data/mod/05_standard/set/self/signin.rb

@@ -40,9 +40,9 @@ format :html do
       card_form :update, form_args do
         [
           Auth.as_bot do
-            subformat(account)._render :content_fieldset, :structure=>true, :items=>{:autocomplete=>'on'}
+            subformat(account)._render :content_formgroup, :structure=>true, :items=>{:autocomplete=>'on'}
           end, 
-          _optional_render( :button_fieldset, args )
+          _optional_render( :button_formgroup, args )
         ].join
       end
     end
@@ -84,7 +84,6 @@ event :signin, :before=>:approve, :on=>:update do
   
   if signin_id = Auth.authenticate( email, pword )
     Auth.signin signin_id
-    abort :success
   else
     accted = Auth[ email.strip.downcase ]
     errors.add :signin, case
@@ -96,6 +95,10 @@ event :signin, :before=>:approve, :on=>:update do
   end  
 end
 
+event :signin_success, :after=>:signin do
+  abort :success
+end
+
 event :send_reset_password_token, :before=>:signin, :on=>:update, :when=>proc{ |c| Env.params[:reset_password] } do
   email = subcards["+#{Card[:email].name}"]
   email &&= email['content']

data/mod/05_standard/set/type/cardtype.rb

@@ -6,7 +6,7 @@ format :html do
     super args
   end
 
-  view :type_fieldset do |args|
+  view :type_formgroup do |args|
     if card.cards_of_type_exist?
       %{<div>Sorry, this card must remain a Cardtype so long as there are <strong>#{ card.name }</strong> cards.</div>}
     else

data/mod/05_standard/set/type/html.rb

@@ -1,6 +1,6 @@
 
 view :editor do |args|
-  text_area :content, :rows=>5, :class=>'card-content'
+  text_area :content, :rows=>5, :class=>'card-content', "data-card-type-code"=>card.type_code
 end
 
 view :closed_content do |args|

data/mod/05_standard/set/type/search_type.rb

@@ -54,7 +54,7 @@ format do
     when e = search_vars[:error]
       %{#{e.class.to_s} :: #{e.message} :: #{card.raw_content}}
     when search_vars[:query][:return] =='count'
-      search_vars[:results].to_s
+      search_results.to_s
     when @mode == :template
       render :raw
     else
@@ -63,25 +63,34 @@ format do
   end
 
   view :card_list do |args|
-    if search_vars[:results].empty?
+    if search_results.empty?
       'no results'
     else
-      search_vars[:results].map do |c|
+      search_results.map do |c|
         nest c
       end.join "\n"
     end
   end
   
   def search_vars args={}
-    @search_vars ||= begin
-      v = {}
-      v[:query] = card.query search_params
-      v[:item] = set_inclusion_opts args.merge( :query_view=>v[:query][:view] )
-      v[:results]  = card.item_cards search_params  # this is really odd.  the search is called from within the vars???
-      v
-    rescue =>e
-      { :error => e }
-    end
+    @search_vars ||=
+      begin
+        v = {}
+        v[:query] = card.query(search_params)
+        v[:item]  = set_inclusion_opts args.merge( :query_view=>v[:query][:view] )
+        v
+      rescue =>e
+        { :error => e }
+      end
+  end
+
+  def search_results
+    @search_results ||=
+      begin
+        card.item_cards search_params
+      rescue => e
+        { :error => e}
+      end
   end
   
   def set_inclusion_opts args
@@ -93,11 +102,34 @@ format do
 
   
 
+  def page_link text, page, current=false, options={}
+    @paging_path_args[:offset] = page * @paging_limit
+    options.merge!(:class=>'card-paging-link slotter', :remote => true)
+    link_to raw(text), path(@paging_path_args), options
+  end
+
+  def page_li text, page, current=false, options={}
+    css_class = if current
+                  'active'
+                elsif !page
+                  'disabled'
+                end
+    page ||= 0
+    content_tag :li, :class=>css_class do
+      page_link text, page, current, options
+    end
+  end
+
+  def previous_page_link page
+    page_li '<span aria-hidden="true">&laquo;</span>', page, false, 'aria-label'=>"Previous"
+  end
 
+  def next_page_link page
+    page_li '<span aria-hidden="true">&raquo;</span>', page, false, 'aria-label'=>"Next"
+  end
 
-  def page_link text, page
-    @paging_path_args[:offset] = page * @paging_limit
-    " #{link_to raw(text), path(@paging_path_args), :class=>'card-paging-link slotter', :remote => true} "
+  def ellipse_page
+    content_tag :li, content_tag(:span, '...')
   end
 
 end
@@ -106,7 +138,7 @@ end
 format :data do
     
   view :card_list do |args|
-    search_vars[:results].map do |c|
+    search_results.map do |c|
       nest c
     end
   end
@@ -134,23 +166,25 @@ format :html do
   view :card_list do |args|
     paging = _optional_render :paging, args
 
-    if search_vars[:results].empty?
+    if search_results.empty?
       render_no_search_results(args) 
     else
+      results =
+        search_results.map do |c|
+          item_view = inclusion_defaults(c)[:view]
+          %{
+            <div class="search-result-item item-#{ item_view }">
+              #{nest(c, :size=>args[:size], :view=>item_view)}
+            </div>
+          }
+        end.join "\n"
+        
       %{
-        #{paging}
+        #{ paging }
         <div class="search-result-list">
-          #{
-            search_vars[:results].map do |c|
-              %{
-                <div class="search-result-item item-#{ inclusion_defaults[:view] }">
-                  #{ nest c, :size=>args[:size] }
-                </div>
-              }
-            end * "\n"
-          }
+          #{ results }
         </div>
-        #{ paging if search_vars[:results].length > 10 }
+        #{ paging if search_results.length > 10 }
       }
     end
   end
@@ -169,7 +203,7 @@ format :html do
   end
 
   view :editor do |args|
-    text_area :content, :rows=>5
+    text_area :content, :rows=>5, "data-card-type-code"=>card.type_code
   end
 
   view :no_search_results do |args|
@@ -180,16 +214,16 @@ format :html do
     s = card.query search_params
     offset, limit = s[:offset].to_i, s[:limit].to_i
     return '' if limit < 1
-    return '' if offset==0 && limit > offset + search_vars[:results].length #avoid query if we know there aren't enough results to warrant paging
+    return '' if offset==0 && limit > offset + search_results.length #avoid query if we know there aren't enough results to warrant paging
     total = card.count search_params
     return '' if limit >= total # should only happen if limit exactly equals the total
 
-    @paging_path_args = { :limit => limit, :item=> inclusion_defaults[:view] }
+    @paging_path_args = { :limit => limit, :item=> inclusion_defaults(card)[:view] }
     @paging_limit = limit
 
     s[:vars].each { |key, value| @paging_path_args["_#{key}"] = value }
 
-    out = ['<span class="paging">' ]
+    out = ['<nav><ul class="pagination paging">' ]
 
     total_pages  = ((total-1) / limit).to_i
     current_page = ( offset   / limit).to_i # should already be integer
@@ -197,33 +231,28 @@ format :html do
     window_min = current_page - window
     window_max = current_page + window
 
-    if current_page > 0
-      out << page_link( '&laquo; prev', current_page - 1 )
-    end
-
-    out << %{<span class="paging-numbers">}
+    previous_page = current_page > 0 ? current_page - 1 : false
+    out << previous_page_link(previous_page)
     if window_min > 0
-      out << page_link( 1, 0 )
-      out << '...' if window_min > 1
+      out << page_li( 1, 0 )
+      out << ellipse_page if window_min > 1
     end
 
     (window_min .. window_max).each do |page|
       next if page < 0 or page > total_pages
       text = page + 1
-      out <<  ( page==current_page ? text : page_link( text, page ) )
+      out << page_li( text, page, page==current_page ) 
     end
 
     if total_pages > window_max
-      out << '...' if total_pages > window_max + 1
-      out << page_link( total_pages + 1, total_pages )
+      out << ellipse_page if total_pages > window_max + 1
+      out << page_li( total_pages + 1, total_pages )
     end
-    out << %{</span>}
 
-    if current_page < total_pages
-      out << page_link( 'next &raquo;', current_page + 1 )
-    end
+    next_page = current_page < total_pages ? current_page + 1 : false
+    out << next_page_link(next_page)
 
-    out << %{<span class="search-count">(#{total})</span></span>}
+    out << %{</ul></nav>}
     out.join
   end
   
@@ -231,13 +260,6 @@ format :html do
     set_default_search_params :default_limit=>20
   end
   
-  
 end
 
 
-
-
-
-
-
-