add logo, add gallery menu style, fotorama images height fix

uralbash · Jun 22, 2015 · 12d39de · 12d39de
2 parents d404928 + 9458e15
commit 12d39de
Show file tree

Hide file tree

Showing 21 changed files with 194 additions and 116 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -21,14 +21,11 @@ notifications:
 python:
   - "3.3"
   - "3.4"
-  - "pypy"
 
 matrix:
   include:
     - python: "2.7"
       env: LINK_CHECK=1
-    - python: "pypy3"
-      env: NO_RSTLINT=1
 
 install:
   - python setup.py develop

diff --git a/example/fixtures/gallery.json b/example/fixtures/gallery.json
@@ -1,39 +1,39 @@
 [
     {
         "description": "Egypt, officially the Arab Republic of Egypt, is a transcontinental country spanning the northeast corner of Africa and southwest corner of Asia, via a land bridge formed by the Sinai Peninsula",
-        "id": 1,
+        "id": 1001,
         "in_menu": 1,
         "name": "Egypt",
         "slug": "egypt",
         "visible": 1,
-        "tree_id": 1
+        "tree_id": 3
     },
     {
         "description": "The Egyptian pyramids are ancient pyramid-shaped masonry structures located in Egypt. As of November 2008, there are sources citing both 118 and 138 as the number of identified Egyptian pyramids. Most were built as tombs for the country's pharaohs and their consorts during the Old and Middle Kingdom periods.",
-        "id": 2,
+        "id": 1002,
         "in_menu": 1,
         "name": "Pyramid",
-        "parent_id": 1,
+        "parent_id": 1001,
         "slug": "pyramid",
         "visible": 1,
-        "tree_id": 1
+        "tree_id": 3
     },
     {
         "description": "Ziggurats were massive structures built in the ancient Mesopotamian valley and western Iranian plateau, having the form of a terraced step pyramid of successively receding stories or levels.",
-        "id": 3,
+        "id": 1003,
         "in_menu": 1,
         "name": "Ziggurats",
-        "parent_id": 2,
+        "parent_id": 1002,
         "slug": "ziggurats",
         "visible": 1,
-        "tree_id": 1
+        "tree_id": 3
     },
     {
-        "id": 4,
+        "id": 1004,
         "in_menu": 1,
         "name": "Unsorted",
         "slug": "unsorted",
         "visible": 1,
-        "tree_id": 2
+        "tree_id": 4
     }
 ]
