concen 0.2.4 → 0.2.5

data/Gemfile

@@ -1,12 +1,9 @@
 source "http://rubygems.org"
 
 gem "rails", ">= 3.1.0"
-
-gem "compass", "~> 0.12.alpha"
 gem "sass-rails", "~> 3.1.3"
 
 # gemspec.
-gem "haml", "~> 3.1.0"
 gem "mustache", "~> 0.99.4"
 gem "redcarpet", "2.0.0b5"
 gem "mongoid", "~> 2.2"

data/Gemfile.lock

@@ -46,19 +46,12 @@ GEM
     childprocess (0.1.9)
       ffi (~> 1.0.6)
     chronic (0.6.4)
-    chunky_png (1.2.1)
-    compass (0.12.alpha.0)
-      chunky_png (~> 1.2)
-      fssm (>= 0.2.7)
-      sass (~> 3.1)
     database_cleaner (0.6.0)
     domainatrix (0.0.10)
       addressable
     erubis (2.7.0)
     fabrication (1.1.0)
     ffi (1.0.9)
-    fssm (0.2.7)
-    haml (3.1.2)
     hike (1.2.1)
     i18n (0.6.0)
     json_pure (1.5.2)
@@ -144,11 +137,9 @@ DEPENDENCIES
   bson_ext (~> 1.4.0)
   capybara (>= 0.4.0)
   chronic (~> 0.6.3)
-  compass (~> 0.12.alpha)
   database_cleaner (= 0.6.0)
   domainatrix (~> 0.0.10)
   fabrication (= 1.1.0)
-  haml (~> 3.1.0)
   mime-types (~> 1.16)
   minitest (~> 2.6.1)
   mongo (~> 1.3)

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright 2011 Steve Randy Tantra
+Copyright © 2011 Steve Randy Tantra
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -132,7 +132,14 @@ To access Concen web interface, use "concen" subdomain for example http://concen
 
 If you have used Concen for any of your websites and would like to be listed here. Please send me a message.
 
-## Versions History
+## Versions
+
+- **0.2.5**:
+
+  - Temporary fix for Redcarpet's smartypants extension.
+  - Minor color changes.
+  - Remove Compass dependency.
+  - Remove Haml dependency.
 
 - **0.2.4**:
 
@@ -187,3 +194,18 @@ If you have used Concen for any of your websites and would like to be listed her
 - **0.1.1**: Minor bug fixes.
 
 - **0.1**: Initial release.
+
+## Upcoming Features
+
+- Time range selection in traffic statistics.
+- Time range selection in performance statistics.
+
+## License
+
+Copyright © 2011 Steve Randy Tantra
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/app/assets/stylesheets/concen/application.css.sass

@@ -4,18 +4,16 @@
 //= require concen/jquery.ui.resizable
 @charset "utf-8"
 
-@import "compass"
-@import "compass/reset"
-@import "compass/typography/text/force-wrap"
-@import "blueprint/print"
+@import "concen/compass/utilities"
+@import "concen/compass/typography"
+@import "concen/compass/css3"
+@import "concen/compass/reset"
+
 @import "concen/partials/variables"
 @import "concen/partials/mixins"
 @import "concen/partials/base"
 @import "concen/partials/form"
 
-@media print
-  +blueprint-print
-
 body.concen
   min-width: 960px
   padding: $standard-gap
@@ -54,10 +52,11 @@ header
     right: 0
     top: 0
     ul
-      +horizontal-list(10px)
       font-size: 13px
       overflow: visible
       li
+        float: left
+        margin-left: 20px
         line-height: 25px
         a
           +hover-link
@@ -117,6 +116,7 @@ ul.pages
     width: 12px
     height: 12px
     +inline-block
+    vertical-align: middle
   p, ul p
     margin-bottom: 10px
     vertical-align: middle
@@ -159,10 +159,9 @@ footer
 #file-list
   width: 260px
   float: right
-  // background: lighten(#000, 94%)
   padding: 0 0 0 20px
   margin-bottom: 20px
-  +text-shadow(white, 0px, 1px, 0px)
+  text-shadow: white 0px 1px 0px
   position: relative
   h3
     line-height: 1
