Mercurial > piecrust2

changeset 616:ccd328d0881f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
cm: Merge the 2 foodtruck folders, cleanup.
author Ludovic Chabant <ludovic@chabant.com>
date Thu, 04 Feb 2016 23:22:50 -0800
parents cbb170d9c894
children 6c8f67394d97
files foodtruck/assets/img/foodtruck.png foodtruck/assets/js/foodtruck.js foodtruck/assets/raw/foodtruck.psd foodtruck/assets/sass/foodtruck.scss foodtruck/assets/sass/foodtruck/_base.scss foodtruck/assets/sass/foodtruck/_editing.scss foodtruck/assets/sass/foodtruck/_publog.scss foodtruck/assets/sass/foodtruck/_sidebar.scss foodtruckui/assets/img/foodtruck.png foodtruckui/assets/js/foodtruck.js foodtruckui/assets/raw/foodtruck.psd foodtruckui/assets/sass/foodtruck.scss foodtruckui/assets/sass/foodtruck/_base.scss foodtruckui/assets/sass/foodtruck/_editing.scss foodtruckui/assets/sass/foodtruck/_publog.scss foodtruckui/assets/sass/foodtruck/_sidebar.scss foodtruckui/tests/__init__.py foodtruckui/tests/test_config.py gulpfile.js
diffstat 18 files changed, 315 insertions(+), 336 deletions(-) [+]
line wrap: on
line diff
Binary file foodtruck/assets/img/foodtruck.png has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/foodtruck/assets/js/foodtruck.js	Thu Feb 04 23:22:50 2016 -0800
@@ -0,0 +1,60 @@
+
+$(document).ready(function() {
+    $('.ft-nav-collapsed + ul').hide();
+
+    $('#ft-commit-modal').on('shown.bs.modal', function () {
+        $('#ft-commit-msg').focus();
+    });
+
+    var publogEl = $('#ft-publog');
+    publogEl.mouseenter(function() {
+        publogEl.attr('data-autohide', 'false');
+    });
+    publogEl.on('hide', function() {
+        var containerEl = $('#ft-publog-container', publogEl);
+        containerEl.empty();
+    });
+
+    var closePublogBtn = $('button', publogEl);
+    closePublogBtn.on('click', function() {
+        publogEl.fadeOut(200);
+    });
+});
+
+var onPublishEvent = function(e) {
+
+    var publogEl = $('#ft-publog');
+    var containerEl = $('#ft-publog-container', publogEl);
+
+    var msgEl = $('<div>' + e.data + '</div>');
+    var removeMsgEl = function() {
+        msgEl.remove();
+        if (containerEl.children().length == 0) {
+            // Last message, hide the log window.
+            publogEl.fadeOut(200);
+        }
+    };
+    var timeoutId = window.setTimeout(function() {
+        if (publogEl.attr('data-autohide') == 'true') {
+            msgEl.fadeOut(400, removeMsgEl);
+        }
+    }, 4000);
+
+    if (containerEl.children().length == 0) {
+        // First message, show the log window, reset the mouseover marker.
+        publogEl.attr('data-autohide', 'true');
+        publogEl.fadeIn(200);
+    }
+    containerEl.append(msgEl);
+};
+
+if (!!window.EventSource) {
+    var source = new EventSource('/publish-log');
+    source.onerror = function(e) {
+        console.log("Error with SSE, closing.", e);
+        source.close();
+    };
+    source.addEventListener('message', onPublishEvent);
+}
+
+
Binary file foodtruck/assets/raw/foodtruck.psd has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/foodtruck/assets/sass/foodtruck.scss	Thu Feb 04 23:22:50 2016 -0800
@@ -0,0 +1,44 @@
+
+// Overrides
+$icon-font-path: '../fonts/';
+
+// Core variables and mixins
+@import "bootstrap/variables";
+@import "bootstrap/mixins";
+
+// Reset and dependencies
+@import "bootstrap/normalize";
+@import "bootstrap/print";
+@import "bootstrap/glyphicons";
+
+// Core CSS
+@import "bootstrap/scaffolding";
+@import "bootstrap/type";
+@import "bootstrap/code";
+@import "bootstrap/grid";
+@import "bootstrap/tables";
+@import "bootstrap/forms";
+@import "bootstrap/buttons";
+
+// Components
+@import "bootstrap/alerts";
+@import "bootstrap/button-groups";
+@import "bootstrap/close";
+@import "bootstrap/component-animations";
+@import "bootstrap/dropdowns";
+@import "bootstrap/input-groups";
+@import "bootstrap/modals";
+
+// Utility classes
+@import "bootstrap/utilities";
+@import "bootstrap/responsive-utilities";
+
+// Ionicons
+@import "ionicons";
+
+// Foodtruck
+@import "foodtruck/base";
+@import "foodtruck/sidebar";
+@import "foodtruck/editing";
+@import "foodtruck/publog";
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/foodtruck/assets/sass/foodtruck/_base.scss	Thu Feb 04 23:22:50 2016 -0800
@@ -0,0 +1,47 @@
+
+$ft-color-gray-darkest:  #1A2226;
+$ft-color-gray-darker:   #1E282C;
+$ft-color-gray-dark:     #222D32;
+$ft-color-gray:          #2C3B41;
+$ft-color-gray-light:    #8AA4AF;
+$ft-color-gray-lighter:  #B8C7CE;
+$ft-color-white:         #FFF;
+$ft-color-black:         #000;
+$ft-color-red:           #D33939;
+$ft-color-blue:          #3C8DBC;
+$ft-color-yellow:        #C9C836;
+
+
+header h1, header.title {
+    text-align: center;
+}
+
+footer {
+    text-align: center;
+    font-size: 0.8em;
+    letter-spacing: -0.02em;
+    color: #777;
+    margin: 4em 2em 2em 2em;
+}
+
+h1, h2, h3, h4, h5, h6 {
+    margin-bottom: 1em;
+}
+
+.ft-login {
+    padding: 1em;
+    margin: 2em 0;
+    box-shadow: 0 5px 10px #ddd;
+    border: 1px solid #dcdcdc;
+}
+
+.ft-pagination {
+    text-align: center;
+    color: $ft-color-gray;
+    font-size: 2em;
+    margin: 1em 0;
+}
+.ft-pagination-a {
+    padding: 0 0.2em;
+}
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/foodtruck/assets/sass/foodtruck/_editing.scss	Thu Feb 04 23:22:50 2016 -0800
@@ -0,0 +1,13 @@
+//
+// Page editing
+// --------------------------------------------------
+
+.ft-write-form textarea {
+    @include resizable(vertical);
+
+    outline: none;
+    overflow: auto;
+    font-family: 'Courier', 'Courier New', sans-serif;
+    padding: 1em;
+}
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/foodtruck/assets/sass/foodtruck/_publog.scss	Thu Feb 04 23:22:50 2016 -0800
@@ -0,0 +1,26 @@
+
+#ft-publog {
+    position: fixed;
+    right: 0;
+    bottom: 0;
+    width: 42%;
+    min-width: 20em;
+    margin: 0.5em;
+    color: $ft-color-white;
+    background: $ft-color-blue;
+    border-radius: 0.5em;
+    box-shadow: 0 0 10px darken($ft-color-blue, 50%);
+
+    button {
+        padding: 0.2em 0.4em;
+    }
+}
+
+#ft-publog-container {
+    margin: 1em;
+
+    div {
+        margin: 0.1em;
+    }
+}
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/foodtruck/assets/sass/foodtruck/_sidebar.scss	Thu Feb 04 23:22:50 2016 -0800
@@ -0,0 +1,120 @@
+//
+// Sidebar navigation
+// --------------------------------------------------
+
+$ft-nav-width: 25rem;
+$ft-nav-margin: 2rem;
+
+// Layout
+.ft-nav-container {
+    padding: 2rem;
+    transition: padding-left 0.5s ease;
+}
+.ft-nav-container.ft-nav-enabled {
+    padding-left: $ft-nav-width + $ft-nav-margin;
+}
+
+.ft-nav {
+    z-index: 1000;
+    position: fixed;
+    height: 100%;
+    width: $ft-nav-width;
+    left: -$ft-nav-width;
+    top: 0;
+    bottom: 0;
+    overflow-y: auto;
+    transition: all 0.5s ease;
+}
+.ft-nav.ft-nav-enabled {
+    left: 0;
+}
+
+@media(min-width:768px) {
+    .ft-nav-container {
+        padding-left: $ft-nav-width + $ft-nav-margin;
+    }
+    .ft-nav {
+        left: 0;
+    }
+}
+
+// Style
+.ft-nav {
+    background: $ft-color-gray-darkest;
+    color: #fff;
+
+    span.icon {
+        font-size: 1.5em;
+        margin-right: 0.4em;
+    }
+}
+.ft-nav ul {
+    list-style: none;
+    margin: 0;
+    padding: 0;
+}
+.ft-nav ul li {
+    margin: 0;
+    padding: 0;
+}
+.ft-nav ul li a {
+    border-left: 5px solid transparent;
+    color: $ft-color-gray-light;
+    background: $ft-color-gray-dark;
+    padding: 1rem;
+    display: block;
+    letter-spacing: 0.05em;
+    text-transform: uppercase;
+
+    &:hover {
+        border-left: 5px solid $ft-color-blue;
+        color: $ft-color-white;
+        background: $ft-color-gray-darker;
+        text-decoration: none;
+    }
+}
+.ft-nav li>ul {
+}
+.ft-nav li>ul li a {
+    color: $ft-color-gray-lighter;
+    background: $ft-color-gray;
+    padding-left: 3em;
+    text-transform: none;
+
+    &:hover {
+        color: $ft-color-white;
+        background: $ft-color-gray;
+    }
+}
+.ft-nav ul li a.ft-nav-active {
+    border-left: 5px solid $ft-color-red;
+    color: $ft-color-white;
+    background: $ft-color-gray-darker;
+}
+.ft-nav li>ul li a.ft-nav-active {
+    color: $ft-color-white;
+    background: $ft-color-gray;
+}
+
+// Title/logo
+.ft-nav-title {
+    font-size: 2rem;
+    font-weight: bold;
+    text-align: center;
+    padding: 2rem 0;
+    margin: 0;
+}
+.ft-nav-brand {
+    font-family: 'Lobster', cursive;
+    font-size: 2em;
+    text-shadow: 2px 5px 0 $ft-color-gray;
+}
+
+// Footer
+.ft-nav-auth {
+    color: $ft-color-gray;
+    font-size: 0.8em;
+    text-align: center;
+    margin: 2em 0;
+}
+
Binary file foodtruckui/assets/img/foodtruck.png has changed
--- a/foodtruckui/assets/js/foodtruck.js	Thu Feb 04 21:50:18 2016 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,60 +0,0 @@
-
-$(document).ready(function() {
-    $('.ft-nav-collapsed + ul').hide();
-
-    $('#ft-commit-modal').on('shown.bs.modal', function () {
-        $('#ft-commit-msg').focus();
-    });
-
-    var publogEl = $('#ft-publog');
-    publogEl.mouseenter(function() {
-        publogEl.attr('data-autohide', 'false');
-    });
-    publogEl.on('hide', function() {
-        var containerEl = $('#ft-publog-container', publogEl);
-        containerEl.empty();
-    });
-
-    var closePublogBtn = $('button', publogEl);
-    closePublogBtn.on('click', function() {
-        publogEl.fadeOut(200);
-    });
-});
-
-var onPublishEvent = function(e) {
-
-    var publogEl = $('#ft-publog');
-    var containerEl = $('#ft-publog-container', publogEl);
-
-    var msgEl = $('<div>' + e.data + '</div>');
-    var removeMsgEl = function() {
-        msgEl.remove();
-        if (containerEl.children().length == 0) {
-            // Last message, hide the log window.
-            publogEl.fadeOut(200);
-        }
-    };
-    var timeoutId = window.setTimeout(function() {
-        if (publogEl.attr('data-autohide') == 'true') {
-            msgEl.fadeOut(400, removeMsgEl);
-        }
-    }, 4000);
-
-    if (containerEl.children().length == 0) {
-        // First message, show the log window, reset the mouseover marker.
-        publogEl.attr('data-autohide', 'true');
-        publogEl.fadeIn(200);
-    }
-    containerEl.append(msgEl);
-};
-
-if (!!window.EventSource) {
-    var source = new EventSource('/publish-log');
-    source.onerror = function(e) {
-        console.log("Error with SSE, closing.", e);
-        source.close();
-    };
-    source.addEventListener('message', onPublishEvent);
-}
-
-
Binary file foodtruckui/assets/raw/foodtruck.psd has changed
--- a/foodtruckui/assets/sass/foodtruck.scss	Thu Feb 04 21:50:18 2016 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-
-// Overrides
-$icon-font-path: '../fonts/';
-
-// Core variables and mixins
-@import "bootstrap/variables";
-@import "bootstrap/mixins";
-
-// Reset and dependencies
-@import "bootstrap/normalize";
-@import "bootstrap/print";
-@import "bootstrap/glyphicons";
-
-// Core CSS
-@import "bootstrap/scaffolding";
-@import "bootstrap/type";
-@import "bootstrap/code";
-@import "bootstrap/grid";
-@import "bootstrap/tables";
-@import "bootstrap/forms";
-@import "bootstrap/buttons";
-
-// Components
-@import "bootstrap/alerts";
-@import "bootstrap/button-groups";
-@import "bootstrap/close";
-@import "bootstrap/component-animations";
-@import "bootstrap/dropdowns";
-@import "bootstrap/input-groups";
-@import "bootstrap/modals";
-
-// Utility classes
-@import "bootstrap/utilities";
-@import "bootstrap/responsive-utilities";
-
-// Ionicons
-@import "ionicons";
-
-// Foodtruck
-@import "foodtruck/base";
-@import "foodtruck/sidebar";
-@import "foodtruck/editing";
-@import "foodtruck/publog";
-
--- a/foodtruckui/assets/sass/foodtruck/_base.scss	Thu Feb 04 21:50:18 2016 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
-
-$ft-color-gray-darkest:  #1A2226;
-$ft-color-gray-darker:   #1E282C;
-$ft-color-gray-dark:     #222D32;
-$ft-color-gray:          #2C3B41;
-$ft-color-gray-light:    #8AA4AF;
-$ft-color-gray-lighter:  #B8C7CE;
-$ft-color-white:         #FFF;
-$ft-color-black:         #000;
-$ft-color-red:           #D33939;
-$ft-color-blue:          #3C8DBC;
-$ft-color-yellow:        #C9C836;
-
-
-header h1, header.title {
-    text-align: center;
-}
-
-footer {
-    text-align: center;
-    font-size: 0.8em;
-    letter-spacing: -0.02em;
-    color: #777;
-    margin: 4em 2em 2em 2em;
-}
-
-h1, h2, h3, h4, h5, h6 {
-    margin-bottom: 1em;
-}
-
-.ft-login {
-    padding: 1em;
-    margin: 2em 0;
-    box-shadow: 0 5px 10px #ddd;
-    border: 1px solid #dcdcdc;
-}
-
-.ft-pagination {
-    text-align: center;
-    color: $ft-color-gray;
-    font-size: 2em;
-    margin: 1em 0;
-}
-.ft-pagination-a {
-    padding: 0 0.2em;
-}
-
--- a/foodtruckui/assets/sass/foodtruck/_editing.scss	Thu Feb 04 21:50:18 2016 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-//
-// Page editing
-// --------------------------------------------------
-
-.ft-write-form textarea {
-    @include resizable(vertical);
-
-    outline: none;
-    overflow: auto;
-    font-family: 'Courier', 'Courier New', sans-serif;
-    padding: 1em;
-}
-
--- a/foodtruckui/assets/sass/foodtruck/_publog.scss	Thu Feb 04 21:50:18 2016 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-
-#ft-publog {
-    position: fixed;
-    right: 0;
-    bottom: 0;
-    width: 42%;
-    min-width: 20em;
-    margin: 0.5em;
-    color: $ft-color-white;
-    background: $ft-color-blue;
-    border-radius: 0.5em;
-    box-shadow: 0 0 10px darken($ft-color-blue, 50%);
-
-    button {
-        padding: 0.2em 0.4em;
-    }
-}
-
-#ft-publog-container {
-    margin: 1em;
-
-    div {
-        margin: 0.1em;
-    }
-}
-
--- a/foodtruckui/assets/sass/foodtruck/_sidebar.scss	Thu Feb 04 21:50:18 2016 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,120 +0,0 @@
-//
-// Sidebar navigation
-// --------------------------------------------------
-
-$ft-nav-width: 25rem;
-$ft-nav-margin: 2rem;
-
-// Layout
-.ft-nav-container {
-    padding: 2rem;
-    transition: padding-left 0.5s ease;
-}
-.ft-nav-container.ft-nav-enabled {
-    padding-left: $ft-nav-width + $ft-nav-margin;
-}
-
-.ft-nav {
-    z-index: 1000;
-    position: fixed;
-    height: 100%;
-    width: $ft-nav-width;
-    left: -$ft-nav-width;
-    top: 0;
-    bottom: 0;
-    overflow-y: auto;
-    transition: all 0.5s ease;
-}
-.ft-nav.ft-nav-enabled {
-    left: 0;
-}
-
-@media(min-width:768px) {
-    .ft-nav-container {
-        padding-left: $ft-nav-width + $ft-nav-margin;
-    }
-    .ft-nav {
-        left: 0;
-    }
-}
-
-// Style
-.ft-nav {
-    background: $ft-color-gray-darkest;
-    color: #fff;
-
-    span.icon {
-        font-size: 1.5em;
-        margin-right: 0.4em;
-    }
-}
-.ft-nav ul {
-    list-style: none;
-    margin: 0;
-    padding: 0;
-}
-.ft-nav ul li {
-    margin: 0;
-    padding: 0;
-}
-.ft-nav ul li a {
-    border-left: 5px solid transparent;
-    color: $ft-color-gray-light;
-    background: $ft-color-gray-dark;
-    padding: 1rem;
-    display: block;
-    letter-spacing: 0.05em;
-    text-transform: uppercase;
-
-    &:hover {
-        border-left: 5px solid $ft-color-blue;
-        color: $ft-color-white;
-        background: $ft-color-gray-darker;
-        text-decoration: none;
-    }
-}
-.ft-nav li>ul {
-}
-.ft-nav li>ul li a {
-    color: $ft-color-gray-lighter;
-    background: $ft-color-gray;
-    padding-left: 3em;
-    text-transform: none;
-
-    &:hover {
-        color: $ft-color-white;
-        background: $ft-color-gray;
-    }
-}
-.ft-nav ul li a.ft-nav-active {
-    border-left: 5px solid $ft-color-red;
-    color: $ft-color-white;
-    background: $ft-color-gray-darker;
-}
-.ft-nav li>ul li a.ft-nav-active {
-    color: $ft-color-white;
-    background: $ft-color-gray;
-}
-
-// Title/logo
-.ft-nav-title {
-    font-size: 2rem;
-    font-weight: bold;
-    text-align: center;
-    padding: 2rem 0;
-    margin: 0;
-}
-.ft-nav-brand {
-    font-family: 'Lobster', cursive;
-    font-size: 2em;
-    text-shadow: 2px 5px 0 $ft-color-gray;
-}
-
-// Footer
-.ft-nav-auth {
-    color: $ft-color-gray;
-    font-size: 0.8em;
-    text-align: center;
-    margin: 2em 0;
-}
-
--- a/foodtruckui/tests/test_config.py	Thu Feb 04 21:50:18 2016 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-import os.path
-from foodtruck.config import FoodTruckConfig
-
-
-default_config = os.path.join(
-        os.path.dirname(__file__),
-        '..',
-        'foodtruck',
-        'foodtruck.cfg.defaults')
-
-
-def test_getcomplex_option():
-    cstr = '''[foo]
-    bar.name = My bar
-    bar.path = /path/to/bar
-    '''
-    c = FoodTruckConfig(None, None)
-    c.load_from_string(cstr)
-    expected = {'name': "My bar", 'path': '/path/to/bar'}
-    assert c.getcomplex('foo', 'bar') == expected
-
--- a/gulpfile.js	Thu Feb 04 21:50:18 2016 -0800
+++ b/gulpfile.js	Thu Feb 04 23:22:50 2016 -0800
@@ -11,7 +11,7 @@
 
 // Stylesheets
 gulp.task('sass', function() {
-    return gulp.src('foodtruckui/assets/sass/**/*.scss')
+    return gulp.src('foodtruck/assets/sass/**/*.scss')
         //.pipe(sourcemaps.init())
         .pipe(sass({
             errLogToConsole: true,
@@ -25,7 +25,7 @@
         .pipe(gulp.dest('foodtruck/static/css'));
 });
 gulp.task('sass:watch', function() {
-    return gulp.watch('foodtruckui/assets/sass/**/*.scss', ['sass']);
+    return gulp.watch('foodtruck/assets/sass/**/*.scss', ['sass']);
 });
 
 // Javascript
@@ -39,7 +39,7 @@
             'bower_components/bootstrap-sass/assets/javascripts/bootstrap/modal.js',
             'bower_components/bootstrap-sass/assets/javascripts/bootstrap/tooltip.js',
             'bower_components/bootstrap-sass/assets/javascripts/bootstrap/transition.js',
-            'foodtruckui/assets/js/**/*.js'
+            'foodtruck/assets/js/**/*.js'
             ])
         .pipe(sourcemaps.init())
         .pipe(concat('foodtruck.js'))
@@ -49,7 +49,7 @@
         .pipe(gulp.dest('foodtruck/static/js'));
 });
 gulp.task('js:watch', function() {
-    return gulp.watch('foodtruckui/assets/js/**/*.js', ['js']);
+    return gulp.watch('foodtruck/assets/js/**/*.js', ['js']);
 });
 
 // Fonts/images
@@ -64,7 +64,7 @@
 gulp.task('images', function() {
     return gulp.src([
             'bower_components/bootstrap-sass/assets/images/*',
-            'foodtruckui/assets/img/*'
+            'foodtruck/assets/img/*'
         ])
         .pipe(gulp.dest('foodtruck/static/img'));
 });