card 1.15.pre2 → 1.15.0

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

@@ -1,8 +1,2 @@
-
-view :raw do |args|
-  File.read "#{Cardio.gem_root}/mod/03_machines/lib/javascript/tinymce.js"
-end
-
-view :editor do |args|
-  "Content is stored in file and can't be edited."
-end
+format { include ScriptAce::Format }
+format(:html) { include ScriptAce::HtmlFormat }

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

@@ -2,8 +2,4 @@ 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
+format(:html) { include ScriptAce::HtmlFormat }

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

@@ -3,6 +3,4 @@ view :raw do |args|
   File.read "#{Cardio.gem_root}/mod/03_machines/lib/stylesheets/style_cards.scss"
 end
 
-view :editor do |args|
-  "Content is stored in file and can't be edited."
-end
+format(:html) { include ScriptAce::HtmlFormat }

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

@@ -1,8 +1,3 @@
+format { include StyleBootstrapCompatible::Format }
+format(:html) { include ScriptAce::HtmlFormat }
 
-view :raw do |args|
-  File.read "#{Cardio.gem_root}/mod/03_machines/lib/stylesheets/jquery-ui-smoothness.css"
-end
-
-view :editor do |args|
-  "Content is stored in file and can't be edited."
-end

data/mod/03_machines/set/type/css.rb

@@ -5,7 +5,7 @@ include MachineInput
 
 store_machine_output :filetype => "css"
 
-machine_input do 
+machine_input do
   compress_css format(:format => :css)._render_core
 end
 
@@ -15,28 +15,32 @@ def compress_css input
   rescue => e
     raise Card::Oops, "Stylesheet Error:\n#{ e.message }"
   end
-end 
+end
 
 def clean_html?
   false
 end
 
-format do 
-  def chunk_list  #turn off autodetection of uri's 
+format do
+  def chunk_list  #turn off autodetection of uri's
     :references
   end
 end
 
 
 format :html do
+  def get_inclusion_defaults nested_card
+    { :view => :closed }
+  end
+
   view :editor, :mod=>PlainText::HtmlFormat
-  
+
   view :core do |args|
     # FIXME: scan must happen before process for inclusion interactions to work, but this will likely cause
     # problems with including other css?
     process_content ::CodeRay.scan( _render_raw, :css ).div, :size=>:icon
   end
-  
+
   view :content_changes, :mod=>CoffeeScript::HtmlFormat
 end
 

data/mod/03_machines/set/type/scss.rb

@@ -4,12 +4,11 @@ def diff_args
   {:format=>:text}
 end  
 
-
 format do
   include Css::Format
   
   view :core do |args|
-    process_content compile_scss(_render_raw)
+    compile_scss(process_content _render_raw)
   end
   
   def compile_scss scss, style=:expanded

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

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

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

@@ -57,7 +57,7 @@ format :html do
       :card     => { :update_all_users => false }
     )
     args[:buttons] = %{
-      #{ button_tag 'Submit and update all users', :disable_with=>'Updating', :class=>'follow-updater' }
+      #{ button_tag 'Submit and update all users', :disable_with=>'Updating', :class=>'follow-updater', :situation=>'primary' }
       #{ button_tag 'Submit', :class=>'follow'         }
       #{ button_tag 'Cancel', :class=>'slotter', :type=>'button', :href=>path(:view=>:edit, :id=>card.id)}
     }

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

@@ -1,5 +1,5 @@
 
-require 'RMagick'
+require 'rmagick'
 require 'paperclip'
 
 def attach_array

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

@@ -40,7 +40,7 @@ format :html do
   view :titled, :tags=>:comment do |args|
     wrap args do   
       [
-        _render_header( args.reverse_merge :optional_menu=>:hide ),
+        _render_header( args ),
         wrap_body( :content=>true ) { _render_core args },
         optional_render( :comment_box, args )
       ]

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