diff --git a/example/fixtures/news.json b/example/fixtures/news.json
@@ -1,31 +1,27 @@
 [
     {
         "description": "Pyramid - Hacker T-Shirt, designed by artist Felix Laflamme, is now available for online purchase via the Pylons Project Store - Hacker page.",
-        "id": "1",
         "in_menu": 1,
         "name": "Pyramid - Hacker T-Shirt",
         "slug": "pyramid-hacker-t-shirt",
         "visible": 1
     },
     {
         "description": "Pyramid 1.5 was released on April, 8 2014. Read the What's New In Pyramid 1.5 document for an overview of changes. Thanks to everyone who contributed to making this release possible.",
-        "id": "2",
         "in_menu": 1,
         "name": "Pyramid 1.5 released",
         "slug": "pyramid-1-5-released",
         "visible": 1
     },
     {
         "description": "Pyramid - Dashboard T-Shirt, designed by artist Felix Laflamme, is now available for online purchase via the Pylons Project Store - Dashboard page.",
-        "id": "3",
         "in_menu": 1,
         "name": "Pyramid - Dashboard T-Shirt",
         "slug": "pyramid-dashboard-t-shirt",
         "visible": 1
     },
     {
         "description": "The Pylons framework developers have merged efforts with the repoze.bfg framework under the Pylons Project Organization. Read about the Pylons Project and the joint effort, the Pyramid web framework, and notes on the merger.",
-        "id": "4",
         "in_menu": 1,
         "name": "Pylons merges with repoze.bfg",
         "slug": "pylons-merges-with-repoze-bfg",

diff --git a/example/fixtures/pages.json b/example/fixtures/pages.json
@@ -4,14 +4,16 @@
         "in_menu": 1,
         "name": "Default home page",
         "slug": "/",
-        "visible": 1
+        "visible": 1,
+        "tree_id": 1
     },
     {
         "description": "Hello Traversal World! Hello Traversal World! Hello Traversal World!",
         "id": "1",
         "in_menu": 1,
         "name": "Hello Traversal World!",
         "slug": "about-company",
+        "tree_id": 1,
         "visible": 1
     },
     {
@@ -20,6 +22,7 @@
         "name": "We \u2665  gevent",
         "parent_id": "1",
         "slug": "we-love-gevent",
+        "tree_id": 1,
         "visible": 1
     },
     {
@@ -28,103 +31,127 @@
         "name": "And Pyramid",
         "parent_id": "2",
         "slug": "and-pyramid",
+        "tree_id": 1,
         "visible": 1
     },
     {
         "id": "4",
         "in_menu": 1,
+        "name": "And ziggurats",
+        "parent_id": "2",
+        "slug": "and-ziggurats",
+        "tree_id": 1,
+        "visible": 1,
+        "redirect_type": 200,
+        "redirect_page": 1003
+    },
+    {
+        "id": "5",
+        "in_menu": 1,
         "name": "Redirect 301 to we-love-gevent",
         "parent_id": "1",
         "redirect_page": 2,
         "redirect_type": "301",
         "slug": "redirect-301",
+        "tree_id": 1,
         "visible": 1
     },
     {
-        "id": "5",
+        "id": "6",
         "in_menu": 1,
         "name": "Redirect 200 to about-company",
-        "parent_id": "4",
+        "parent_id": "5",
         "redirect_page": 1,
         "redirect_type": "200",
         "slug": "redirect-200",
+        "tree_id": 1,
         "visible": 1
     },
     {
-        "id": "6",
+        "id": "7",
         "in_menu": 1,
         "name": "Компания ITCase",
-        "parent_id": "4",
+        "parent_id": "5",
         "redirect_type": "302",
         "redirect_url": "http://itcase.pro/",
         "slug": "kompania-itcase",
+        "tree_id": 1,
         "visible": 1
     },
     {
-        "id": "7",
+        "id": "8",
         "name": "Our strategy",
         "parent_id": "1",
         "slug": "our-strategy",
+        "tree_id": 1,
         "visible": 1
     },
     {
-        "id": "8",
+        "id": "9",
         "name": "Wordwide",
-        "parent_id": "7",
+        "parent_id": "8",
         "slug": "wordwide",
+        "tree_id": 1,
         "visible": 1
     },
     {
-        "id": "9",
+        "id": "10",
         "name": "Technology",
-        "parent_id": "8",
+        "parent_id": "9",
         "slug": "technology",
+        "tree_id": 1,
         "visible": 0
     },
     {
-        "id": "10",
+        "id": "11",
         "name": "What we do",
-        "parent_id": "7",
+        "parent_id": "8",
         "slug": "what-we-do",
+        "tree_id": 1,
         "visible": 1
     },
     {
-        "id": "11",
+        "id": "12",
         "name": "at a glance",
-        "parent_id": "10",
+        "parent_id": "11",
         "slug": "at-a-glance",
+        "tree_id": 1,
         "visible": 1
     },
     {
-        "id": "12",
+        "id": "13",
         "in_menu": 1,
         "name": "and aiohttp!",
         "parent_id": "3",
         "slug": "and-aiohttp",
+        "tree_id": 1,
         "visible": 1
     },
     {
-        "id": "13",
+        "id": "14",
         "in_menu": 1,
         "name": "and asyncio!",
         "parent_id": "3",
         "slug": "and-asyncio",
+        "tree_id": 1,
         "visible": 1
     },
     {
-        "id": "14",
+        "id": "15",
         "in_menu": 1,
         "name": "and beer!",
-        "parent_id": "12",
+        "parent_id": "13",
         "slug": "and-beer",
+        "tree_id": 1,
         "visible": 1
     },
     {
-        "id": "15",
+        "id": "16",
         "in_menu": 1,
         "name": "and bear to!",
-        "parent_id": "14",
+        "parent_id": "15",
         "slug": "and-bear-to",
+        "tree_id": 1,
         "visible": 1
     }
 ]
diff --git a/example/fixtures/photos.json b/example/fixtures/photos.json
@@ -1,46 +1,46 @@
 [
     {
         "path": "http://i.imgur.com/FmVpuqM.jpg",
-        "gallery_id": 1
+        "gallery_id": 1001
     },
     {
         "path": "http://i.imgur.com/ZM0EjlB.jpg",
-        "gallery_id": 2
+        "gallery_id": 1002
     },
     {
         "path": "http://i.imgur.com/ns2TyAE.jpg",
-        "gallery_id": 2
+        "gallery_id": 1002
     },
     {
         "path": "http://i.imgur.com/GtZq6ps.jpg",
-        "gallery_id": 2
+        "gallery_id": 1002
     },
     {
         "path": "http://i.imgur.com/85U2RS9.jpg",
-        "gallery_id": 2
+        "gallery_id": 1002
     },
     {
         "path": "http://i.imgur.com/ZVTBpjV.jpg",
-        "gallery_id": 3
+        "gallery_id": 1003
     },
     {
         "path": "http://i.imgur.com/1RHsVNy.jpg",
-        "gallery_id": 3
+        "gallery_id": 1003
     },
     {
         "path": "http://i.imgur.com/fmck85z.jpg",
-        "gallery_id": 3
+        "gallery_id": 1003
     },
     {
         "path": "http://i.imgur.com/xNmuUcf.jpg",
-        "gallery_id": 4
+        "gallery_id": 1004
     },
     {
         "path": "http://i.imgur.com/MNUosfw.jpg",
-        "gallery_id": 4
+        "gallery_id": 1004
     },
     {
         "path": "http://i.imgur.com/8EfAn3t.jpg",
-        "gallery_id": 4
+        "gallery_id": 1004
     }
 ]