concen 0.2.4 → 0.2.5

data/app/assets/stylesheets/concen/compass/utilities/lists/_horizontal-list.scss

@@ -0,0 +1,3 @@
+@warn "This import is deprecated. Use 'compass/typography/lists/horizontal-list' instead.";
+
+@import "../../typography/lists/horizontal-list";

data/app/assets/stylesheets/concen/compass/utilities/lists/_inline-block-list.scss

@@ -0,0 +1,3 @@
+@warn "This import is deprecated. Use 'compass/typography/lists/inline-block-list' instead.";
+
+@import "../../typography/lists/inline-block-link";

data/app/assets/stylesheets/concen/compass/utilities/lists/_inline-list.scss

@@ -0,0 +1,3 @@
+@warn "This import is deprecated. Use 'compass/typography/lists/inline-list' instead.";
+
+@import "../../typography/lists/inline-list";

data/app/assets/stylesheets/concen/compass/utilities/sprites/_base.scss

@@ -0,0 +1,66 @@
+// Determines those states for which you want to enable magic sprite selectors
+$sprite-selectors: hover, target, active !default;
+
+// Set the width and height of an element to the original
+// dimensions of an image before it was included in the sprite.
+@mixin sprite-dimensions($map, $sprite) {
+  height: image-height(sprite-file($map, $sprite));
+  width: image-width(sprite-file($map, $sprite));
+}
+
+// Set the background position of the given sprite `$map` to display the
+// sprite of the given `$sprite` name. You can move the image relative to its
+// natural position by passing `$offset-x` and `$offset-y`.
+@mixin sprite-background-position($map, $sprite, $offset-x: 0, $offset-y: 0) {
+  background-position: sprite-position($map, $sprite, $offset-x, $offset-y);  
+}
+
+
+// Determines if you want to include magic selectors in your sprites
+$disable-magic-sprite-selectors:false !default;
+
+// Include the position and (optionally) dimensions of this `$sprite`
+// in the given sprite `$map`. The sprite url should come from either a base
+// class or you can specify the `sprite-url` explicitly like this:
+//
+//     background: $map no-repeat;
+@mixin sprite($map, $sprite, $dimensions: false, $offset-x: 0, $offset-y: 0) {
+  @include sprite-background-position($map, $sprite, $offset-x, $offset-y);
+  @if $dimensions {
+    @include sprite-dimensions($map, $sprite);
+  }
+  @if not $disable-magic-sprite-selectors {
+    @include sprite-selectors($map, $sprite, $sprite, $offset-x, $offset-y);
+  }
+}
+
+// Include the selectors for the `$sprite` given the `$map` and the 
+// `$full-sprite-name`
+// @private
+@mixin sprite-selectors($map, $sprite-name, $full-sprite-name, $offset-x: 0, $offset-y: 0) {
+  @each $selector in $sprite-selectors {
+    @if sprite_has_selector($map, $sprite-name, $selector) {
+      &:#{$selector}, &.#{$full-sprite-name}_#{$selector}, &.#{$full-sprite-name}-#{$selector} {
+          @include sprite-background-position($map, "#{$sprite-name}_#{$selector}", $offset-x, $offset-y);
+      }
+    }
+  }
+}
+
+// Generates a class for each space separated name in `$sprite-names`.
+// The class will be of the form .<map-name>-<sprite-name>.
+//
+// If a base class is provided, then each class will extend it.
+//
+// If `$dimensions` is `true`, the sprite dimensions will specified.
+@mixin sprites($map, $sprite-names, $base-class: false, $dimensions: false, $prefix: sprite-map-name($map), $offset-x: 0, $offset-y: 0) {
+  @each $sprite-name in $sprite-names {
+    @if sprite_does_not_have_parent($map, $sprite-name) {
+      $full-sprite-name: "#{$prefix}-#{$sprite-name}";
+      .#{$full-sprite-name} {
+        @if $base-class { @extend #{$base-class}; }
+        @include sprite($map, $sprite-name, $dimensions, $offset-x, $offset-y);
+      }
+    }
+  }
+}

