tabs, imgs, css

app/settings.py

@@ -101,6 +101,7 @@ PIPELINE_JS = {
         'source_filenames': (
             'js/app.js',
             'js/forms.js',
+            'js/tabs.js',
         ),
         'output_filename': 'js/zuykov.js',
     },
@@ -108,7 +109,8 @@ PIPELINE_JS = {
         'source_filenames': (
             'vendor/angular/angular.js',
             'vendor/angular-bootstrap/ui-bootstrap.js',
-            'vendor/angular-bootstrap/ui-bootstrap-tpls.js'
+            'vendor/angular-bootstrap/ui-bootstrap-tpls.js',
+            'vendor/jquery/dist/jquery.min.js',
         ),
         'output_filename': 'js/vendor.js',
     }
@@ -230,6 +232,7 @@ INSTALLED_APPS = (
 
     # 'easy_thumbnails',
     'cmsplugin_filer_image',
+    'cmsplugin_tabs',
     # 'parler',
     'taggit',
     'taggit_autosuggest',

npm-debug.log

@@ -0,0 +1,139 @@
+0 info it worked if it ends with ok
+1 verbose cli [ 'node', '/usr/local/bin/npm', '-g', 'install', 'yuglify' ]
+2 info using npm@1.4.28
+3 info using node@v0.10.33
+4 verbose cache add [ 'yuglify', null ]
+5 verbose cache add name=undefined spec="yuglify" args=["yuglify",null]
+6 verbose parsed url { protocol: null,
+6 verbose parsed url   slashes: null,
+6 verbose parsed url   auth: null,
+6 verbose parsed url   host: null,
+6 verbose parsed url   port: null,
+6 verbose parsed url   hostname: null,
+6 verbose parsed url   hash: null,
+6 verbose parsed url   search: null,
+6 verbose parsed url   query: null,
+6 verbose parsed url   pathname: 'yuglify',
+6 verbose parsed url   path: 'yuglify',
+6 verbose parsed url   href: 'yuglify' }
+7 silly lockFile a15791f5-yuglify yuglify
+8 verbose lock yuglify /Users/fefa4ka/.npm/a15791f5-yuglify.lock
+9 silly lockFile a15791f5-yuglify yuglify
+10 silly lockFile a15791f5-yuglify yuglify
+11 verbose addNamed [ 'yuglify', '' ]
+12 verbose addNamed [ null, '*' ]
+13 silly lockFile e77d10d2-yuglify yuglify@
+14 verbose lock yuglify@ /Users/fefa4ka/.npm/e77d10d2-yuglify.lock
+15 silly addNameRange { name: 'yuglify', range: '*', hasData: false }
+16 verbose request where is /yuglify
+17 verbose request registry https://registry.npmjs.org/
+18 verbose request id b64ae15ba0fed38b
+19 verbose url raw /yuglify
+20 verbose url resolving [ 'https://registry.npmjs.org/', './yuglify' ]
+21 verbose url resolved https://registry.npmjs.org/yuglify
+22 verbose request where is https://registry.npmjs.org/yuglify
+23 info trying registry request attempt 1 at 20:59:19
+24 http GET https://registry.npmjs.org/yuglify
+25 http 200 https://registry.npmjs.org/yuglify
+26 silly registry.get cb [ 200,
+26 silly registry.get   { server: 'CouchDB/1.5.0 (Erlang OTP/R16B03)',
+26 silly registry.get     etag: '"6EX7Y8ZUNLQGJO6A3BVILGV17"',
+26 silly registry.get     'content-type': 'application/json',
+26 silly registry.get     'cache-control': 'max-age=60',
+26 silly registry.get     'content-length': '23910',
+26 silly registry.get     'accept-ranges': 'bytes',
+26 silly registry.get     date: 'Sun, 02 Aug 2015 17:59:19 GMT',
+26 silly registry.get     via: '1.1 varnish',
+26 silly registry.get     age: '0',
+26 silly registry.get     connection: 'keep-alive',
+26 silly registry.get     'x-served-by': 'cache-fra1243-FRA',
+26 silly registry.get     'x-cache': 'HIT',
+26 silly registry.get     'x-cache-hits': '1',
+26 silly registry.get     'x-timer': 'S1438538359.464688,VS0,VE483',
+26 silly registry.get     vary: 'Accept' } ]
+27 silly addNameRange number 2 { name: 'yuglify', range: '*', hasData: true }
+28 silly addNameRange versions [ 'yuglify',
+28 silly addNameRange   [ '0.0.1', '0.1.0', '0.1.1', '0.1.2', '0.1.3', '0.1.4' ] ]
+29 verbose addNamed [ 'yuglify', '0.1.4' ]
+30 verbose addNamed [ '0.1.4', '0.1.4' ]
+31 silly lockFile 2278936e-yuglify-0-1-4 yuglify@0.1.4
+32 verbose lock yuglify@0.1.4 /Users/fefa4ka/.npm/2278936e-yuglify-0-1-4.lock
+33 silly lockFile 677ad253-js-org-yuglify-yuglify-0-1-4-tgz https://registry.npmjs.org/yuglify/-/yuglify-0.1.4.tgz
+34 verbose lock https://registry.npmjs.org/yuglify/-/yuglify-0.1.4.tgz /Users/fefa4ka/.npm/677ad253-js-org-yuglify-yuglify-0-1-4-tgz.lock
+35 verbose addRemoteTarball [ 'https://registry.npmjs.org/yuglify/-/yuglify-0.1.4.tgz',
+35 verbose addRemoteTarball   '726d5e4af810f741ef21865f6f954c4078a3a45f' ]
+36 info retry fetch attempt 1 at 20:59:20
+37 verbose fetch to= /var/folders/cs/sr52sk7s1yd855sf_12mn6dxl770mb/T/npm-72095-pywUKB2P/registry.npmjs.org/yuglify/-/yuglify-0.1.4.tgz
+38 http GET https://registry.npmjs.org/yuglify/-/yuglify-0.1.4.tgz
+39 http 200 https://registry.npmjs.org/yuglify/-/yuglify-0.1.4.tgz
+40 silly lockFile 677ad253-js-org-yuglify-yuglify-0-1-4-tgz https://registry.npmjs.org/yuglify/-/yuglify-0.1.4.tgz
+41 silly lockFile 677ad253-js-org-yuglify-yuglify-0-1-4-tgz https://registry.npmjs.org/yuglify/-/yuglify-0.1.4.tgz
+42 silly lockFile 2278936e-yuglify-0-1-4 yuglify@0.1.4
+43 silly lockFile 2278936e-yuglify-0-1-4 yuglify@0.1.4
+44 silly lockFile e77d10d2-yuglify yuglify@
+45 silly lockFile e77d10d2-yuglify yuglify@
+46 silly resolved [ { name: 'yuglify',
+46 silly resolved     description: 'cli wrapper for uglify and cssmin used by YUI',
+46 silly resolved     version: '0.1.4',
+46 silly resolved     dependencies: { 'uglify-js': '~1.3.4', ycssmin: '~1.0.1', nopt: '~2.1.1' },
+46 silly resolved     devDependencies: { 'yui-lint': '~0.1.1', jshint: '~0.9.0', vows: '*' },
+46 silly resolved     main: './lib/index.js',
+46 silly resolved     bin: { yuglify: './bin/yuglify' },
+46 silly resolved     scripts:
+46 silly resolved      { pretest: 'jshint --config ./node_modules/yui-lint/jshint.json ./lib/*.js ./bin/yuglify',
+46 silly resolved        test: 'vows --spec ./tests/*.js' },
+46 silly resolved     preferGlobal: 'true',
+46 silly resolved     bugs: { url: 'http://github.com/yui/yuglify/issues' },
+46 silly resolved     licenses: [ [Object] ],
+46 silly resolved     repository: { type: 'git', url: 'http://github.com/yui/yuglify.git' },
+46 silly resolved     readme: 'yUglify\n=======\n\n`yuglify` is a wrapper around [UglifyJS](https://github.com/mishoo/UglifyJS) and [cssmin](https://github.com/jbleuzen/node-cssmin)\nwith the default YUI configurations on each of them.\n\n\nBuild Status\n------------\n\n[![Build Status](https://secure.travis-ci.org/yui/yuglify.png?branch=master)](http://travis-ci.org/yui/yuglify)\n\n\nCLI Usage\n----------\n\n    npm -g install yuglify\n\n`yuglify` has a very simple CLI interface to allow you to compress files from the command line.\n\n    yuglify ./lib/*.js #uses shell globbing, won\'t work on Windows\n\nThis will read all passed files and compress them (js or css) and write them back beside the original\nwith the name altered to `-min.js|css`.\n\nRequired\n--------\n\n    npm install yuglify\n\n\n```javascript\n\nvar yuglify = require(\'yuglify\');\n\nyuglify.jsmin(\'<string of source\', function(err, smashed) {\n    fs.writeFile(\'/path/to/file\', smashed, \'utf8\', function() {});\n});\n\nyuglify.cssmin(\'<string of source\', function(err, smashed) {\n    fs.writeFile(\'/path/to/file\', smashed, \'utf8\', function() {});\n});\n\n```\n\nPurpose\n-------\n\nThis module is primarily designed to be used inside [shifter](http://yui.github.com/shifter/).\n\nWhy not use the default Uglify?\n-------------------------------\n\nWe need to support the `/*!` license comment blocks when minifying, so we added\na preprocessor to the code to pull them from the source, then place them back when\nthe minification is complete.\n\nWe also needed to make sure that the file ends in a clean line ending for our\ncombo servers. This way we ensure that other modules don\'t have to end with a\nsemi-colon and the combohandler doesn\'t concat them together in a bad way.\n\nWe\'ve also added support to add a semi-colon if the last character of the\nminified source is either a `)` or a `}`.\n\nThe last thing this module does is provide the default config that we think\nis the most compatible with the way that YUI Compressor used to minify our\nfiles.\n\n```javascript\n{\n    mangle: true,\n    squeeze: true,\n    semicolon: false,\n    lift_vars: false,\n    mangle_toplevel: true,\n    no_mangle_functions: true,\n    max_line_length: 6000\n}\n```\n\nTesting\n-------\n\nCurrently, the tests for this module are just to make sure that they are exported properly.\nShifter\'s test suite validates that these compressors are working as expected. Soon, we\'ll\nmove them over to this repo too.\n',
+46 silly resolved     readmeFilename: 'README.md',
+46 silly resolved     _id: 'yuglify@0.1.4',
+46 silly resolved     dist:
+46 silly resolved      { shasum: '726d5e4af810f741ef21865f6f954c4078a3a45f',
+46 silly resolved        tarball: 'http://registry.npmjs.org/yuglify/-/yuglify-0.1.4.tgz' },
+46 silly resolved     _from: 'yuglify@',
+46 silly resolved     _npmVersion: '1.2.15',
+46 silly resolved     _npmUser: { name: 'davglass', email: 'davglass@gmail.com' },
+46 silly resolved     maintainers: [ [Object] ],
+46 silly resolved     directories: {},
+46 silly resolved     _shasum: '726d5e4af810f741ef21865f6f954c4078a3a45f',
+46 silly resolved     _resolved: 'https://registry.npmjs.org/yuglify/-/yuglify-0.1.4.tgz' } ]
+47 info install yuglify@0.1.4 into /usr/local/lib
+48 info installOne yuglify@0.1.4
+49 verbose lib/node_modules/yuglify unbuild
+50 verbose tar unpack /Users/fefa4ka/.npm/yuglify/0.1.4/package.tgz
+51 silly lockFile f8b66cbf-r-local-lib-node-modules-yuglify tar:///usr/local/lib/node_modules/yuglify
+52 verbose lock tar:///usr/local/lib/node_modules/yuglify /Users/fefa4ka/.npm/f8b66cbf-r-local-lib-node-modules-yuglify.lock
+53 silly lockFile 4ba9cf88-ka-npm-yuglify-0-1-4-package-tgz tar:///Users/fefa4ka/.npm/yuglify/0.1.4/package.tgz
+54 verbose lock tar:///Users/fefa4ka/.npm/yuglify/0.1.4/package.tgz /Users/fefa4ka/.npm/4ba9cf88-ka-npm-yuglify-0-1-4-package-tgz.lock
+55 silly gunzTarPerm modes [ '755', '644' ]
+56 error Error: EACCES, mkdir '/usr/local/lib/node_modules/yuglify'
+56 error  { [Error: EACCES, mkdir '/usr/local/lib/node_modules/yuglify']
+56 error   errno: 3,
+56 error   code: 'EACCES',
+56 error   path: '/usr/local/lib/node_modules/yuglify',
+56 error   fstream_type: 'Directory',
+56 error   fstream_path: '/usr/local/lib/node_modules/yuglify',
+56 error   fstream_class: 'DirWriter',
+56 error   fstream_stack:
+56 error    [ '/usr/local/lib/node_modules/npm/node_modules/fstream/lib/dir-writer.js:36:23',
+56 error      '/usr/local/lib/node_modules/npm/node_modules/mkdirp/index.js:46:53',
+56 error      'Object.oncomplete (fs.js:107:15)' ] }
+57 error Please try running this command again as root/Administrator.
+58 error System Darwin 14.0.0
+59 error command "node" "/usr/local/bin/npm" "-g" "install" "yuglify"
+60 error cwd /Users/fefa4ka/Documents/web/zuykov
+61 error node -v v0.10.33
+62 error npm -v 1.4.28
+63 error path /usr/local/lib/node_modules/yuglify
+64 error fstream_path /usr/local/lib/node_modules/yuglify
+65 error fstream_type Directory
+66 error fstream_class DirWriter
+67 error code EACCES
+68 error errno 3
+69 error stack Error: EACCES, mkdir '/usr/local/lib/node_modules/yuglify'
+70 error fstream_stack /usr/local/lib/node_modules/npm/node_modules/fstream/lib/dir-writer.js:36:23
+70 error fstream_stack /usr/local/lib/node_modules/npm/node_modules/mkdirp/index.js:46:53
+70 error fstream_stack Object.oncomplete (fs.js:107:15)
+71 verbose exit [ 3, true ]

requirements.txt

@@ -31,4 +31,5 @@ django-meta
 django-meta-mixin
 django-admin-enhancer
 aldryn-apphooks-config
-#export C_INCLUDE_PATH=/usr/local/Cellar/libxml2/2.9.2/include/libxml2:$C_INCLUDE_PATH
+#export C_INCLUDE_PATH=/usr/local/Cellar/libxml2/2.9.2/include/libxml2:$C_INCLUDE_PATH
+git+https://github.com/MagicSolutions/django-cmsplugin-tabs.git#egg=django-cmsplugin-tabs

zsite/static/js/app.js

@@ -1,3 +1,8 @@
-angular.module('zuykov', ['ui.bootstrap']);
+angular.module('zuykov', ['ui.bootstrap', 'tabs']);
 
-console.log('Yep');
+
+angular.module('zuykov')
+
+.controller('TabsCtrl', function ($scope, $log) {
+})
+;

zsite/static/js/forms.js

@@ -1,5 +1,7 @@
 
-angular.module('zuykov').controller('ModalFormCtrl', function ($scope, $modal, $log) {
+angular.module('zuykov')
+
+.controller('ModalFormCtrl', function ($scope, $modal, $log) {
 
   $scope.items = ['item1', 'item2', 'item3'];
 

zsite/static/js/tabs.js

@@ -0,0 +1,80 @@
+/**
+ * The angular tabs module
+ * @author: nerv
+ * @version: 0.2.5, 2012-08-25
+ */
+
+
+'use strict';
+
+
+angular
+
+
+    .module( 'tabs', [])
+
+
+    .directive( 'ngTabs', function() {
+        return {
+            scope: true,
+            restrict: 'EAC',
+            controller: function( $scope ) {
+                $scope.tabs = {
+                    index: 0,
+                    count: 0
+                };
+
+                this.headIndex = 0;
+                this.bodyIndex = 0;
+
+                this.getTabHeadIndex = function() {
+                    return $scope.tabs.count = ++this.headIndex;
+                };
+
+                this.getTabBodyIndex = function() {
+                    return ++this.bodyIndex;
+                };
+            }
+        };
+    })
+
+
+    .directive( 'ngTabHead', function() {
+        return {
+            scope: false,
+            restrict: 'EAC',
+            require: '^ngTabs',
+            link: function( scope, element, attributes, controller ) {
+                var index = controller.getTabHeadIndex();
+                var value = attributes.ngTabHead;
+                var active = /[-*\/%^=!<>&|]/.test( value ) ? scope.$eval( value ) : !!value;
+
+                scope.tabs.index = scope.tabs.index || ( active ? index : null );
+
+                element.bind( 'click', function() {
+                    scope.tabs.index = index;
+                    scope.$$phase || scope.$apply();
+                });
+
+                scope.$watch( 'tabs.index', function() {
+                    element.toggleClass( 'active', scope.tabs.index === index );
+                });
+            }
+        };
+    })
+
+
+    .directive( 'ngTabBody', function() {
+        return {
+            scope: false,
+            restrict: 'EAC',
+            require: '^ngTabs',
+            link: function( scope, element, attributes, controller ) {
+                var index = controller.getTabBodyIndex();
+
+                scope.$watch( 'tabs.index', function() {
+                    element.toggleClass( attributes.ngTabBody + ' show', scope.tabs.index === index );
+                });
+            }
+        };
+    });

zsite/static/less/main.less

@@ -26,6 +26,8 @@
 
 @import url(http://fonts.googleapis.com/css?family=PT+Sans:400,700,400italic,700italic|Roboto+Slab:700,400&subset=cyrillic-ext,latin);
 
+@import 'tabs.less';
+
 
 .breadcrumb {
   padding: 0;

zsite/static/less/service.less

@@ -201,7 +201,7 @@
         }
     }
 
-    .tab-body {
+    #patents-example-lamp {
         background: url('/static/imgs/blueprint_bg.png') no-repeat;
         background-size: cover;
 
@@ -235,7 +235,7 @@
     
 
 
-    .patents-example-lamp {
+    #patents-example-lamp {
 
         .patent-visual {
             width: 30%;

zsite/static/less/tabs.less

@@ -0,0 +1,20 @@
+.tabs-list {
+    li.active {
+        a {
+            text-decoration: none;
+            color: #000;
+        }
+    }
+
+    li {
+        vertical-align: top;
+    }
+}
+
+.tab-body {
+    display: none;
+}
+
+.tab-body.ng-show {
+    display: block;
+}

zsite/templates/cmsplugin_tabs/tabs.html

@@ -0,0 +1,17 @@
+<div id="{{ tabs_list_id }}" ng-tabs class="tabs-plugin">
+    <ul class="tabs-list list-unstyled list-inline">
+        {% for tab in tabs %}
+            {% if forloop.first %}  
+                <li ng-tab-head="active"><a ng-click="$event.preventDefault()" href="#{{tab.get_html_id}}">{{ tab }}</a></li>
+            {% else %}
+                <li ng-tab-head="active"><a ng-click="$event.preventDefault()" href="#{{tab.get_html_id}}">{{ tab }}</a></li>
+            {% endif %}
+        {% endfor %}
+    </ul>
+    {% for tab in tabs %}
+        <div id="{{tab.get_html_id}}" ng-tab-body class="tab-body">
+            {{ tab.content|safe }}
+        </div>
+    {% endfor %}
+</div>
+

zsite/templates/menu_header.html

@@ -1,9 +1,9 @@
 {% load i18n menu_tags cache %}
-{{ children.count }}
+    
 {% if children|length > 1 %}
 <h4 class="header-menu-font">{% trans 'Our Services' %}</h4>
 <div class="background-line-pattern"></div>
-<ul class="list-unstyled list-inline header-menu header-menu-font">
+<ul class="list-unstyled list-inline header-menu header-menu-font {% if current_page.is_home %}main{% endif %}">
 {% for child in children %}
     <li {% if child.selected %}class="active"{% endif %}>
             <a href="{{ child.get_absolute_url }}"><span>{{ child.get_menu_title }}</span></a>