Merge branch 'master' into docker

Conflicts: gulpfile.js
uaprom-summer-2015 · Aug 19, 2015 · d36147e · d36147e
2 parents af0a591 + d879370
commit d36147e
Show file tree

Hide file tree

Showing 61 changed files with 1,250 additions and 320 deletions.
diff --git a/config.py b/config.py
@@ -14,6 +14,8 @@ class Config:
     CSRF = True
     CSRF_SECRET = 'im!mx2m(69)b^7n3j!yi)k!a7n(^09=^&*+pnan78hl^%_yp4u'
 
+    JSONIFY_PRETTYPRINT_REGULAR = False
+
     UPLOAD_FOLDER = os.path.join(BASEDIR, 'media')
 
     IMG_MIMES = {

diff --git a/fixtures/blockpageassociation.json b/fixtures/blockpageassociation.json
@@ -47,14 +47,6 @@
       "position": 0
     }
   },
-  {
-    "model": "project.models.BlockPageAssociation",
-    "fields": {
-      "page_id": 4,
-      "block_id": 4,
-      "position": 1
-    }
-  },
   {
     "model": "project.models.BlockPageAssociation",
     "fields": {
@@ -71,4 +63,4 @@
       "position": 1
     }
   }
-]
+]
diff --git a/fixtures/pageblock.json b/fixtures/pageblock.json
@@ -55,7 +55,7 @@
       "title": "О Prom.ua",
       "block_type": 0,
       "short_description": "Prom.ua – это всеукраинский торговый центр в интернете – уникальная для Украины торговая площадка с конструктором сайтов.",
-      "text": "Prom.ua – это всеукраинский торговый центр в интернете – уникальная для Украины торговая площадка с конструктором сайтов. Prom.ua позволяет покупателям выбрать из огромного количества предложений, а компаниям разместить информацию о предоставляемых товарах и услугах. Портал начал свою работу в 2008 году, а в 2009 году привлек инвестиции от холдинга Naspers - одной из крупнейших компаний в области электронной коммерции в мире. Сегодня на платформе Prom.ua создали свои сайты более 508 339 компаний, которые разместили 33 511 999 товаров и услуг в каталоге портала. Наша миссия: «Мы помогаем предпринимателям  продавать, а потребителям покупать товары и услуги». Prom.ua для покупателя - это место удобных покупок, где можно комфортно выбрать и купить все необходимое на одном интернет-ресурсе.",
+      "text": "<p>Prom.ua – это всеукраинский торговый центр в интернете – уникальная для Украины торговая площадка с конструктором сайтов. Prom.ua позволяет покупателям выбрать из огромного количества предложений, а компаниям разместить информацию о предоставляемых товарах и услугах.</p><p>Портал начал свою работу в 2008 году, а в 2009 году привлек инвестиции от холдинга Naspers - одной из крупнейших компаний в области электронной коммерции в мире.</p><p>Сегодня на платформе Prom.ua создали свои сайты более 508 339 компаний, которые разместили 33 511 999 товаров и услуг в каталоге портала.</p>",
       "image": "http://i.work.ua/employer_design/7/8/7/40787_page_company_header_2.jpg"
     }
   },

diff --git a/fixtures/pagechunk.json b/fixtures/pagechunk.json
@@ -14,7 +14,7 @@
           "id": 2,
           "name": "social_networks",
           "title": "Социальные сети",