@@ -171,7 +170,7 @@ footer
     position: relative
     background: lighten(#000, 92%)
     padding: 6px 10px
-    +text-shadow(white, 0px, 1px, 0px)
+    text-shadow: white 0px 1px 0px
   ul
     list-style-position: inside
     margin-bottom: 20px
@@ -213,7 +212,6 @@ footer
     float: left
     width: 31.25%
     margin-right: 3.125%
-    // margin-bottom: 30px
     font-size: 12px
     .graph
       padding: $standard-gap/2
@@ -222,8 +220,8 @@ footer
       border-bottom: 1px solid $color-2
       padding: $standard-gap/3
       background: $color-4
-      +border-top-radius(4px)
-      +text-shadow(white, 0px, 1px, 0px)
+      +border-radius(4px 4px 0 0)
+      text-shadow: white 0px 1px 0px
     p.big-number
       font-size: 72px
       text-align: center
@@ -300,7 +298,7 @@ footer
 .qtip-tip, .qtip-wrapper
 
 .qtip-wrapper
-  +box-shadow(rgba(0,0,0,0.75), 0, 1px, 3px)
+  +box-shadow(rgba(0,0,0,0.75) 0 1px 3px)
 
 // Ace Text Editor
 
@@ -351,7 +349,7 @@ table
   width: 100%
   th
     background: $color-4
-    +border-top-radius(4px)
+    +border-radius(4px 4px 0 0)
     font-size: 16px
     font-weight: bold
     .wf-active &

data/app/assets/stylesheets/concen/compass/_css3.scss

@@ -0,0 +1,17 @@
+@import "css3/border-radius";
+@import "css3/inline-block";
+@import "css3/opacity";
+@import "css3/box-shadow";
+@import "css3/text-shadow";
+@import "css3/columns";
+@import "css3/box-sizing";
+@import "css3/box";
+@import "css3/gradient";
+@import "css3/images";
+@import "css3/background-clip";
+@import "css3/background-origin";
+@import "css3/background-size";
+@import "css3/font-face";
+@import "css3/transform";
+@import "css3/transition";
+@import "css3/appearance";

data/app/assets/stylesheets/concen/compass/_layout.scss

@@ -0,0 +1,3 @@
+@import "layout/grid-background";
+@import "layout/sticky-footer";
+@import "layout/stretching";

data/app/assets/stylesheets/concen/compass/_reset-legacy.scss

@@ -0,0 +1,3 @@
+@import "reset/utilities-legacy";
+
+@include global-reset;

data/app/assets/stylesheets/concen/compass/_reset.scss

@@ -0,0 +1,3 @@
+@import "reset/utilities";
+
+@include global-reset;

data/app/assets/stylesheets/concen/compass/_support.scss

@@ -0,0 +1,36 @@
+// Usually compass hacks apply to both ie6 & 7 -- set this to false to disable support for both.
+$legacy-support-for-ie: true !default;
+
+// Setting this to false will result in smaller output, but no support for ie6 hacks
+$legacy-support-for-ie6: $legacy-support-for-ie !default;
+
+// Setting this to false will result in smaller output, but no support for ie7 hacks
+$legacy-support-for-ie7: $legacy-support-for-ie !default;
+
+// Setting this to false will result in smaller output, but no support for legacy ie8 hacks
+$legacy-support-for-ie8: $legacy-support-for-ie !default;
+
+// @private
+// The user can simply set $legacy-support-for-ie and 6, 7, and 8 will be set accordingly,
+// But in case the user set each of those explicitly, we need to sync the value of
+// this combined variable.
+$legacy-support-for-ie: $legacy-support-for-ie6 or $legacy-support-for-ie7 or $legacy-support-for-ie8;
+
+// Support for mozilla in experimental css3 properties (-moz).
+$experimental-support-for-mozilla      : true !default;
+// Support for webkit in experimental css3 properties (-webkit).
+$experimental-support-for-webkit       : true !default;
+// Support for webkit's original (non-standard) gradient syntax.
+$support-for-original-webkit-gradients : true !default;
+// Support for opera in experimental css3 properties (-o).
+$experimental-support-for-opera        : true !default;
+// Support for microsoft in experimental css3 properties (-ms).
+$experimental-support-for-microsoft    : true !default;
+// Support for khtml in experimental css3 properties (-khtml).
+$experimental-support-for-khtml        : true !default;
+// Support for svg in experimental css3 properties.
+// Setting this to true might add significant size to your
+// generated stylesheets.
+$experimental-support-for-svg          : false !default;
+// Support for CSS PIE in experimental css3 properties (-pie).
+$experimental-support-for-pie          : false !default;

data/app/assets/stylesheets/concen/compass/_typography.scss

@@ -0,0 +1,4 @@
+@import "typography/links";
+@import "typography/lists";
+@import "typography/text";
+@import "typography/vertical_rhythm";

data/app/assets/stylesheets/concen/compass/_utilities.scss

@@ -0,0 +1,9 @@
+@import "utilities/color";
+@import "utilities/general";
+@import "utilities/sprites";
+@import "utilities/tables";
+
+// deprecated
+@import "typography/links";
+@import "typography/lists";
+@import "typography/text";

data/app/assets/stylesheets/concen/compass/css3/_appearance.scss

@@ -0,0 +1,13 @@
+@import "shared";
+
+// Change the appearance for Mozilla, Webkit and the future
+//
+// @param $ap
+//   [ none | normal | icon | window | button | menu | field ]
+
+@mixin appearance($ap) {
+  $ap: unquote($ap);
+  @include experimental(appearance, $ap,
+    -moz, -webkit, not -o, not -ms, not -khtml, official
+  );
+}

data/app/assets/stylesheets/concen/compass/css3/_background-clip.scss

@@ -0,0 +1,43 @@
+@import "shared";
+
+// The default value is `padding-box` -- the box model used by modern browsers.
+//
+// If you wish to do so, you can override the default constant with `border-box`
+//
+// To override to the default border-box model, use this code:
+//     $default-background-clip: border-box
+
+$default-background-clip: padding-box !default;
+
+// Clip the background (image and color) at the edge of the padding or border.
+//
+// Legal Values:
+//
+//   * padding-box
+//   * border-box
+//   * text
+
+@mixin background-clip($clip: $default-background-clip) {
+  // webkit and mozilla use the deprecated short [border | padding]
+  $clip: unquote($clip);
+  $deprecated: $clip;
+  @if $clip == padding-box { $deprecated: padding; }
+  @if $clip == border-box { $deprecated: border; }
+  // Support for webkit and mozilla's use of the deprecated short form
+  @include experimental(background-clip, $deprecated,
+    -moz,
+    -webkit,
+    not -o,
+    not -ms,
+    not -khtml,
+    not official
+  );
+  @include experimental(background-clip, $clip,
+    not -moz,
+    not -webkit,
+    -o,
+    -ms,
+    -khtml,
+    official
+  );
+}

data/app/assets/stylesheets/concen/compass/css3/_background-origin.scss

@@ -0,0 +1,42 @@
+// Override `$default-background-origin` to change the default.
+
+@import "shared";
+
+$default-background-origin: content-box !default;
+
+// Position the background off the edge of the padding, border or content
+//
+// * Possible values:
+//   * `padding-box`
+//   * `border-box`
+//   * `content-box`
+// * browser defaults to `padding-box`
+// * mixin defaults to `content-box`
+
+
+@mixin background-origin($origin: $default-background-origin) {
+  $origin: unquote($origin);
+  // webkit and mozilla use the deprecated short [border | padding | content]
+  $deprecated: $origin;
+  @if $origin == padding-box { $deprecated: padding; }
+  @if $origin == border-box  { $deprecated: border;  }
+  @if $origin == content-box { $deprecated: content; }
+
+  // Support for webkit and mozilla's use of the deprecated short form
+  @include experimental(background-origin, $deprecated,
+    -moz,
+    -webkit,
+    not -o,
+    not -ms,
+    not -khtml,
+    not official
+  );
+  @include experimental(background-origin, $origin,
+    not -moz,
+    not -webkit,
+    -o,
+    -ms,
+    -khtml,
+    official
+  );
+}

data/app/assets/stylesheets/concen/compass/css3/_background-size.scss

@@ -0,0 +1,26 @@
+@import "shared";
+
+//  override to change the default
+$default-background-size: 100% auto !default;
+
+// Set the size of background images using px, width and height, or percentages.
+// Currently supported in: Opera, Gecko, Webkit.
+//
+// * percentages are relative to the background-origin (default = padding-box)
+// * mixin defaults to: `$default-background-size`
+@mixin background-size(
+  $size-1: $default-background-size,
+  $size-2: false,
+  $size-3: false,
+  $size-4: false,
+  $size-5: false,
+  $size-6: false,
+  $size-7: false,
+  $size-8: false,
+  $size-9: false,
+  $size-10: false
+) {
+  $size-1: if(type-of($size-1) == string, unquote($size-1), $size-1);
+  $sizes: compact($size-1, $size-2, $size-3, $size-4, $size-5, $size-6, $size-7, $size-8, $size-9, $size-10);
+  @include experimental(background-size, $sizes, -moz, -webkit, -o, not -ms, not -khtml);
+}

data/app/assets/stylesheets/concen/compass/css3/_border-radius.scss

@@ -0,0 +1,135 @@
+@import "shared";
+
+$default-border-radius: 5px !default;
+
+// Round all corners by a specific amount, defaults to value of `$default-border-radius`.
+//
+// When two values are passed, the first is the horizontal radius
+// and the second is the vertical radius.
+//
+// Note: webkit does not support shorthand syntax for several corners at once.
+// So in the case where you pass several values only the first will be passed to webkit.
+//
+// Examples:
+//
+//     .simple   { @include border-radius(4px, 4px); }
+//     .compound { @include border-radius(2px 5px, 3px 6px); }
+//     .crazy    { @include border-radius(1px 3px 5px 7px, 2px 4px 6px 8px)}
+//
+// Which generates:
+//    .simple {
+//      -webkit-border-radius: 4px 4px;
+//      -moz-border-radius: 4px / 4px;
+//      -o-border-radius: 4px / 4px;
+//      -ms-border-radius: 4px / 4px;
+//      -khtml-border-radius: 4px / 4px;
+//      border-radius: 4px / 4px; }
+//    
+//    .compound {
+//      -webkit-border-radius: 2px 3px;
+//      -moz-border-radius: 2px 5px / 3px 6px;
+//      -o-border-radius: 2px 5px / 3px 6px;
+//      -ms-border-radius: 2px 5px / 3px 6px;
+//      -khtml-border-radius: 2px 5px / 3px 6px;
+//      border-radius: 2px 5px / 3px 6px; }
+//    
+//    .crazy {
+//      -webkit-border-radius: 1px 2px;
+//      -moz-border-radius: 1px 3px 5px 7px / 2px 4px 6px 8px;
+//      -o-border-radius: 1px 3px 5px 7px / 2px 4px 6px 8px;
+//      -ms-border-radius: 1px 3px 5px 7px / 2px 4px 6px 8px;
+//      -khtml-border-radius: 1px 3px 5px 7px / 2px 4px 6px 8px;
+//      border-radius: 1px 3px 5px 7px / 2px 4px 6px 8px; }
+
+@mixin border-radius($radius: $default-border-radius, $vertical-radius: false) {
+
+  @if $vertical-radius {
+    // Webkit doesn't understand the official shorthand syntax for specifying
+    // a vertical radius unless so in case there's several we only take the first.
+    @include experimental(border-radius, first-value-of($radius) first-value-of($vertical-radius),
+      not -moz,
+      -webkit,
+      not -o,
+      not -ms,
+      not -khtml,
+      not official
+    );
+    @include experimental("border-radius", $radius unquote("/") $vertical-radius,
+      -moz,
+      not -webkit,
+      -o,
+      -ms,
+      -khtml,
+      official
+    );
+  }
+  @else {
+    @include experimental(border-radius, $radius);
+  }
+}
+
+// Round radius at position by amount.
+//
+// * legal values for `$vert`: `top`, `bottom`
+// * legal values for `$horz`: `left`, `right`
+
+@mixin border-corner-radius($vert, $horz, $radius: $default-border-radius) {
+  // Support for mozilla's syntax for specifying a corner
+  @include experimental("border-radius-#{$vert}#{$horz}", $radius,
+    -moz,
+    not -webkit,
+    not -o,
+    not -ms,
+    not -khtml,
+    not official
+  );
+  @include experimental("border-#{$vert}-#{$horz}-radius", $radius,
+    not -moz,
+    -webkit,
+    -o,
+    -ms,
+    -khtml,
+    official
+  );
+  
+}
+
+// Round top-left corner only
+
+@mixin border-top-left-radius($radius: $default-border-radius) {
+  @include border-corner-radius(top, left, $radius); }
+
+// Round top-right corner only
+
+@mixin border-top-right-radius($radius: $default-border-radius) {
+  @include border-corner-radius(top, right, $radius); }
+
+// Round bottom-left corner only
+
+@mixin border-bottom-left-radius($radius: $default-border-radius) {
+  @include border-corner-radius(bottom, left, $radius); }
+
+// Round bottom-right corner only
+
+@mixin border-bottom-right-radius($radius: $default-border-radius) {
+  @include border-corner-radius(bottom, right, $radius); }
+
+// Round both top corners by amount
+@mixin border-top-radius($radius: $default-border-radius) {
+  @include border-top-left-radius($radius);
+  @include border-top-right-radius($radius); }
+
+// Round both right corners by amount
+@mixin border-right-radius($radius: $default-border-radius) {
+  @include border-top-right-radius($radius);
+  @include border-bottom-right-radius($radius); }
+
+// Round both bottom corners by amount
+@mixin border-bottom-radius($radius: $default-border-radius) {
+  @include border-bottom-left-radius($radius);
+  @include border-bottom-right-radius($radius); }
+
+// Round both left corners by amount
+@mixin border-left-radius($radius: $default-border-radius) {
+  @include border-top-left-radius($radius);
+  @include border-bottom-left-radius($radius); }