data/app/assets/stylesheets/concen/compass/utilities/sprites/_sprite-img.scss

@@ -0,0 +1,56 @@
+// @doc off
+// Example 1:
+//
+//     a.twitter
+//       +sprite-img("icons-32.png", 1)
+//     a.facebook
+//       +sprite-img("icons-32png", 2)
+//
+// Example 2:
+//
+//     a
+//       +sprite-background("icons-32.png")
+//       a.twitter
+//         +sprite-column(1)
+//       a.facebook
+//         +sprite-row(2)
+// @doc on
+
+$sprite-default-size: 32px !default;
+
+$sprite-default-margin: 0px !default;
+
+$sprite-image-default-width: $sprite-default-size !default;
+
+$sprite-image-default-height: $sprite-default-size !default;
+
+// Sets all the rules for a sprite from a given sprite image to show just one of the sprites.
+// To reduce duplication use a sprite-bg mixin for common properties and a sprite-select mixin for positioning.
+@mixin sprite-img($img, $col, $row: 1, $width: $sprite-image-default-width, $height: $sprite-image-default-height, $margin: $sprite-default-margin) {
+  @include sprite-background($img, $width, $height);
+  @include sprite-position($col, $row, $width, $height, $margin); }
+
+// Sets rules common for all sprites, assumes you want a square, but allows a rectangular region.
+@mixin sprite-background($img, $width: $sprite-default-size, $height: $width) {
+  @include sprite-background-rectangle($img, $width, $height); }
+
+// Sets rules common for all sprites, assumes a rectangular region.
+@mixin sprite-background-rectangle($img, $width: $sprite-image-default-width, $height: $sprite-image-default-height) {
+  background: image-url($img) no-repeat;
+  width: $width;
+  height: $height;
+  overflow: hidden; }
+
+// Allows horizontal sprite positioning optimized for a single row of sprites.
+@mixin sprite-column($col, $width: $sprite-image-default-width, $margin: $sprite-default-margin) {
+  @include sprite-position($col, 1, $width, 0px, $margin); }
+
+// Allows vertical sprite positioning optimized for a single column of sprites.
+@mixin sprite-row($row, $height: $sprite-image-default-height, $margin: $sprite-default-margin) {
+  @include sprite-position(1, $row, 0px, $height, $margin); }
+
+// Allows vertical and horizontal sprite positioning from a grid of equal dimensioned sprites.
+@mixin sprite-position($col, $row: 1, $width: $sprite-image-default-width, $height: $sprite-image-default-height, $margin: $sprite-default-margin) {
+  $x: ($col - 1) * -$width - ($col - 1) * $margin;
+  $y: ($row - 1) * -$height - ($row - 1) * $margin;
+  background-position: $x $y; }

data/app/assets/stylesheets/concen/compass/utilities/tables/_alternating-rows-and-columns.scss

@@ -0,0 +1,20 @@
+@mixin alternating-rows-and-columns($even-row-color, $odd-row-color, $dark-intersection, $header-color: white, $footer-color: white) {
+  th {
+    background-color: $header-color;
+    &.even, &:nth-child(2n) {
+      background-color: $header-color - $dark-intersection; } }
+  tr.odd {
+    td {
+      background-color: $odd-row-color;
+      &.even, &:nth-child(2n) {
+        background-color: $odd-row-color - $dark-intersection; } } }
+  tr.even {
+    td {
+      background-color: $even-row-color;
+      &.even, &:nth-child(2n) {
+        background-color: $even-row-color - $dark-intersection; } } }
+  tfoot {
+    th, td {
+      background-color: $footer-color;
+      &.even, &:nth-child(2n) {
+        background-color: $footer-color - $dark-intersection; } } } }

data/app/assets/stylesheets/concen/compass/utilities/tables/_borders.scss