@@ -55,7 +55,7 @@ format :html do
     end
     
     args[:buttons] ||= %{
-      #{ button_tag 'Submit', :class=>'create-submit-button', :disable_with=>'Submitting' }
+      #{ button_tag 'Submit', :class=>'create-submit-button', :disable_with=>'Submitting', :situation=>'primary' }
       #{ button_tag 'Cancel', :type=>'button', :class=>"create-cancel-button #{cancel[:class]}", :href=>cancel[:href] }
     }
     
@@ -75,7 +75,7 @@ format :html do
     args[:optional_help] = :show
     
     args[:buttons] = %{
-      #{ button_tag 'Submit', :class=>'submit-button', :disable_with=>'Submitting' }
+      #{ button_tag 'Submit', :class=>'submit-button', :disable_with=>'Submitting', :situation=>'primary' }
       #{ button_tag 'Cancel', :class=>'cancel-button slotter', :href=>path, :type=>'button' }
     }
   end
@@ -117,7 +117,7 @@ format :html do
       :card     => { :update_referencers => false }
     )
     args[:buttons] = %{
-      #{ button_tag 'Rename and Update', :disable_with=>'Renaming', :class=>'renamer-updater' }
+      #{ button_tag 'Rename and Update', :disable_with=>'Renaming', :class=>'renamer-updater', :situation=>'primary' }
       #{ button_tag 'Rename',            :disable_with=>'Renaming', :class=>'renamer'         }
       #{ button_tag 'Cancel', :class=>'slotter', :type=>'button', :href=>path(:view=>:edit, :id=>card.id)}
     }
@@ -139,7 +139,7 @@ format :html do
     args[:variety] = :edit #YUCK!
     args[:hidden] ||= { :view=>:edit }
     args[:buttons] = %{
-      #{ button_tag 'Submit', :disable_with=>'Submitting' }
+      #{ button_tag 'Submit', :disable_with=>'Submitting', :situation=>'primary' }
       #{ button_tag 'Cancel', :href=>path(:view=>:edit), :type=>'button', :class=>'slotter' }      
     }    
   end

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

@@ -65,7 +65,7 @@ format :html do
           </div>
           
           <div class="alert alert-info rule-instruction">
-            #{ process_content "{{#{setting_name}+*right+*help}}" }
+            #{ process_content "{{#{setting_name}+*right+*help|content}}" }
           </div>
           
           <div class="card-body">
@@ -208,7 +208,7 @@ format :html do
     wrap_with( :div, :class=>'button-area' ) do
      [
        delete_button,
-       button_tag( 'Submit', :class=>'rule-submit-button' ),
+       button_tag( 'Submit', :class=>'rule-submit-button', :situation=>'primary' ),
        button_tag( 'Cancel', :class=>'rule-cancel-button slotter', :type=>'button',
                              :href=>cancel_path, :success=>true ) 
      ]

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

@@ -4,10 +4,10 @@ format :html do
     %(
       <meta charset="UTF-8">  
       <meta name="viewport" content="width=device-width, initial-scale=1.0"/>    
-      #{ head_title     }
+      #{ head_title       }
       #{ head_buttons     }
       #{ head_stylesheets }
-      #{ head_javascript }      
+      #{ head_javascript  }
     )
   end
   
@@ -30,7 +30,7 @@ format :html do
     bits = []
     [:favicon, :logo].each do |name|
       if c = Card[name] and c.type_id == ImageID and !c.db_content.blank?
-        bits << %{<link rel="shortcut icon" href="#{ subformat(c)._render_source :size=>:icon }" />}
+        bits << %{<link rel="shortcut icon" href="#{ subformat(c)._render_source :size=>:small }" />}
         break
       end
     end
@@ -55,7 +55,6 @@ format :html do
     manual_style = params[:style]
     style_card   = Card[manual_style] if manual_style
     style_card ||= root.card.rule_card :style
