Merge branch 'master' of github.com:ITCase/pyramid_sacrud_pages

Conflicts:
	gulpfile.js
	ps_pages/static/js/__ps_pages.js
	ps_pages/templates/ps_pages/tree.jinja2
	pyramid_sacrud_pages/static/js/__pyramid_sacrud_pages.js.map

Author: uralbash

gulpfile.js

@@ -17,7 +17,7 @@ var browserify = require('browserify'),
 
 gulp.task('browser-sync', function() {
     browserSync({
-        proxy: "127.0.0.1:6543",
+        proxy: "127.0.0.1:8080",
         logLevel: "silent",
     });
 });
@@ -77,11 +77,13 @@ gulp.task('watch', function() {
            './ps_pages/static/css/**/*.css',
            '!./ps_pages/static/css/__ps_pages.css'], { verbose: true }, batch(function () {
         gulp.start('css');
+        cb();
     }));
     watch(['./ps_pages/static/js/*.js',
            './ps_pages/static/js/**/*.js',
-           '!./ps_pages/static/js/__ps_pages.js'], { verbose: true }, batch(function () {
+           '!./ps_pages/static/js/__ps_pages.js'], { verbose: true }, batch(function (cb) {
         gulp.start('browserify');
+        cb();
     }));
 });
 

package.json

@@ -66,6 +66,7 @@
     },
     "jqtree": {
       "depends": "jquery"
-    }
+    },
+    "speakingurl": "speakingurl"
   }
 }

ps_pages/assets.py

@@ -15,4 +15,4 @@ def includeme(config):
     config.include('pyramid_jinja2')
     config.add_jinja2_extension('jinja2.ext.with_')
     config.add_jinja2_search_path("templates")
-    config.add_static_view('/static_sacrud_pages', 'ps_pages:static')
+    config.add_static_view('/ps_pages_static', 'ps_pages:static')

ps_pages/static/css/__ps_pages.css

@@ -95,3 +95,8 @@
 		{
 			color: #fff;
 		}
+.jqtree-toggler
+{
+	margin-left: -0.2em !important;
+	margin-right: 0 !important;
+}