@@ -0,0 +1,33 @@
+@mixin outer-table-borders($width: 2px, $color: black) {
+  border: $width solid $color;
+  thead {
+    th {
+      border-bottom: $width solid $color; } }
+  tfoot {
+    th, td {
+      border-top: $width solid $color; } }
+  th {
+    &:first-child {
+      border-right: $width solid $color; } } }
+
+@mixin inner-table-borders($width: 2px, $color: black) {
+  th, td {
+    border: {
+      right: $width solid $color;
+      bottom: $width solid $color;
+      left-width: 0px;
+      top-width: 0px; };
+    &:last-child,
+    &.last {
+      border-right-width: 0px; } }
+
+// IE8 ignores rules that are included on the same line as :last-child
+// see http://www.richardscarrott.co.uk/posts/view/ie8-last-child-bug for details
+
+  tbody, tfoot {
+    tr:last-child {
+      th, td {
+        border-bottom-width: 0px; } }
+    tr.last {
+      th, td {
+        border-bottom-width: 0px; } } } }

data/app/assets/stylesheets/concen/compass/utilities/tables/_scaffolding.scss

@@ -0,0 +1,9 @@
+@mixin table-scaffolding {
+  th {
+    text-align: center;
+    font-weight: bold; }
+  td,
+  th {
+    padding: 2px;
+    &.numeric {
+      text-align: right; } } }

data/app/assets/stylesheets/concen/compass/utilities/text/_ellipsis.scss

@@ -0,0 +1,3 @@
+@warn "This import is deprecated. Use 'compass/typography/text/ellipsis' instead.";
+
+@import "../../typography/text/ellipsis";

data/app/assets/stylesheets/concen/compass/utilities/text/_nowrap.scss

@@ -0,0 +1,3 @@
+@warn "This import is deprecated. Use 'compass/typography/text/nowrap' instead.";
+
+@import "../../typography/text/nowrap";

data/app/assets/stylesheets/concen/compass/utilities/text/_replacement.scss

@@ -0,0 +1,3 @@
+@warn "This import is deprecated. Use 'compass/typography/text/replacement' instead.";
+
+@import "../../typography/text/replacement";

data/app/assets/stylesheets/concen/partials/_base.sass

@@ -44,17 +44,17 @@ a.link-button
   border: 1px solid $color-2
   padding: 2px 8px
   font-weight: bold
-  color: $color-2
+  color: $color-2 !important
   width: auto
   +border-radius(30px)
   vertical-align: middle
   background: $color-4
-  +background(linear-gradient(white, $color-3))
-  +text-shadow(rgba(white, 1) 0 1px 0)
+  +background-image(linear-gradient(white, $color-3))
+  text-shadow: white 0px 1px 0px
   &:hover
     text-decoration: none
   &:active
-    +background(linear-gradient($color-3, white))
+    +background-image(linear-gradient($color-3, white))
 
 img.visit-recorder
   position: absolute

data/app/assets/stylesheets/concen/partials/_variables.sass

@@ -1,10 +1,10 @@
 // Colors.
 
-$color-1: hsl(220, 100%, 20%) // #002266
-$color-2: hsl(220, 16%, 45%) // #606D85
-$color-3: hsl(220, 16%, 90%) // #E1E4EA
-$color-4: hsl(220, 16%, 95%) // #F0F2F4
-$color-5: hsl(220, 16%, 88%) // #DCDFE5
+$color-1: hsl(215, 100%, 20%) // #002A66
+$color-2: hsl(215, 16%, 45%) // #607085
+$color-3: hsl(215, 16%, 90%) // #E1E5EA
+$color-4: hsl(215, 16%, 95%) // #F0F2F4
+$color-5: hsl(215, 16%, 86%) // #D6DAE1
 $gray-20: hsl(0, 0%, 20%)
 $gray-60: hsl(0, 0%, 60%)
 $gray-80: hsl(0, 0%, 80%)

data/app/helpers/concen/application_helper.rb

@@ -1,10 +1,4 @@
 module Concen
   module ApplicationHelper