-    
     @css_path = if params[:debug] == 'style'
       page_path( style_card.cardname, :item => :import, :format => :css) 
     elsif style_card

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

@@ -20,7 +20,7 @@ format :html do
   end
   
   def default_core_args args={}
-    args[:buttons] = button_tag 'Sign in'
+    args[:buttons] = button_tag 'Sign in', :situation=>'primary'
     if Card.new(:type_id=>Card::SignupID).ok? :create
       args[:buttons] += link_to( '...or sign up!', card_path("account/signup"))
     end
@@ -53,7 +53,7 @@ format :html do
     args.merge!( {
       :title=>'Forgot Password',
       :optional_help=>:hide,
-      :buttons => button_tag( 'Reset my password' ),
+      :buttons => button_tag( 'Reset my password', :situation=>'primary' ),
       :structure => true,      
       :hidden => { 
         :reset_password => true,

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

@@ -5,7 +5,7 @@ format :html do
     super args
     args.merge!(
       :optional_help => :show, #, :optional_menu=>:never
-      :buttons => button_tag( 'Submit', :disable_with=>'Submitting' ),
+      :buttons => button_tag( 'Submit', :disable_with=>'Submitting', :situation=>'primary' ),
       :account => card.fetch( :trait=>:account, :new=>{} ),
       :title   => 'Sign up',
       :hidden  => {
@@ -16,7 +16,7 @@ format :html do
     
     if Auth.signed_in? and args[:account].confirm_ok?
       args[:title] = 'Invite'
-      args[:buttons] = button_tag 'Send Invitation'
+      args[:buttons] = button_tag 'Send Invitation', :situation=>'primary'
       args[:hidden][:success] = '_self'
     end
   end

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

@@ -15,7 +15,7 @@ format :html do
       :optional_help=>:show,
       :optional_menu=>:never, 
       :help_text=>help_text,
-      :buttons => button_tag( 'Set up', :disable_with=>'Setting up' ),
+      :buttons => button_tag( 'Set up', :disable_with=>'Setting up', :situation=>'primary' ),
       :hidden => { 
         :success => "REDIRECT: #{ Card.path_setting '/' }",
         'card[type_id]' => Card.default_accounted_type_id,

data/mod/06_bootstrap/lib/stylesheets/bootstrap_cards.scss

@@ -80,6 +80,18 @@ body.mceContentBody {
 }
 
 
+/*---------- Card menu ------------*/
+
+.card-slot > .card-header .card-menu-link {
+  display: none;
+}
+.card-slot.closed-view,
+.card-slot:hover {
+  > .card-header .card-menu-link {
+    display: inline-block;
+  }
+}
+
 /*----------- Change View ---------*/
 
 .change-view {
@@ -93,7 +105,10 @@ body.mceContentBody {
   }
 }
 
-
+.titled-view > .card-header {
+  font-size: 1.3em;
+  margin: 3px 0
+}
 
 /*---------- ( Richtext )-------------*/
 

data/mod/06_bootstrap/lib/stylesheets/bootstrap_css.css

@@ -1054,7 +1054,7 @@ th {
   content: "\e259";
 }
 .glyphicon-menu-up:before {
-  content: "\e260";
+  content: "\e260"; 
 }
 * {
   -webkit-box-sizing: border-box;

data/mod/06_bootstrap/lib/stylesheets/bootswatch_mixins.scss

@@ -0,0 +1,282 @@
+// Gradients
+
+
+
+// Horizontal gradient, from left to right
+//
+// Creates two color stops, start and end, by specifying a color and position for each color stop.
+// Color stops are not available in IE9 and below.
+@mixin gradient-horizontal($start-color: #555, $end-color: #333, $start-percent: 0%, $end-percent: 100%) {
+  background-image: -webkit-linear-gradient(left, $start-color $start-percent, $end-color $end-percent); // Safari 5.1-6, Chrome 10+
+  background-image: -o-linear-gradient(left, $start-color $start-percent, $end-color $end-percent); // Opera 12
+  background-image: linear-gradient(to right, $start-color $start-percent, $end-color $end-percent); // Standard, IE10, Firefox 16+, Opera 12.10+, Safari 7+, Chrome 26+
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#{ie-hex-str($start-color)}', endColorstr='#{ie-hex-str($end-color)}', GradientType=1); // IE9 and down
+}
+
+// Vertical gradient, from top to bottom
+//
+// Creates two color stops, start and end, by specifying a color and position for each color stop.
+// Color stops are not available in IE9 and below.
+@mixin gradient-vertical($start-color: #555, $end-color: #333, $start-percent: 0%, $end-percent: 100%) {
+  background-image: -webkit-linear-gradient(top, $start-color $start-percent, $end-color $end-percent);  // Safari 5.1-6, Chrome 10+
+  background-image: -o-linear-gradient(top, $start-color $start-percent, $end-color $end-percent);  // Opera 12
+  background-image: linear-gradient(to bottom, $start-color $start-percent, $end-color $end-percent); // Standard, IE10, Firefox 16+, Opera 12.10+, Safari 7+, Chrome 26+
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#{ie-hex-str($start-color)}', endColorstr='#{ie-hex-str($end-color)}', GradientType=0); // IE9 and down
+}
+
+@mixin gradient-directional($start-color: #555, $end-color: #333, $deg: 45deg) {
+  background-repeat: repeat-x;
+  background-image: -webkit-linear-gradient($deg, $start-color, $end-color); // Safari 5.1-6, Chrome 10+
+  background-image: -o-linear-gradient($deg, $start-color, $end-color); // Opera 12
+  background-image: linear-gradient($deg, $start-color, $end-color); // Standard, IE10, Firefox 16+, Opera 12.10+, Safari 7+, Chrome 26+
+}
+@mixin gradient-horizontal-three-colors($start-color: #00b3ee, $mid-color: #7a43b6, $color-stop: 50%, $end-color: #c3325f) {
+  background-image: -webkit-linear-gradient(left, $start-color, $mid-color $color-stop, $end-color);
+  background-image: -o-linear-gradient(left, $start-color, $mid-color $color-stop, $end-color);
+  background-image: linear-gradient(to right, $start-color, $mid-color $color-stop, $end-color);
+  background-repeat: no-repeat;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#{ie-hex-str($start-color)}', endColorstr='#{ie-hex-str($end-color)}', GradientType=1); // IE9 and down, gets no color-stop at all for proper fallback
+}
+@mixin gradient-vertical-three-colors($start-color: #00b3ee, $mid-color: #7a43b6, $color-stop: 50%, $end-color: #c3325f) {
+  background-image: -webkit-linear-gradient($start-color, $mid-color $color-stop, $end-color);
+  background-image: -o-linear-gradient($start-color, $mid-color $color-stop, $end-color);
+  background-image: linear-gradient($start-color, $mid-color $color-stop, $end-color);
+  background-repeat: no-repeat;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#{ie-hex-str($start-color)}', endColorstr='#{ie-hex-str($end-color)}', GradientType=0); // IE9 and down, gets no color-stop at all for proper fallback
+}
+@mixin gradient-radial($inner-color: #555, $outer-color: #333) {
+  background-image: -webkit-radial-gradient(circle, $inner-color, $outer-color);
+  background-image: radial-gradient(circle, $inner-color, $outer-color);
+  background-repeat: no-repeat;
+}
+@mixin gradient-striped($color: rgba(255,255,255,.15), $angle: 45deg) {
+  background-image: -webkit-linear-gradient($angle, $color 25%, transparent 25%, transparent 50%, $color 50%, $color 75%, transparent 75%, transparent);
+  background-image: -o-linear-gradient($angle, $color 25%, transparent 25%, transparent 50%, $color 50%, $color 75%, transparent 75%, transparent);
+  background-image: linear-gradient($angle, $color 25%, transparent 25%, transparent 50%, $color 50%, $color 75%, transparent 75%, transparent);
+}
+
+
+// Vendor Prefixes
+//
+// All vendor mixins are deprecated as of v3.2.0 due to the introduction of
+// Autoprefixer in our Gruntfile. They will be removed in v4.
+
+// - Animations
+// - Backface visibility
+// - Box shadow
+// - Box sizing
+// - Content columns
+// - Hyphens
+// - Placeholder text
+// - Transformations
+// - Transitions
+// - User Select
+
+
+// Animations
+@mixin animation($animation) {
+  -webkit-animation: $animation;
+       -o-animation: $animation;
+          animation: $animation;
+}
+@mixin animation-name($name) {
+  -webkit-animation-name: $name;
+          animation-name: $name;
+}
+@mixin animation-duration($duration) {
+  -webkit-animation-duration: $duration;
+          animation-duration: $duration;
+}
+@mixin animation-timing-function($timing-function) {
+  -webkit-animation-timing-function: $timing-function;
+          animation-timing-function: $timing-function;
+}
+@mixin animation-delay($delay) {
+  -webkit-animation-delay: $delay;
+          animation-delay: $delay;
+}
+@mixin animation-iteration-count($iteration-count) {
+  -webkit-animation-iteration-count: $iteration-count;
+          animation-iteration-count: $iteration-count;
+}
+@mixin animation-direction($direction) {
+  -webkit-animation-direction: $direction;
+          animation-direction: $direction;
+}
+@mixin animation-fill-mode($fill-mode) {
+  -webkit-animation-fill-mode: $fill-mode;
+          animation-fill-mode: $fill-mode;
+}
+
+// Backface visibility
+// Prevent browsers from flickering when using CSS 3D transforms.
+// Default value is `visible`, but can be changed to `hidden`
+
+@mixin backface-visibility($visibility){
+  -webkit-backface-visibility: $visibility;
+     -moz-backface-visibility: $visibility;
+          backface-visibility: $visibility;
+}
+
+// Drop shadows
+//
+// Note: Deprecated `.box-shadow()` as of v3.1.0 since all of Bootstrap's
+// supported browsers that have box shadow capabilities now support it.
+
+@mixin box-shadow($shadow...) {
+  -webkit-box-shadow: $shadow; // iOS <4.3 & Android <4.1
+          box-shadow: $shadow;
+}
+
+// Box sizing
+@mixin box-sizing($boxmodel) {
+  -webkit-box-sizing: $boxmodel;
+     -moz-box-sizing: $boxmodel;
+          box-sizing: $boxmodel;
+}
+
+// CSS3 Content Columns
+@mixin content-columns($column-count, $column-gap: $grid-gutter-width) {
+  -webkit-column-count: $column-count;
+     -moz-column-count: $column-count;
+          column-count: $column-count;
+  -webkit-column-gap: $column-gap;
+     -moz-column-gap: $column-gap;
+          column-gap: $column-gap;
+}
+
+// Optional hyphenation
+@mixin hyphens($mode: auto) {
+  word-wrap: break-word;
+  -webkit-hyphens: $mode;
+     -moz-hyphens: $mode;
+      -ms-hyphens: $mode; // IE10+
+       -o-hyphens: $mode;
+          hyphens: $mode;
+}
+
+// Placeholder text
+@mixin placeholder($color: $input-color-placeholder) {
+  // Firefox
+  &::-moz-placeholder {
+    color: $color;
+    opacity: 1; // Override Firefox's unusual default opacity; see https://github.com/twbs/bootstrap/pull/11526
+  }
+  &:-ms-input-placeholder { color: $color; } // Internet Explorer 10+
+  &::-webkit-input-placeholder  { color: $color; } // Safari and Chrome
+}
+
+// Transformations
+@mixin scale($ratio...) {
+  -webkit-transform: scale($ratio);
+      -ms-transform: scale($ratio); // IE9 only
+       -o-transform: scale($ratio);
+          transform: scale($ratio);
+}
+
+@mixin scaleX($ratio) {
+  -webkit-transform: scaleX($ratio);
+      -ms-transform: scaleX($ratio); // IE9 only
+       -o-transform: scaleX($ratio);
+          transform: scaleX($ratio);
+}
+@mixin scaleY($ratio) {
+  -webkit-transform: scaleY($ratio);
+      -ms-transform: scaleY($ratio); // IE9 only
+       -o-transform: scaleY($ratio);
+          transform: scaleY($ratio);
+}
+@mixin skew($x, $y) {
+  -webkit-transform: skewX($x) skewY($y);
+      -ms-transform: skewX($x) skewY($y); // See https://github.com/twbs/bootstrap/issues/4885; IE9+
+       -o-transform: skewX($x) skewY($y);
+          transform: skewX($x) skewY($y);
+}
+@mixin translate($x, $y) {
+  -webkit-transform: translate($x, $y);
+      -ms-transform: translate($x, $y); // IE9 only
+       -o-transform: translate($x, $y);
+          transform: translate($x, $y);
+}
+@mixin translate3d($x, $y, $z) {
+  -webkit-transform: translate3d($x, $y, $z);
+          transform: translate3d($x, $y, $z);
+}
+@mixin rotate($degrees) {
+  -webkit-transform: rotate($degrees);
+      -ms-transform: rotate($degrees); // IE9 only
+       -o-transform: rotate($degrees);
+          transform: rotate($degrees);
+}
+@mixin rotateX($degrees) {
+  -webkit-transform: rotateX($degrees);
+      -ms-transform: rotateX($degrees); // IE9 only
+       -o-transform: rotateX($degrees);
+          transform: rotateX($degrees);
+}
+@mixin rotateY($degrees) {
+  -webkit-transform: rotateY($degrees);
+      -ms-transform: rotateY($degrees); // IE9 only
+       -o-transform: rotateY($degrees);
+          transform: rotateY($degrees);
+}
+@mixin perspective($perspective) {
+  -webkit-perspective: $perspective;
+     -moz-perspective: $perspective;
+          perspective: $perspective;
+}
+@mixin perspective-origin($perspective) {
+  -webkit-perspective-origin: $perspective;
+     -moz-perspective-origin: $perspective;
+          perspective-origin: $perspective;
+}
+@mixin transform-origin($origin) {
+  -webkit-transform-origin: $origin;
+     -moz-transform-origin: $origin;
+      -ms-transform-origin: $origin; // IE9 only
+          transform-origin: $origin;
+}
+
+
+// Transitions
+
+@mixin transition($transition...) {
+  -webkit-transition: $transition;
+       -o-transition: $transition;
+          transition: $transition;
+}
+@mixin transition-property($transition-property...) {
+  -webkit-transition-property: $transition-property;
+          transition-property: $transition-property;
+}
+@mixin transition-delay($transition-delay) {
+  -webkit-transition-delay: $transition-delay;
+          transition-delay: $transition-delay;
+}
+@mixin transition-duration($transition-duration...) {
+  -webkit-transition-duration: $transition-duration;
+          transition-duration: $transition-duration;
+}
+@mixin transition-timing-function($timing-function) {
+  -webkit-transition-timing-function: $timing-function;
+          transition-timing-function: $timing-function;
+}
+@mixin transition-transform($transition...) {
+  -webkit-transition: -webkit-transform $transition;
+     -moz-transition: -moz-transform $transition;
+       -o-transition: -o-transform $transition;
+          transition: transform $transition;
+}
+
+
+// User select
+// For selecting text on the page
+
+@mixin user-select($select) {
+  -webkit-user-select: $select;
+     -moz-user-select: $select;
+      -ms-user-select: $select; // IE10+
+          user-select: $select;
+}