-          "text": "<a href=\"https://vk.com/promua\"><img alt=\"\" src=\"data:image/png;base64,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\" style=\"height:18px; width:18px\" />Vkontakte</a>, <a href=\"https://facebook.com/prom.ua\"><img alt=\"\" src=\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAIAAAD8GO2jAAAA10lEQVRIx2OwDp9LU8QwasHQtsA3bWn/vMPbD1w7ce4eEO07dnPdjkvUscAmYm7XrINPn79++eotGqKOBZMXHcM0mmoWxBSvefHyDQ0tWLnlArKJl6492rjr8orN5yGIChZcvfkEbvqB47dsI+dRORU9f4EIn+7Zh6ifTJHDp336gVELgKhl6v59R2/CEbIFF68+QpbafeQGWpwTZcHcVadwpXo0dOHqQ3J8QLwFm/dcoa0FwCKEHAvqJuwBOg2OkE08deE+slR6zcbRfDBqwagFoxYMQgsAyzTUjcGzuMMAAAAASUVORK5CYII=\" style=\"height:18px; width:18px\" />Facebook</a>,&nbsp;<a href=\"http://google.com/+promua\"><img alt=\"G+\" src=\"https://lh5.googleusercontent.com/-2r7nkB71SpM/AAAAAAAAAAI/AAAAAAAA6ik/0l-6eB2U6nM/photo.jpg?sz=48\" style=\"height:18px; width:18px\" />Google+</a>,&nbsp;<a href=\"https://www.youtube.com/user/prom4ua\"><img alt=\"Youtube\" src=\"data:image/jpeg;base64,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\" style=\"height:18px; width:18px\" />YouTube</a>"      
+          "text": "<a href=\"https://vk.com/promua\"><img alt=\"\" src=\"data:image/png;base64,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\" style=\"height:32px; width:32px\" /></a><a href=\"https://facebook.com/prom.ua\"><img alt=\"\" src=\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAIAAAD8GO2jAAAA10lEQVRIx2OwDp9LU8QwasHQtsA3bWn/vMPbD1w7ce4eEO07dnPdjkvUscAmYm7XrINPn79++eotGqKOBZMXHcM0mmoWxBSvefHyDQ0tWLnlArKJl6492rjr8orN5yGIChZcvfkEbvqB47dsI+dRORU9f4EIn+7Zh6ifTJHDp336gVELgKhl6v59R2/CEbIFF68+QpbafeQGWpwTZcHcVadwpXo0dOHqQ3J8QLwFm/dcoa0FwCKEHAvqJuwBOg2OkE08deE+slR6zcbRfDBqwagFoxYMQgsAyzTUjcGzuMMAAAAASUVORK5CYII=\" style=\"height:32px; width:32px\" /></a><a href=\"http://google.com/+promua\"><img alt=\"G+\" src=\"https://lh5.googleusercontent.com/-2r7nkB71SpM/AAAAAAAAAAI/AAAAAAAA6ik/0l-6eB2U6nM/photo.jpg?sz=48\" style=\"height:32px; width:32px\" /></a><a href=\"https://www.youtube.com/user/prom4ua\"><img alt=\"Youtube\" src=\"data:image/jpeg;base64,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\" style=\"height:32px; width:32px\" /></a>"
      }
   },
   {
@@ -32,7 +32,7 @@
           "id": 4,
           "name": "jumbotron_mainpage",
           "title": "Jumbotron",
-          "text": "<div class=\"jumbotron\"><h1>Prom.ua</h1><p>Because we can</p><p><a role=\"button\" href=\"/about/\" class=\"btn btn-primary btn-lg\">Узнать больше о компании</a></p></div>"
+          "text": "<div class=\"jumbotron\"><h1>Присоединяйся к команде Prom.ua</h1><p>Это начало отличной истории и замечательного настроения</p></div>"
      }
   },
   {

diff --git a/fixtures/vacancy.json b/fixtures/vacancy.json
@@ -9,8 +9,8 @@
       "name_in_url": "junior-python-developer",
       "city_id": 1,
       "salary": "$800",
-      "hide": false,
-      "deleted": false
+      "is_hidden": false,
+      "is_deleted": false
     }
   },
   {
@@ -23,8 +23,8 @@
       "name_in_url": "senior-android-developer",
       "city_id": 2,
       "salary": "$4000",
-      "hide": true,
-      "deleted": false
+      "is_hidden": true,
+      "is_deleted": false
     }
   },
   {
@@ -37,8 +37,8 @@
       "name_in_url": "junior-android-developer",
       "city_id": 2,
       "salary": "$700",
-      "hide": false,
-      "deleted": false
+      "is_hidden": false,
+      "is_deleted": false
     }
   },
   {
@@ -51,8 +51,8 @@
       "name_in_url": "dot-net-developer",
       "city_id": 1,
       "salary": "$1000",
-      "hide": false,
-      "deleted": false
+      "is_hidden": false,
+      "is_deleted": false
     }
   },
   {
@@ -65,8 +65,8 @@
       "name_in_url": "dot-net-idiot",
       "city_id": 1,
       "salary": "$2000",
-      "hide": true,
-      "deleted": false
+      "is_hidden": true,
+      "is_deleted": false
     }
   },
   {
@@ -79,8 +79,8 @@
       "name_in_url": "lorem-ipsum-dolor",
       "city_id": 3,
       "salary": "$2500",
-      "hide": false,
-      "deleted": true
+      "is_hidden": false,
+      "is_deleted": true
     }
   },
   {
@@ -93,8 +93,8 @@
       "name_in_url": "technopegasus",
       "city_id": 3,
       "salary": "$2500",
-      "hide": true,
-      "deleted": false
+      "is_hidden": true,
+      "is_deleted": false
     }
   }
 ]
diff --git a/gulpfile.js b/gulpfile.js
@@ -83,13 +83,17 @@ gulp.task('build:scripts:vendor:ckeditor', function () {
 
 
 gulp.task('build:styles', function () {
-    gulp.src(pkginfo.assets.styles.entries).pipe(stylus({
-        compress: true,
-        'include css': true,
-        include: pkginfo.stylus.includes
-    }))
-        .pipe(rename('bundle.css'))
-        .pipe(gulp.dest(dist_path + pkginfo.dist.styles));
+    pkginfo.assets.styles.entries.map(function (file) {
+        gulp.src(file).pipe(stylus({
+            compress: true,
+            'include css': true,
+            include: pkginfo.stylus.includes
+        }))
+          .pipe(rename({
+              extname: ".bundle.css"
+          }))
+          .pipe(gulp.dest(dist_path + pkginfo.dist.styles));
+    });
 });
 
 

diff --git a/manage.py b/manage.py
@@ -6,7 +6,6 @@
 from commands.dbutils import DBUtils, DBUtilsCommand
 from commands.static import StaticCommand, npm
 
-
 manager = Manager(app)
 
 devutils = DBUtils(app, db)