-    # Remove all the new lines from the output.
-    # This is very useful when used for inline-block elements, because
-    # white spaces will transform into extra gaps between element.
-    def one_line(&block)
-      (capture_haml(&block).gsub("\n", '')).html_safe
-    end
   end
 end

data/app/models/concen/page.rb

@@ -71,17 +71,26 @@ module Concen
     PROTECTED_FIELDS = [:_id, :parent_id, :level, :created_at, :updated_at, :content, :raw_text, :position, :grid_files, :ancestor_slugs]
 
     def content_in_html(key = "main", data={})
+      html = nil
+
       if content = self.content.try(:[], key)
+        # Parse mustache first.
         content = Mustache.render(content, data)
+
+        # Parse markdown.
         markdown = Redcarpet::Markdown.new(Redcarpet::Render::HTML, Concen.markdown_extensions)
         html = markdown.render content
+
+        # Parse smartypants.
         if Concen.parse_markdown_with_smartypants
+          # Temporary hack to fix smartypants bug in Redcarpet 2.0.0b5.
+          html.gsub!("'", "'")
+
           html = Redcarpet::Render::SmartyPants.render html
         end
-        return html
-      else
-        return nil
       end
+
+      return html
     end
 
     def images(filename=nil)

data/app/views/concen/grid_files/_form.html.erb

@@ -0,0 +1,23 @@
+<%= form_for [@page, @grid_file], :url => concen_page_grid_file_path(@page, @grid_file), :html => {:class => "with-text-editor wide"} do |f| %>
+  <% if @grid_file.errors.any? %>
+    <div id="errorExplanation">
+      <h3><%= "#{pluralize(@page.errors.count, "error")} prohibited this parent from being saved:" %></h3>
+      <ul>
+        <% @page.errors.full_messages.each do |msg| %>
+          <li><%= msg %></li>
+        <% end %>
+      </ul>
+    </div>
+  <% end %>
+  <div class="field text-editor">
+    <div class="border">
+      <div id="text-editor" class="wide"></div>
+    </div>
+  </div>
+  <%= text_area_tag :concen_grid_file_page, @grid_file.read.force_encoding("utf-8"), :class => "text-editor-content hidden" %>
+  <div class="actions flush">
+    <%= f.submit "Save" %>
+    <%= link_to "Delete", concen_page_grid_file_path(@page, @grid_file), :method => :delete %>
+    <%= link_to "Cancel", edit_concen_page_path(@page) %>
+  </div>
+<% end %>

data/app/views/concen/grid_files/edit.html.erb

@@ -0,0 +1,10 @@
+<% content_for :head_javascripts do %>
+  <%= javascript_include_tag "concen/pages" %>
+<% end %>
+
+<div id="content">
+  <h1><%= "Edit #{@grid_file.original_filename}" %></h1>
+  <div class="clearfix">
+    <%= render "form" %>
+  </div>
+</div>

data/app/views/concen/pages/_file_list.erb

@@ -0,0 +1,11 @@
+<ul>
+  <% files.each_with_index do |file, index| %>
+    <li>
+      <%= link_to "#{file.original_filename} (#{number_to_human_size(file.size)})", file.url(root_url), :class => "filename", "data-path" => file.path %>
+      <% if file.text? %>
+        <%= link_to "Edit", edit_concen_page_grid_file_path(file.page, file) %>
+      <% end %>
+      <%= link_to "Delete", concen_page_grid_file_path(file.page, file), :class => "delete" %>
+    </li>
+  <% end %>
+</ul>

data/app/views/concen/pages/_files.erb

@@ -0,0 +1,32 @@
+<div class="files">
+  <div class="stylesheets">
+    <h3>
+      <span>Stylesheets</span>
+      <%= link_to "New", concen_page_grid_files_path(@page, :file_type => "css"), :class => "link-button new-file" %>
+    </h3>
+    <% if @page.stylesheets.any? %>
+      <%= render :partial => "concen/pages/file_list", :locals => {:files => @page.stylesheets} %>
+    <% end %>
+  </div>
+  <div class="javascripts">
+    <h3>
+      <span>JavaScripts</span>
+      <%= link_to "New", concen_page_grid_files_path(@page, :file_type => "js"), :class => "link-button new-file" %>
+    </h3>
+    <% if @page.javascripts.any? %>
+      <%= render :partial => "concen/pages/file_list", :locals => {:files => @page.javascripts} %>
+    <% end %>
+  </div>
+  <% if @page.images.any? %>
+    <div class="images">
+      <h3>Images</h3>
+      <%= render :partial => "concen/pages/file_list", :locals => {:files => @page.images} %>
+    </div>
+  <% end %>
+  <% if @page.others.any? %>
+    <div class="others">
+      <h3>Others</h3>
+      <%= render :partial => "concen/pages/file_list", :locals => {:files => @page.others} %>
+    </div>
+  <% end %>
+</div>

data/app/views/concen/pages/_form.html.erb

@@ -0,0 +1,26 @@
+<%= form_for @page, {:html => {:class => "with-text-editor #{'wide' if !@page.persisted?}"}} do |f| %>
+  <% if @page.errors.any? %>
+    <div id="errorExplanation">
+      <h3><%= "#{pluralize(@page.errors.count, "error")} prohibited this parent from being saved:" %></h3>
+      <ul>
+        <% @page.errors.full_messages.each do |msg| %>
+          <li><%= msg %></li>
+        <% end %>
+      </ul>
+    </div>
+  <% end %>
+  <div class="field text-editor">
+    <div class="border">
+      <div id="text-editor"></div>
+    </div>
+  </div>
+  <%= f.text_area :raw_text, :class => "text-editor-content hidden" %>
+  <%= f.hidden_field :parent_id %>
+  <div class="actions flush">
+    <%= f.submit "Save" %>
+    <% if @page.persisted? %>
+      <%= link_to "Delete", concen_page_path(@page), :method => :delete %>
+    <% end %>
+    <%= link_to "Cancel", concen_pages_path %>
+  </div>
+<% end %>

data/app/views/concen/pages/_nested_list.html.erb

@@ -0,0 +1,22 @@
+<% if root && page.level == 0 %>
+  <% children = [page] %>
+<% else %>
+  <% children = Concen::Page.where(:parent_id => page.id).asc(:position) %>
+<% end %>
+
+<ul class="<%= 'pages' if children.first.level == 0 %>" data-level="<%= children.first.level %>">
+  <% for child in children %>
+    <li data-id="<%= "page-" + child.id.to_s %>">
+      <p class="<%= 'author' if child.authors_as_user.map(&:_id).include? current_concen_user.id %>">
+        <span class="handle"></span>
+        <%= link_to child.title, edit_concen_page_path(child), :class => "title" %>
+        <%= link_to "Add", new_concen_page_path(:parent_id => child.id), :class => "link-button hidden" %>
+        <%= link_to "Edit", edit_concen_page_path(child), :class => "link-button hidden" %>
+        <%= link_to "Delete", concen_page_path(child), :method => :delete, :confirm => "Are you sure?", :class => "link-button hidden" %>
+      </p>
+      <% if Concen::Page.where(:parent_id => child.id).count > 0 %>
+        <%= render :partial => "nested_list", :locals => {:page => child, :root => false} %>
+      <% end %>
+    </li>
+  <% end %>
+</ul>

data/app/views/concen/pages/edit.html.erb

@@ -0,0 +1,19 @@
+<% content_for :head_javascripts do %>
+  <%= javascript_include_tag "concen/pages" %>
+<% end %>
+
+<div id="content">
+  <h1>Edit Page</h1>
+  <%= render "form" %>
+  <div id="file-manager">
+    <div class="border">
+      <div id="file-uploader" data-upload-path="<%= upload_concen_page_grid_files_path(@page) %>">
+        <noscript>
+          <p>Please enable JavaScript to use file uploader.</p>
+        </noscript>
+      </div>
+      <%= render "files" %>
+    </div>
+  </div>
+  <div class="clear"></div>
+</div>