[MERGE]Merge lp:~openerp-dev/openobject-addons/trunk-website-al.
bzr revid: bth@tinyerp.com-20131111094934-qh95bt41fptwepm0
This commit is contained in:
bth-openerp
commit
fbda16c26b
|
|
@ -6,7 +6,6 @@ import json
|
|||
import logging
|
||||
import os
|
||||
import datetime
|
||||
import re
|
||||
|
||||
from sys import maxint
|
||||
|
||||
|
|
@ -17,14 +16,6 @@ import werkzeug.utils
|
|||
import werkzeug.wrappers
|
||||
from PIL import Image
|
||||
|
||||
try:
|
||||
from slugify import slugify
|
||||
except ImportError:
|
||||
def slugify(s, max_length=None):
|
||||
spaceless = re.sub(r'\s+', '-', s)
|
||||
specialless = re.sub(r'[^-_a-z0-9]', '', spaceless)
|
||||
return specialless[:max_length]
|
||||
|
||||
import openerp
|
||||
from openerp.osv import fields
|
||||
from openerp.addons.website.models import website
|
||||
|
|
@ -66,7 +57,7 @@ class Website(openerp.addons.web.controllers.main.Home):
|
|||
def pagenew(self, path, noredirect=NOPE):
|
||||
module = 'website'
|
||||
# completely arbitrary max_length
|
||||
idname = slugify(path, max_length=50)
|
||||
idname = http.slugify(path, max_length=50)
|
||||
|
||||
request.cr.execute('SAVEPOINT pagenew')
|
||||
imd = request.registry['ir.model.data']
|
||||
|
|
@ -281,7 +272,7 @@ class Website(openerp.addons.web.controllers.main.Home):
|
|||
return request.make_response(body, headers=[('Content-Type', 'text/plain')])
|
||||
|
||||
@website.route('/sitemap', type='http', auth='public', multilang=True)
|
||||
def sitemap(self, **kwargs):
|
||||
def sitemap(self):
|
||||
return request.website.render('website.sitemap', {'pages': request.website.list_pages()})
|
||||
|
||||
@website.route('/sitemap.xml', type='http', auth="public")
|
||||
|
|
|
|||
|
|
@ -9,11 +9,11 @@
|
|||
</record>
|
||||
|
||||
<record id="main_menu" model="website.menu">
|
||||
<field name="name">Main Menu</field>
|
||||
<field name="name">Top Menu</field>
|
||||
</record>
|
||||
|
||||
<record id="menu_homepage" model="website.menu">
|
||||
<field name="name">Homepage</field>
|
||||
<field name="name">Home</field>
|
||||
<field name="url">/</field>
|
||||
<field name="parent_id" ref="website.main_menu"/>
|
||||
<field name="sequence" type="int">10</field>
|
||||
|
|
|
|||
|
|
@ -1,29 +1,34 @@
|
|||
# -*- coding: utf-8 -*-
|
||||
import fnmatch
|
||||
import functools
|
||||
import inspect
|
||||
import logging
|
||||
import math
|
||||
import simplejson
|
||||
import itertools
|
||||
import traceback
|
||||
import urllib
|
||||
import urlparse
|
||||
|
||||
import simplejson
|
||||
import werkzeug
|
||||
import werkzeug.exceptions
|
||||
import werkzeug.wrappers
|
||||
|
||||
import openerp
|
||||
from openerp.exceptions import AccessError, AccessDenied
|
||||
from openerp.osv import osv, fields
|
||||
from openerp.osv import orm, osv, fields
|
||||
from openerp.tools.safe_eval import safe_eval
|
||||
|
||||
from openerp.addons.web import http
|
||||
from openerp.addons.web.http import request
|
||||
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
def route(routes, *route_args, **route_kwargs):
|
||||
def decorator(f):
|
||||
new_routes = routes if isinstance(routes, list) else [routes]
|
||||
f.cms = True
|
||||
f.multilang = route_kwargs.get('multilang', False)
|
||||
if f.multilang:
|
||||
route_kwargs.pop('multilang')
|
||||
|
|
@ -257,6 +262,64 @@ class website(osv.osv):
|
|||
]
|
||||
}
|
||||
|
||||
|
||||
def rule_is_enumerable(self, rule):
|
||||
""" Checks that it is possible to generate sensible GET queries for
|
||||
a given rule (if the endpoint matches its own requirements)
|
||||
|
||||
:type rule: werkzeug.routing.Rule
|
||||
:rtype: bool
|
||||
"""
|
||||
endpoint = rule.endpoint
|
||||
methods = rule.methods or ['GET']
|
||||
|
||||
return (
|
||||
'GET' in methods
|
||||
and endpoint.exposed == 'http'
|
||||
and endpoint.auth in ('none', 'public')
|
||||
and getattr(endpoint, 'cms', False)
|
||||
# ensure all converters on the rule are able to generate values for
|
||||
# themselves
|
||||
and all(hasattr(converter, 'generate')
|
||||
for converter in rule._converters.itervalues())
|
||||
) and self.endpoint_is_enumerable(rule)
|
||||
|
||||
def endpoint_is_enumerable(self, rule):
|
||||
""" Verifies that it's possible to generate a valid url for the rule's
|
||||
endpoint
|
||||
|
||||
:type rule: werkzeug.routing.Rule
|
||||
:rtype: bool
|
||||
"""
|
||||
|
||||
# apparently the decorator package makes getargspec work correctly
|
||||
# on functions it decorates. That's not the case for
|
||||
# @functools.wraps, so hack around to get the original function
|
||||
# (and hope a single decorator was applied or we're hosed)
|
||||
# FIXME: this is going to blow up if we want/need to use multiple @route (with various configurations) on a method
|
||||
undecorated_func = rule.endpoint.func_closure[0].cell_contents
|
||||
|
||||
# If this is ever ported to py3, use signatures, it doesn't suck as much
|
||||
spec = inspect.getargspec(undecorated_func)
|
||||
|
||||
# if *args or **kwargs, just bail the fuck out, only dragons can
|
||||
# live there
|
||||
if spec.varargs or spec.keywords:
|
||||
return False
|
||||
|
||||
# remove all arguments with a default value from the list
|
||||
defaults_count = len(spec.defaults or []) # spec.defaults can be None
|
||||
# a[:-0] ~ a[:0] ~ [] -> replace defaults_count == 0 by None to get
|
||||
# a[:None] ~ a
|
||||
args = spec.args[:(-defaults_count or None)]
|
||||
|
||||
# params with defaults were removed, leftover allowed are:
|
||||
# * self (technically should be first-parameter-of-instance-method but whatever)
|
||||
# * any parameter mapping to a converter
|
||||
return all(
|
||||
(arg == 'self' or arg in rule._converters)
|
||||
for arg in args)
|
||||
|
||||
def list_pages(self, cr, uid, ids, context=None):
|
||||
""" Available pages in the website/CMS. This is mostly used for links
|
||||
generation and can be overridden by modules setting up new HTML
|
||||
|
|
@ -269,16 +332,23 @@ class website(osv.osv):
|
|||
of the same.
|
||||
:rtype: list({name: str, url: str})
|
||||
"""
|
||||
View = self.pool['ir.ui.view']
|
||||
views = View.search_read(cr, uid, [['page', '=', True]],
|
||||
fields=['name'], order='name', context=context)
|
||||
xids = View.get_external_id(cr, uid, [view['id'] for view in views], context=context)
|
||||
|
||||
return [
|
||||
{'name': view['name'], 'url': '/page/' + xids[view['id']]}
|
||||
for view in views
|
||||
if xids[view['id']]
|
||||
]
|
||||
router = request.httprequest.app.get_db_router(request.db)
|
||||
|
||||
for rule in router.iter_rules():
|
||||
endpoint = rule.endpoint
|
||||
if not self.rule_is_enumerable(rule):
|
||||
continue
|
||||
|
||||
generated = map(dict, itertools.product(*(
|
||||
itertools.izip(itertools.repeat(name), converter.generate())
|
||||
for name, converter in rule._converters.iteritems()
|
||||
)))
|
||||
|
||||
for values in generated:
|
||||
# rule.build returns (domain_part, rel_url)
|
||||
url = rule.build(values, append_unknown=False)[1]
|
||||
yield {'name': url, 'url': url }
|
||||
|
||||
def kanban(self, cr, uid, ids, model, domain, column, template, step=None, scope=None, orderby=None, context=None):
|
||||
step = step and int(step) or 10
|
||||
|
|
|
|||
|
|
@ -1,20 +0,0 @@
|
|||
Copyright (c) 2013 Mark Dalgleish
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining
|
||||
a copy of this software and associated documentation files (the
|
||||
"Software"), to deal in the Software without restriction, including
|
||||
without limitation the rights to use, copy, modify, merge, publish,
|
||||
distribute, sublicense, and/or sell copies of the Software, and to
|
||||
permit persons to whom the Software is furnished to do so, subject to
|
||||
the following conditions:
|
||||
|
||||
The above copyright notice and this permission notice shall be
|
||||
included in all copies or substantial portions of the Software.
|
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
||||
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
|
||||
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
|
||||
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
||||
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
|
|
@ -1,308 +0,0 @@
|
|||
[](http://travis-ci.org/markdalgleish/stellar.js)
|
||||
|
||||
# Stellar.js
|
||||
|
||||
### Parallax scrolling made easy
|
||||
|
||||
Full guide and demonstrations available at the [official Stellar.js project page](http://markdalgleish.com/projects/stellar.js/).
|
||||
|
||||
## Download
|
||||
|
||||
Get the [development](https://raw.github.com/markdalgleish/stellar.js/master/jquery.stellar.js) or [production](https://raw.github.com/markdalgleish/stellar.js/master/jquery.stellar.min.js) version, or use a [package manager](https://github.com/markdalgleish/stellar.js#package-managers).
|
||||
|
||||
## Getting Started
|
||||
|
||||
Stellar.js is a jQuery plugin that provides parallax scrolling effects to any scrolling element. The first step is to run `.stellar()` against the element:
|
||||
|
||||
``` js
|
||||
// For example:
|
||||
$(window).stellar();
|
||||
// or:
|
||||
$('#main').stellar();
|
||||
```
|
||||
|
||||
If you're running Stellar.js on 'window', you can use the shorthand:
|
||||
|
||||
``` js
|
||||
$.stellar();
|
||||
```
|
||||
|
||||
This will look for any parallax backgrounds or elements within the specified element and reposition them when the element scrolls.
|
||||
|
||||
## Mobile Support
|
||||
|
||||
Support in Mobile WebKit browsers requires a touch scrolling library, and a slightly tweaked configuration. For a full walkthrough on how to implement this correctly, read my blog post ["Mobile Parallax with Stellar.js"](http://markdalgleish.com/2012/10/mobile-parallax-with-stellar-js).
|
||||
|
||||
Please note that parallax backgrounds are not recommended in Mobile WebKit due to performance constraints. Instead, use parallax elements with static backgrounds.
|
||||
|
||||
## Parallax Elements
|
||||
|
||||
If you want elements to scroll at a different speed, add the following attribute to any element with a CSS position of absolute, relative or fixed:
|
||||
|
||||
``` html
|
||||
<div data-stellar-ratio="2">
|
||||
```
|
||||
|
||||
The ratio is relative to the natural scroll speed, so a ratio of 0.5 would cause the element to scroll at half-speed, a ratio of 1 would have no effect, and a ratio of 2 would cause the element to scroll at twice the speed. If a ratio lower than 1 is causing the element to appear jittery, try setting its CSS position to fixed.
|
||||
|
||||
In order for Stellar.js to perform its calculations correctly, all parallax elements must have their dimensions specified in pixels for the axis/axes being used for parallax effects. For example, all parallax elements for a vertical site must have a pixel height specified. If your design prohibits the use of pixels, try using the ['responsive' option](#configuring-everything).
|
||||
|
||||
## Parallax Backgrounds
|
||||
|
||||
If you want an element's background image to reposition on scroll, simply add the following attribute:
|
||||
|
||||
``` html
|
||||
<div data-stellar-background-ratio="0.5">
|
||||
```
|
||||
|
||||
As with parallax elements, the ratio is relative to the natural scroll speed. For ratios lower than 1, to avoid jittery scroll performance, set the element's CSS 'background-attachment' to fixed.
|
||||
|
||||
## Configuring Offsets
|
||||
|
||||
Stellar.js' most powerful feature is the way it aligns elements.
|
||||
|
||||
All elements will return to their original positioning when their offset parent meets the edge of the screen—plus or minus your own optional offset. This allows you to create intricate parallax patterns very easily.
|
||||
|
||||
Confused? [See how offsets are used on the Stellar.js home page.](http://markdalgleish.com/projects/stellar.js/#show-offsets)
|
||||
|
||||
To modify the offsets for all elements at once, pass in the options:
|
||||
|
||||
``` js
|
||||
$.stellar({
|
||||
horizontalOffset: 40,
|
||||
verticalOffset: 150
|
||||
});
|
||||
```
|
||||
|
||||
You can also modify the offsets on a per-element basis using the following data attributes:
|
||||
|
||||
``` html
|
||||
<div data-stellar-ratio="2"
|
||||
data-stellar-horizontal-offset="40"
|
||||
data-stellar-vertical-offset="150">
|
||||
```
|
||||
|
||||
## Configuring Offset Parents
|
||||
|
||||
By default, offsets are relative to the element's offset parent. This mirrors the way an absolutely positioned element behaves when nested inside an element with a relative position.
|
||||
|
||||
As with regular CSS, the closest parent element with a position of relative or absolute is the offset parent.
|
||||
|
||||
To override this and force the offset parent to be another element higher up the DOM, use the following data attribute:
|
||||
|
||||
``` html
|
||||
<div data-stellar-offset-parent="true">
|
||||
```
|
||||
|
||||
The offset parent can also have its own offsets:
|
||||
|
||||
``` html
|
||||
<div data-stellar-offset-parent="true"
|
||||
data-stellar-horizontal-offset="40"
|
||||
data-stellar-vertical-offset="150">
|
||||
```
|
||||
|
||||
Similar to CSS, the rules take precedence from element, to offset parent, to JavaScript options.
|
||||
|
||||
Confused? [See how offset parents are used on the Stellar.js home page.](http://markdalgleish.com/projects/stellar.js/#show-offset-parents)
|
||||
|
||||
Still confused? [See what it looks like with its default offset parents.](http://markdalgleish.com/projects/stellar.js/#show-offset-parents-default) Notice how the alignment happens on a per-letter basis? That's because each letter's containing div is its default offset parent.
|
||||
|
||||
By specifying the h2 element as the offset parent, we can ensure that the alignment of all the stars in a heading is based on the h2 and not the div further down the DOM tree.
|
||||
|
||||
## Configuring Scroll Positioning
|
||||
|
||||
You can define what it means for an element to 'scroll'. Whether it's the element's scroll position that's changing, its margins or its CSS3 'transform' position, you can define it using the 'scrollProperty' option:
|
||||
|
||||
``` js
|
||||
$('#gallery').stellar({
|
||||
scrollProperty: 'transform'
|
||||
});
|
||||
```
|
||||
|
||||
This option is what allows you to run [Stellar.js on iOS](http://markdalgleish.com/projects/stellar.js/demos/ios.html).
|
||||
|
||||
You can even define how the elements are repositioned, whether it's through standard top and left properties or using CSS3 transforms:
|
||||
|
||||
``` js
|
||||
$('#gallery').stellar({
|
||||
positionProperty: 'transform'
|
||||
});
|
||||
```
|
||||
|
||||
Don't have the level of control you need? Write a plugin!
|
||||
|
||||
Otherwise, you're ready to get started!
|
||||
|
||||
## Configuring Everything
|
||||
|
||||
Below you will find a complete list of options and matching default values:
|
||||
|
||||
``` js
|
||||
$.stellar({
|
||||
// Set scrolling to be in either one or both directions
|
||||
horizontalScrolling: true,
|
||||
verticalScrolling: true,
|
||||
|
||||
// Set the global alignment offsets
|
||||
horizontalOffset: 0,
|
||||
verticalOffset: 0,
|
||||
|
||||
// Refreshes parallax content on window load and resize
|
||||
responsive: false,
|
||||
|
||||
// Select which property is used to calculate scroll.
|
||||
// Choose 'scroll', 'position', 'margin' or 'transform',
|
||||
// or write your own 'scrollProperty' plugin.
|
||||
scrollProperty: 'scroll',
|
||||
|
||||
// Select which property is used to position elements.
|
||||
// Choose between 'position' or 'transform',
|
||||
// or write your own 'positionProperty' plugin.
|
||||
positionProperty: 'position',
|
||||
|
||||
// Enable or disable the two types of parallax
|
||||
parallaxBackgrounds: true,
|
||||
parallaxElements: true,
|
||||
|
||||
// Hide parallax elements that move outside the viewport
|
||||
hideDistantElements: true,
|
||||
|
||||
// Customise how elements are shown and hidden
|
||||
hideElement: function($elem) { $elem.hide(); },
|
||||
showElement: function($elem) { $elem.show(); }
|
||||
});
|
||||
```
|
||||
|
||||
## Writing a Scroll Property Plugin
|
||||
|
||||
Out of the box, Stellar.js supports the following scroll properties:
|
||||
'scroll', 'position', 'margin' and 'transform'.
|
||||
|
||||
If your method for creating a scrolling interface isn't covered by one of these, you can write your own. For example, if 'margin' didn't exist yet you could write it like so:
|
||||
|
||||
``` js
|
||||
$.stellar.scrollProperty.margin = {
|
||||
getLeft: function($element) {
|
||||
return parseInt($element.css('margin-left'), 10) * -1;
|
||||
},
|
||||
getTop: function($element) {
|
||||
return parseInt($element.css('margin-top'), 10) * -1;
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
Now, you can specify this scroll property in Stellar.js' configuration.
|
||||
|
||||
``` js
|
||||
$.stellar({
|
||||
scrollProperty: 'margin'
|
||||
});
|
||||
```
|
||||
|
||||
## Writing a Position Property Plugin
|
||||
|
||||
Stellar.js has two methods for positioning elements built in: 'position' for modifying its top and left properties, and 'transform' for using CSS3 transforms.
|
||||
|
||||
If you need more control over how elements are positioned, you can write your own setter functions. For example, if 'position' didn't exist yet, it could be written as a plugin like this:
|
||||
|
||||
``` js
|
||||
$.stellar.positionProperty.position = {
|
||||
setTop: function($element, newTop, originalTop) {
|
||||
$element.css('top', newTop);
|
||||
},
|
||||
setLeft: function($element, newLeft, originalLeft) {
|
||||
$element.css('left', newLeft);
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
Now, you can specify this position property in Stellar.js' configuration.
|
||||
|
||||
``` js
|
||||
$.stellar({
|
||||
positionProperty: 'position'
|
||||
});
|
||||
```
|
||||
|
||||
If, for technical reasons, you need to set both properties at once, you can define a single 'setPosition' function:
|
||||
|
||||
``` js
|
||||
$.stellar.positionProperty.foobar = {
|
||||
setPosition: function($element, newLeft, originalLeft, newTop, originalTop) {
|
||||
$element.css('transform', 'translate3d(' +
|
||||
(newLeft - originalLeft) + 'px, ' +
|
||||
(newTop - originalTop) + 'px, ' +
|
||||
'0)');
|
||||
}
|
||||
}
|
||||
|
||||
$.stellar({
|
||||
positionProperty: 'foobar'
|
||||
});
|
||||
```
|
||||
|
||||
## Package Managers
|
||||
|
||||
Stellar.js can be installed with [Bower](http://twitter.github.com/bower/):
|
||||
|
||||
``` bash
|
||||
$ bower install jquery.stellar
|
||||
```
|
||||
|
||||
## Sites Using Stellar.js
|
||||
|
||||
* [National Geographic - Alien Deep Interactive](http://channel.nationalgeographic.com/channel/alien-deep/interactives/alien-deep-interactive)
|
||||
* [François Hollande](http://www.parti-socialiste.fr/latimelineduchangement)
|
||||
* [Brabus Private Aviation](http://www.brabus-aviation.com/)
|
||||
* [Mary and Frankie's Wedding](http://www.maryandfrankiewedding.com/)
|
||||
* [IT Support London](http://www.itsupportlondon.com)
|
||||
* [Ashford University](http://bright.ashford.edu)
|
||||
* [Clif Adventures](http://www.clifbar.com/adventures)
|
||||
* [Mindster](http://www.mindster.org)
|
||||
* [WS Interactive](http://www.ws-interactive.fr/methode)
|
||||
* [Moire Mag - Untitled](http://www.moiremag.net/untitled)
|
||||
* [Carnival of Courage](http://www.carnivalofcourage.com.au)
|
||||
* [Ian Poulter](http://www.ianpoulter.com)
|
||||
* [360 Strategy Group](http://360strategygroup.com)
|
||||
* [Code, Love and Boards](http://codeloveandboards.com/)
|
||||
|
||||
I'm sure there are heaps more. [Let me know if you'd like me to feature your site here.](http://twitter.com/markdalgleish)
|
||||
|
||||
## How to Build
|
||||
|
||||
Stellar.js uses [Node.js](nodejs.org), [Grunt](http://gruntjs.com) and [PhantomJS](http://phantomjs.org/).
|
||||
|
||||
Once you've got Node and PhantomJS set up, install the dependencies:
|
||||
|
||||
`$ npm install`
|
||||
|
||||
To lint, test and minify the project, simply run the following command:
|
||||
|
||||
`$ grunt`
|
||||
|
||||
Each of the build steps are also available individually.
|
||||
|
||||
`$ grunt test` to test the code using QUnit and PhantomJS:
|
||||
|
||||
`$ grunt lint` to validate the code using JSHint.
|
||||
|
||||
`$ grunt watch` to continuously lint and test the code while developing.
|
||||
|
||||
## Contributing to Stellar.js
|
||||
|
||||
Ensure that you successfully test and build the project with `$ grunt` before committing.
|
||||
|
||||
Make sure that all plugin changes are made in `src/jquery.stellar.js` (`/jquery.stellar.js` and `/jquery.stellar.min.js` are generated by Grunt).
|
||||
|
||||
If you want to contribute in a way that changes the API, please file an issue before submitting a pull request so we can discuss how to appropriately integrate your ideas.
|
||||
|
||||
## Questions?
|
||||
|
||||
Contact me on GitHub or Twitter: [@markdalgleish](http://twitter.com/markdalgleish)
|
||||
|
||||
## License
|
||||
|
||||
Copyright 2013, Mark Dalgleish
|
||||
This content is released under the MIT license
|
||||
http://markdalgleish.mit-license.org
|
||||
|
|
@ -1,8 +0,0 @@
|
|||
{
|
||||
"name": "jquery.stellar",
|
||||
"version": "0.6.2",
|
||||
"main": ["./jquery.stellar.js"],
|
||||
"dependencies": {
|
||||
"jquery": ">=1.4.3"
|
||||
}
|
||||
}
|
||||
|
|
@ -1,71 +0,0 @@
|
|||
/*global module:false*/
|
||||
module.exports = function(grunt) {
|
||||
|
||||
// Project configuration.
|
||||
grunt.initConfig({
|
||||
pkg: '<json:package.json>',
|
||||
meta: {
|
||||
banner: '/*!\n' +
|
||||
' * <%= pkg.title || pkg.name %> v<%= pkg.version %>\n' +
|
||||
' * <%= pkg.homepage %>\n' +
|
||||
' * \n' +
|
||||
' * Copyright <%= grunt.template.today("yyyy") %>, <%= pkg.author.name %>\n' +
|
||||
' * This content is released under the <%= _.pluck(pkg.licenses, "type").join(", ") %> license<%= pkg.licenses.length === 1 ? "" : "s" %>\n' +
|
||||
' * <%= _.pluck(pkg.licenses, "url").join(", ") %>\n' +
|
||||
' */',
|
||||
microbanner: '/*! <%= pkg.title || pkg.name %> v<%= pkg.version %> | Copyright <%= grunt.template.today("yyyy") %>, <%= pkg.author.name %> | <%= pkg.homepage %> | <%= _.pluck(pkg.licenses, "url").join(", ") %> */'
|
||||
},
|
||||
lint: {
|
||||
files: ['grunt.js', 'test/**/*.js', 'src/**/*.js']
|
||||
},
|
||||
server: {
|
||||
port: 8573
|
||||
},
|
||||
qunit: {
|
||||
urls: ['1.4.3', '1.10.1', '2.0.2'].map(function(version) {
|
||||
return 'http://localhost:<%= server.port %>/test/jquery.stellar.html?jquery=' + version;
|
||||
})
|
||||
},
|
||||
concat: {
|
||||
dist: {
|
||||
src: ['<banner:meta.banner>', '<file_strip_banner:src/<%= pkg.name %>.js>'],
|
||||
dest: '<%= pkg.name %>.js'
|
||||
}
|
||||
},
|
||||
min: {
|
||||
dist: {
|
||||
src: ['<banner:meta.microbanner>', '<config:concat.dist.dest>'],
|
||||
dest: '<%= pkg.name %>.min.js'
|
||||
}
|
||||
},
|
||||
watch: {
|
||||
files: '<config:lint.files>',
|
||||
tasks: 'server lint qunit'
|
||||
},
|
||||
jshint: {
|
||||
options: {
|
||||
evil: true,
|
||||
curly: false,
|
||||
eqeqeq: true,
|
||||
immed: true,
|
||||
latedef: true,
|
||||
newcap: true,
|
||||
noarg: true,
|
||||
sub: true,
|
||||
undef: true,
|
||||
boss: true,
|
||||
browser: true
|
||||
},
|
||||
globals: {
|
||||
jQuery: true
|
||||
}
|
||||
},
|
||||
uglify: {}
|
||||
});
|
||||
|
||||
// Default task.
|
||||
grunt.registerTask('default', 'server lint qunit concat min');
|
||||
|
||||
grunt.registerTask('test', 'server lint qunit');
|
||||
|
||||
};
|
||||
|
|
@ -1,660 +0,0 @@
|
|||
/*!
|
||||
* Stellar.js v0.6.2
|
||||
* http://markdalgleish.com/projects/stellar.js
|
||||
*
|
||||
* Copyright 2013, Mark Dalgleish
|
||||
* This content is released under the MIT license
|
||||
* http://markdalgleish.mit-license.org
|
||||
*/
|
||||
|
||||
;(function($, window, document, undefined) {
|
||||
|
||||
var pluginName = 'stellar',
|
||||
defaults = {
|
||||
scrollProperty: 'scroll',
|
||||
positionProperty: 'position',
|
||||
horizontalScrolling: true,
|
||||
verticalScrolling: true,
|
||||
horizontalOffset: 0,
|
||||
verticalOffset: 0,
|
||||
responsive: false,
|
||||
parallaxBackgrounds: true,
|
||||
parallaxElements: true,
|
||||
hideDistantElements: true,
|
||||
hideElement: function($elem) { $elem.hide(); },
|
||||
showElement: function($elem) { $elem.show(); }
|
||||
},
|
||||
|
||||
scrollProperty = {
|
||||
scroll: {
|
||||
getLeft: function($elem) { return $elem.scrollLeft(); },
|
||||
setLeft: function($elem, val) { $elem.scrollLeft(val); },
|
||||
|
||||
getTop: function($elem) { return $elem.scrollTop(); },
|
||||
setTop: function($elem, val) { $elem.scrollTop(val); }
|
||||
},
|
||||
position: {
|
||||
getLeft: function($elem) { return parseInt($elem.css('left'), 10) * -1; },
|
||||
getTop: function($elem) { return parseInt($elem.css('top'), 10) * -1; }
|
||||
},
|
||||
margin: {
|
||||
getLeft: function($elem) { return parseInt($elem.css('margin-left'), 10) * -1; },
|
||||
getTop: function($elem) { return parseInt($elem.css('margin-top'), 10) * -1; }
|
||||
},
|
||||
transform: {
|
||||
getLeft: function($elem) {
|
||||
var computedTransform = getComputedStyle($elem[0])[prefixedTransform];
|
||||
return (computedTransform !== 'none' ? parseInt(computedTransform.match(/(-?[0-9]+)/g)[4], 10) * -1 : 0);
|
||||
},
|
||||
getTop: function($elem) {
|
||||
var computedTransform = getComputedStyle($elem[0])[prefixedTransform];
|
||||
return (computedTransform !== 'none' ? parseInt(computedTransform.match(/(-?[0-9]+)/g)[5], 10) * -1 : 0);
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
positionProperty = {
|
||||
position: {
|
||||
setLeft: function($elem, left) { $elem.css('left', left); },
|
||||
setTop: function($elem, top) { $elem.css('top', top); }
|
||||
},
|
||||
transform: {
|
||||
setPosition: function($elem, left, startingLeft, top, startingTop) {
|
||||
$elem[0].style[prefixedTransform] = 'translate3d(' + (left - startingLeft) + 'px, ' + (top - startingTop) + 'px, 0)';
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
// Returns a function which adds a vendor prefix to any CSS property name
|
||||
vendorPrefix = (function() {
|
||||
var prefixes = /^(Moz|Webkit|Khtml|O|ms|Icab)(?=[A-Z])/,
|
||||
style = $('script')[0].style,
|
||||
prefix = '',
|
||||
prop;
|
||||
|
||||
for (prop in style) {
|
||||
if (prefixes.test(prop)) {
|
||||
prefix = prop.match(prefixes)[0];
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if ('WebkitOpacity' in style) { prefix = 'Webkit'; }
|
||||
if ('KhtmlOpacity' in style) { prefix = 'Khtml'; }
|
||||
|
||||
return function(property) {
|
||||
return prefix + (prefix.length > 0 ? property.charAt(0).toUpperCase() + property.slice(1) : property);
|
||||
};
|
||||
}()),
|
||||
|
||||
prefixedTransform = vendorPrefix('transform'),
|
||||
|
||||
supportsBackgroundPositionXY = $('<div />', { style: 'background:#fff' }).css('background-position-x') !== undefined,
|
||||
|
||||
setBackgroundPosition = (supportsBackgroundPositionXY ?
|
||||
function($elem, x, y) {
|
||||
$elem.css({
|
||||
'background-position-x': x,
|
||||
'background-position-y': y
|
||||
});
|
||||
} :
|
||||
function($elem, x, y) {
|
||||
$elem.css('background-position', x + ' ' + y);
|
||||
}
|
||||
),
|
||||
|
||||
getBackgroundPosition = (supportsBackgroundPositionXY ?
|
||||
function($elem) {
|
||||
return [
|
||||
$elem.css('background-position-x'),
|
||||
$elem.css('background-position-y')
|
||||
];
|
||||
} :
|
||||
function($elem) {
|
||||
return $elem.css('background-position').split(' ');
|
||||
}
|
||||
),
|
||||
|
||||
requestAnimFrame = (
|
||||
window.requestAnimationFrame ||
|
||||
window.webkitRequestAnimationFrame ||
|
||||
window.mozRequestAnimationFrame ||
|
||||
window.oRequestAnimationFrame ||
|
||||
window.msRequestAnimationFrame ||
|
||||
function(callback) {
|
||||
setTimeout(callback, 1000 / 60);
|
||||
}
|
||||
);
|
||||
|
||||
function Plugin(element, options) {
|
||||
this.element = element;
|
||||
this.options = $.extend({}, defaults, options);
|
||||
|
||||
this._defaults = defaults;
|
||||
this._name = pluginName;
|
||||
|
||||
this.init();
|
||||
}
|
||||
|
||||
Plugin.prototype = {
|
||||
init: function() {
|
||||
this.options.name = pluginName + '_' + Math.floor(Math.random() * 1e9);
|
||||
|
||||
this._defineElements();
|
||||
this._defineGetters();
|
||||
this._defineSetters();
|
||||
this._handleWindowLoadAndResize();
|
||||
this._detectViewport();
|
||||
|
||||
this.refresh({ firstLoad: true });
|
||||
|
||||
if (this.options.scrollProperty === 'scroll') {
|
||||
this._handleScrollEvent();
|
||||
} else {
|
||||
this._startAnimationLoop();
|
||||
}
|
||||
},
|
||||
_defineElements: function() {
|
||||
if (this.element === document.body) this.element = window;
|
||||
this.$scrollElement = $(this.element);
|
||||
this.$element = (this.element === window ? $('body') : this.$scrollElement);
|
||||
this.$viewportElement = (this.options.viewportElement !== undefined ? $(this.options.viewportElement) : (this.$scrollElement[0] === window || this.options.scrollProperty === 'scroll' ? this.$scrollElement : this.$scrollElement.parent()) );
|
||||
},
|
||||
_defineGetters: function() {
|
||||
var self = this,
|
||||
scrollPropertyAdapter = scrollProperty[self.options.scrollProperty];
|
||||
|
||||
this._getScrollLeft = function() {
|
||||
return scrollPropertyAdapter.getLeft(self.$scrollElement);
|
||||
};
|
||||
|
||||
this._getScrollTop = function() {
|
||||
return scrollPropertyAdapter.getTop(self.$scrollElement);
|
||||
};
|
||||
},
|
||||
_defineSetters: function() {
|
||||
var self = this,
|
||||
scrollPropertyAdapter = scrollProperty[self.options.scrollProperty],
|
||||
positionPropertyAdapter = positionProperty[self.options.positionProperty],
|
||||
setScrollLeft = scrollPropertyAdapter.setLeft,
|
||||
setScrollTop = scrollPropertyAdapter.setTop;
|
||||
|
||||
this._setScrollLeft = (typeof setScrollLeft === 'function' ? function(val) {
|
||||
setScrollLeft(self.$scrollElement, val);
|
||||
} : $.noop);
|
||||
|
||||
this._setScrollTop = (typeof setScrollTop === 'function' ? function(val) {
|
||||
setScrollTop(self.$scrollElement, val);
|
||||
} : $.noop);
|
||||
|
||||
this._setPosition = positionPropertyAdapter.setPosition ||
|
||||
function($elem, left, startingLeft, top, startingTop) {
|
||||
if (self.options.horizontalScrolling) {
|
||||
positionPropertyAdapter.setLeft($elem, left, startingLeft);
|
||||
}
|
||||
|
||||
if (self.options.verticalScrolling) {
|
||||
positionPropertyAdapter.setTop($elem, top, startingTop);
|
||||
}
|
||||
};
|
||||
},
|
||||
_handleWindowLoadAndResize: function() {
|
||||
var self = this,
|
||||
$window = $(window);
|
||||
|
||||
if (self.options.responsive) {
|
||||
$window.bind('load.' + this.name, function() {
|
||||
self.refresh();
|
||||
});
|
||||
}
|
||||
|
||||
$window.bind('resize.' + this.name, function() {
|
||||
self._detectViewport();
|
||||
|
||||
if (self.options.responsive) {
|
||||
self.refresh();
|
||||
}
|
||||
});
|
||||
},
|
||||
refresh: function(options) {
|
||||
var self = this,
|
||||
oldLeft = self._getScrollLeft(),
|
||||
oldTop = self._getScrollTop();
|
||||
|
||||
if (!options || !options.firstLoad) {
|
||||
this._reset();
|
||||
}
|
||||
|
||||
this._setScrollLeft(0);
|
||||
this._setScrollTop(0);
|
||||
|
||||
this._setOffsets();
|
||||
this._findParticles();
|
||||
this._findBackgrounds();
|
||||
|
||||
// Fix for WebKit background rendering bug
|
||||
if (options && options.firstLoad && /WebKit/.test(navigator.userAgent)) {
|
||||
$(window).load(function() {
|
||||
var oldLeft = self._getScrollLeft(),
|
||||
oldTop = self._getScrollTop();
|
||||
|
||||
self._setScrollLeft(oldLeft + 1);
|
||||
self._setScrollTop(oldTop + 1);
|
||||
|
||||
self._setScrollLeft(oldLeft);
|
||||
self._setScrollTop(oldTop);
|
||||
});
|
||||
}
|
||||
|
||||
this._setScrollLeft(oldLeft);
|
||||
this._setScrollTop(oldTop);
|
||||
},
|
||||
_detectViewport: function() {
|
||||
var viewportOffsets = this.$viewportElement.offset(),
|
||||
hasOffsets = viewportOffsets !== null && viewportOffsets !== undefined;
|
||||
|
||||
this.viewportWidth = this.$viewportElement.width();
|
||||
this.viewportHeight = this.$viewportElement.height();
|
||||
|
||||
this.viewportOffsetTop = (hasOffsets ? viewportOffsets.top : 0);
|
||||
this.viewportOffsetLeft = (hasOffsets ? viewportOffsets.left : 0);
|
||||
},
|
||||
_findParticles: function() {
|
||||
var self = this,
|
||||
scrollLeft = this._getScrollLeft(),
|
||||
scrollTop = this._getScrollTop();
|
||||
|
||||
if (this.particles !== undefined) {
|
||||
for (var i = this.particles.length - 1; i >= 0; i--) {
|
||||
this.particles[i].$element.data('stellar-elementIsActive', undefined);
|
||||
}
|
||||
}
|
||||
|
||||
this.particles = [];
|
||||
|
||||
if (!this.options.parallaxElements) return;
|
||||
|
||||
this.$element.find('[data-stellar-ratio]').each(function(i) {
|
||||
var $this = $(this),
|
||||
horizontalOffset,
|
||||
verticalOffset,
|
||||
positionLeft,
|
||||
positionTop,
|
||||
marginLeft,
|
||||
marginTop,
|
||||
$offsetParent,
|
||||
offsetLeft,
|
||||
offsetTop,
|
||||
parentOffsetLeft = 0,
|
||||
parentOffsetTop = 0,
|
||||
tempParentOffsetLeft = 0,
|
||||
tempParentOffsetTop = 0;
|
||||
|
||||
// Ensure this element isn't already part of another scrolling element
|
||||
if (!$this.data('stellar-elementIsActive')) {
|
||||
$this.data('stellar-elementIsActive', this);
|
||||
} else if ($this.data('stellar-elementIsActive') !== this) {
|
||||
return;
|
||||
}
|
||||
|
||||
self.options.showElement($this);
|
||||
|
||||
// Save/restore the original top and left CSS values in case we refresh the particles or destroy the instance
|
||||
if (!$this.data('stellar-startingLeft')) {
|
||||
$this.data('stellar-startingLeft', $this.css('left'));
|
||||
$this.data('stellar-startingTop', $this.css('top'));
|
||||
} else {
|
||||
$this.css('left', $this.data('stellar-startingLeft'));
|
||||
$this.css('top', $this.data('stellar-startingTop'));
|
||||
}
|
||||
|
||||
positionLeft = $this.position().left;
|
||||
positionTop = $this.position().top;
|
||||
|
||||
// Catch-all for margin top/left properties (these evaluate to 'auto' in IE7 and IE8)
|
||||
marginLeft = ($this.css('margin-left') === 'auto') ? 0 : parseInt($this.css('margin-left'), 10);
|
||||
marginTop = ($this.css('margin-top') === 'auto') ? 0 : parseInt($this.css('margin-top'), 10);
|
||||
|
||||
offsetLeft = $this.offset().left - marginLeft;
|
||||
offsetTop = $this.offset().top - marginTop;
|
||||
|
||||
// Calculate the offset parent
|
||||
$this.parents().each(function() {
|
||||
var $this = $(this);
|
||||
|
||||
if ($this.data('stellar-offset-parent') === true) {
|
||||
parentOffsetLeft = tempParentOffsetLeft;
|
||||
parentOffsetTop = tempParentOffsetTop;
|
||||
$offsetParent = $this;
|
||||
|
||||
return false;
|
||||
} else {
|
||||
tempParentOffsetLeft += $this.position().left;
|
||||
tempParentOffsetTop += $this.position().top;
|
||||
}
|
||||
});
|
||||
|
||||
// Detect the offsets
|
||||
horizontalOffset = ($this.data('stellar-horizontal-offset') !== undefined ? $this.data('stellar-horizontal-offset') : ($offsetParent !== undefined && $offsetParent.data('stellar-horizontal-offset') !== undefined ? $offsetParent.data('stellar-horizontal-offset') : self.horizontalOffset));
|
||||
verticalOffset = ($this.data('stellar-vertical-offset') !== undefined ? $this.data('stellar-vertical-offset') : ($offsetParent !== undefined && $offsetParent.data('stellar-vertical-offset') !== undefined ? $offsetParent.data('stellar-vertical-offset') : self.verticalOffset));
|
||||
|
||||
// Add our object to the particles collection
|
||||
self.particles.push({
|
||||
$element: $this,
|
||||
$offsetParent: $offsetParent,
|
||||
isFixed: $this.css('position') === 'fixed',
|
||||
horizontalOffset: horizontalOffset,
|
||||
verticalOffset: verticalOffset,
|
||||
startingPositionLeft: positionLeft,
|
||||
startingPositionTop: positionTop,
|
||||
startingOffsetLeft: offsetLeft,
|
||||
startingOffsetTop: offsetTop,
|
||||
parentOffsetLeft: parentOffsetLeft,
|
||||
parentOffsetTop: parentOffsetTop,
|
||||
stellarRatio: ($this.data('stellar-ratio') !== undefined ? $this.data('stellar-ratio') : 1),
|
||||
width: $this.outerWidth(true),
|
||||
height: $this.outerHeight(true),
|
||||
isHidden: false
|
||||
});
|
||||
});
|
||||
},
|
||||
_findBackgrounds: function() {
|
||||
var self = this,
|
||||
scrollLeft = this._getScrollLeft(),
|
||||
scrollTop = this._getScrollTop(),
|
||||
$backgroundElements;
|
||||
|
||||
this.backgrounds = [];
|
||||
|
||||
if (!this.options.parallaxBackgrounds) return;
|
||||
|
||||
$backgroundElements = this.$element.find('[data-stellar-background-ratio]');
|
||||
|
||||
if (this.$element.data('stellar-background-ratio')) {
|
||||
$backgroundElements = $backgroundElements.add(this.$element);
|
||||
}
|
||||
|
||||
$backgroundElements.each(function() {
|
||||
var $this = $(this),
|
||||
backgroundPosition = getBackgroundPosition($this),
|
||||
horizontalOffset,
|
||||
verticalOffset,
|
||||
positionLeft,
|
||||
positionTop,
|
||||
marginLeft,
|
||||
marginTop,
|
||||
offsetLeft,
|
||||
offsetTop,
|
||||
$offsetParent,
|
||||
parentOffsetLeft = 0,
|
||||
parentOffsetTop = 0,
|
||||
tempParentOffsetLeft = 0,
|
||||
tempParentOffsetTop = 0;
|
||||
|
||||
// Ensure this element isn't already part of another scrolling element
|
||||
if (!$this.data('stellar-backgroundIsActive')) {
|
||||
$this.data('stellar-backgroundIsActive', this);
|
||||
} else if ($this.data('stellar-backgroundIsActive') !== this) {
|
||||
return;
|
||||
}
|
||||
|
||||
// Save/restore the original top and left CSS values in case we destroy the instance
|
||||
if (!$this.data('stellar-backgroundStartingLeft')) {
|
||||
$this.data('stellar-backgroundStartingLeft', backgroundPosition[0]);
|
||||
$this.data('stellar-backgroundStartingTop', backgroundPosition[1]);
|
||||
} else {
|
||||
setBackgroundPosition($this, $this.data('stellar-backgroundStartingLeft'), $this.data('stellar-backgroundStartingTop'));
|
||||
}
|
||||
|
||||
// Catch-all for margin top/left properties (these evaluate to 'auto' in IE7 and IE8)
|
||||
marginLeft = ($this.css('margin-left') === 'auto') ? 0 : parseInt($this.css('margin-left'), 10);
|
||||
marginTop = ($this.css('margin-top') === 'auto') ? 0 : parseInt($this.css('margin-top'), 10);
|
||||
|
||||
offsetLeft = $this.offset().left - marginLeft - scrollLeft;
|
||||
offsetTop = $this.offset().top - marginTop - scrollTop;
|
||||
|
||||
// Calculate the offset parent
|
||||
$this.parents().each(function() {
|
||||
var $this = $(this);
|
||||
|
||||
if ($this.data('stellar-offset-parent') === true) {
|
||||
parentOffsetLeft = tempParentOffsetLeft;
|
||||
parentOffsetTop = tempParentOffsetTop;
|
||||
$offsetParent = $this;
|
||||
|
||||
return false;
|
||||
} else {
|
||||
tempParentOffsetLeft += $this.position().left;
|
||||
tempParentOffsetTop += $this.position().top;
|
||||
}
|
||||
});
|
||||
|
||||
// Detect the offsets
|
||||
horizontalOffset = ($this.data('stellar-horizontal-offset') !== undefined ? $this.data('stellar-horizontal-offset') : ($offsetParent !== undefined && $offsetParent.data('stellar-horizontal-offset') !== undefined ? $offsetParent.data('stellar-horizontal-offset') : self.horizontalOffset));
|
||||
verticalOffset = ($this.data('stellar-vertical-offset') !== undefined ? $this.data('stellar-vertical-offset') : ($offsetParent !== undefined && $offsetParent.data('stellar-vertical-offset') !== undefined ? $offsetParent.data('stellar-vertical-offset') : self.verticalOffset));
|
||||
|
||||
self.backgrounds.push({
|
||||
$element: $this,
|
||||
$offsetParent: $offsetParent,
|
||||
isFixed: $this.css('background-attachment') === 'fixed',
|
||||
horizontalOffset: horizontalOffset,
|
||||
verticalOffset: verticalOffset,
|
||||
startingValueLeft: backgroundPosition[0],
|
||||
startingValueTop: backgroundPosition[1],
|
||||
startingBackgroundPositionLeft: (isNaN(parseInt(backgroundPosition[0], 10)) ? 0 : parseInt(backgroundPosition[0], 10)),
|
||||
startingBackgroundPositionTop: (isNaN(parseInt(backgroundPosition[1], 10)) ? 0 : parseInt(backgroundPosition[1], 10)),
|
||||
startingPositionLeft: $this.position().left,
|
||||
startingPositionTop: $this.position().top,
|
||||
startingOffsetLeft: offsetLeft,
|
||||
startingOffsetTop: offsetTop,
|
||||
parentOffsetLeft: parentOffsetLeft,
|
||||
parentOffsetTop: parentOffsetTop,
|
||||
stellarRatio: ($this.data('stellar-background-ratio') === undefined ? 1 : $this.data('stellar-background-ratio'))
|
||||
});
|
||||
});
|
||||
},
|
||||
_reset: function() {
|
||||
var particle,
|
||||
startingPositionLeft,
|
||||
startingPositionTop,
|
||||
background,
|
||||
i;
|
||||
|
||||
for (i = this.particles.length - 1; i >= 0; i--) {
|
||||
particle = this.particles[i];
|
||||
startingPositionLeft = particle.$element.data('stellar-startingLeft');
|
||||
startingPositionTop = particle.$element.data('stellar-startingTop');
|
||||
|
||||
this._setPosition(particle.$element, startingPositionLeft, startingPositionLeft, startingPositionTop, startingPositionTop);
|
||||
|
||||
this.options.showElement(particle.$element);
|
||||
|
||||
particle.$element.data('stellar-startingLeft', null).data('stellar-elementIsActive', null).data('stellar-backgroundIsActive', null);
|
||||
}
|
||||
|
||||
for (i = this.backgrounds.length - 1; i >= 0; i--) {
|
||||
background = this.backgrounds[i];
|
||||
|
||||
background.$element.data('stellar-backgroundStartingLeft', null).data('stellar-backgroundStartingTop', null);
|
||||
|
||||
setBackgroundPosition(background.$element, background.startingValueLeft, background.startingValueTop);
|
||||
}
|
||||
},
|
||||
destroy: function() {
|
||||
this._reset();
|
||||
|
||||
this.$scrollElement.unbind('resize.' + this.name).unbind('scroll.' + this.name);
|
||||
this._animationLoop = $.noop;
|
||||
|
||||
$(window).unbind('load.' + this.name).unbind('resize.' + this.name);
|
||||
},
|
||||
_setOffsets: function() {
|
||||
var self = this,
|
||||
$window = $(window);
|
||||
|
||||
$window.unbind('resize.horizontal-' + this.name).unbind('resize.vertical-' + this.name);
|
||||
|
||||
if (typeof this.options.horizontalOffset === 'function') {
|
||||
this.horizontalOffset = this.options.horizontalOffset();
|
||||
$window.bind('resize.horizontal-' + this.name, function() {
|
||||
self.horizontalOffset = self.options.horizontalOffset();
|
||||
});
|
||||
} else {
|
||||
this.horizontalOffset = this.options.horizontalOffset;
|
||||
}
|
||||
|
||||
if (typeof this.options.verticalOffset === 'function') {
|
||||
this.verticalOffset = this.options.verticalOffset();
|
||||
$window.bind('resize.vertical-' + this.name, function() {
|
||||
self.verticalOffset = self.options.verticalOffset();
|
||||
});
|
||||
} else {
|
||||
this.verticalOffset = this.options.verticalOffset;
|
||||
}
|
||||
},
|
||||
_repositionElements: function() {
|
||||
var scrollLeft = this._getScrollLeft(),
|
||||
scrollTop = this._getScrollTop(),
|
||||
horizontalOffset,
|
||||
verticalOffset,
|
||||
particle,
|
||||
fixedRatioOffset,
|
||||
background,
|
||||
bgLeft,
|
||||
bgTop,
|
||||
isVisibleVertical = true,
|
||||
isVisibleHorizontal = true,
|
||||
newPositionLeft,
|
||||
newPositionTop,
|
||||
newOffsetLeft,
|
||||
newOffsetTop,
|
||||
i;
|
||||
|
||||
// First check that the scroll position or container size has changed
|
||||
if (this.currentScrollLeft === scrollLeft && this.currentScrollTop === scrollTop && this.currentWidth === this.viewportWidth && this.currentHeight === this.viewportHeight) {
|
||||
return;
|
||||
} else {
|
||||
this.currentScrollLeft = scrollLeft;
|
||||
this.currentScrollTop = scrollTop;
|
||||
this.currentWidth = this.viewportWidth;
|
||||
this.currentHeight = this.viewportHeight;
|
||||
}
|
||||
|
||||
// Reposition elements
|
||||
for (i = this.particles.length - 1; i >= 0; i--) {
|
||||
particle = this.particles[i];
|
||||
|
||||
fixedRatioOffset = (particle.isFixed ? 1 : 0);
|
||||
|
||||
// Calculate position, then calculate what the particle's new offset will be (for visibility check)
|
||||
if (this.options.horizontalScrolling) {
|
||||
newPositionLeft = (scrollLeft + particle.horizontalOffset + this.viewportOffsetLeft + particle.startingPositionLeft - particle.startingOffsetLeft + particle.parentOffsetLeft) * -(particle.stellarRatio + fixedRatioOffset - 1) + particle.startingPositionLeft;
|
||||
newOffsetLeft = newPositionLeft - particle.startingPositionLeft + particle.startingOffsetLeft;
|
||||
} else {
|
||||
newPositionLeft = particle.startingPositionLeft;
|
||||
newOffsetLeft = particle.startingOffsetLeft;
|
||||
}
|
||||
|
||||
if (this.options.verticalScrolling) {
|
||||
newPositionTop = (scrollTop + particle.verticalOffset + this.viewportOffsetTop + particle.startingPositionTop - particle.startingOffsetTop + particle.parentOffsetTop) * -(particle.stellarRatio + fixedRatioOffset - 1) + particle.startingPositionTop;
|
||||
newOffsetTop = newPositionTop - particle.startingPositionTop + particle.startingOffsetTop;
|
||||
} else {
|
||||
newPositionTop = particle.startingPositionTop;
|
||||
newOffsetTop = particle.startingOffsetTop;
|
||||
}
|
||||
|
||||
// Check visibility
|
||||
if (this.options.hideDistantElements) {
|
||||
isVisibleHorizontal = !this.options.horizontalScrolling || newOffsetLeft + particle.width > (particle.isFixed ? 0 : scrollLeft) && newOffsetLeft < (particle.isFixed ? 0 : scrollLeft) + this.viewportWidth + this.viewportOffsetLeft;
|
||||
isVisibleVertical = !this.options.verticalScrolling || newOffsetTop + particle.height > (particle.isFixed ? 0 : scrollTop) && newOffsetTop < (particle.isFixed ? 0 : scrollTop) + this.viewportHeight + this.viewportOffsetTop;
|
||||
}
|
||||
|
||||
if (isVisibleHorizontal && isVisibleVertical) {
|
||||
if (particle.isHidden) {
|
||||
this.options.showElement(particle.$element);
|
||||
particle.isHidden = false;
|
||||
}
|
||||
|
||||
this._setPosition(particle.$element, newPositionLeft, particle.startingPositionLeft, newPositionTop, particle.startingPositionTop);
|
||||
} else {
|
||||
if (!particle.isHidden) {
|
||||
this.options.hideElement(particle.$element);
|
||||
particle.isHidden = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Reposition backgrounds
|
||||
for (i = this.backgrounds.length - 1; i >= 0; i--) {
|
||||
background = this.backgrounds[i];
|
||||
|
||||
fixedRatioOffset = (background.isFixed ? 0 : 1);
|
||||
bgLeft = (this.options.horizontalScrolling ? (scrollLeft + background.horizontalOffset - this.viewportOffsetLeft - background.startingOffsetLeft + background.parentOffsetLeft - background.startingBackgroundPositionLeft) * (fixedRatioOffset - background.stellarRatio) + 'px' : background.startingValueLeft);
|
||||
bgTop = (this.options.verticalScrolling ? (scrollTop + background.verticalOffset - this.viewportOffsetTop - background.startingOffsetTop + background.parentOffsetTop - background.startingBackgroundPositionTop) * (fixedRatioOffset - background.stellarRatio) + 'px' : background.startingValueTop);
|
||||
|
||||
setBackgroundPosition(background.$element, bgLeft, bgTop);
|
||||
}
|
||||
},
|
||||
_handleScrollEvent: function() {
|
||||
var self = this,
|
||||
ticking = false;
|
||||
|
||||
var update = function() {
|
||||
self._repositionElements();
|
||||
ticking = false;
|
||||
};
|
||||
|
||||
var requestTick = function() {
|
||||
if (!ticking) {
|
||||
requestAnimFrame(update);
|
||||
ticking = true;
|
||||
}
|
||||
};
|
||||
|
||||
this.$scrollElement.bind('scroll.' + this.name, requestTick);
|
||||
requestTick();
|
||||
},
|
||||
_startAnimationLoop: function() {
|
||||
var self = this;
|
||||
|
||||
this._animationLoop = function() {
|
||||
requestAnimFrame(self._animationLoop);
|
||||
self._repositionElements();
|
||||
};
|
||||
this._animationLoop();
|
||||
}
|
||||
};
|
||||
|
||||
$.fn[pluginName] = function (options) {
|
||||
var args = arguments;
|
||||
if (options === undefined || typeof options === 'object') {
|
||||
return this.each(function () {
|
||||
if (!$.data(this, 'plugin_' + pluginName)) {
|
||||
$.data(this, 'plugin_' + pluginName, new Plugin(this, options));
|
||||
}
|
||||
});
|
||||
} else if (typeof options === 'string' && options[0] !== '_' && options !== 'init') {
|
||||
return this.each(function () {
|
||||
var instance = $.data(this, 'plugin_' + pluginName);
|
||||
if (instance instanceof Plugin && typeof instance[options] === 'function') {
|
||||
instance[options].apply(instance, Array.prototype.slice.call(args, 1));
|
||||
}
|
||||
if (options === 'destroy') {
|
||||
$.data(this, 'plugin_' + pluginName, null);
|
||||
}
|
||||
});
|
||||
}
|
||||
};
|
||||
|
||||
$[pluginName] = function(options) {
|
||||
var $window = $(window);
|
||||
return $window.stellar.apply($window, Array.prototype.slice.call(arguments, 0));
|
||||
};
|
||||
|
||||
// Expose the scroll and position property function hashes so they can be extended
|
||||
$[pluginName].scrollProperty = scrollProperty;
|
||||
$[pluginName].positionProperty = positionProperty;
|
||||
|
||||
// Expose the plugin class so it can be modified
|
||||
window.Stellar = Plugin;
|
||||
}(jQuery, this, document));
|
||||
File diff suppressed because one or more lines are too long
|
|
@ -1,46 +0,0 @@
|
|||
{
|
||||
"name": "jquery.stellar",
|
||||
"title": "Stellar.js",
|
||||
"version": "0.6.2",
|
||||
"description": "Parallax scrolling made easy.",
|
||||
"homepage": "http://markdalgleish.com/projects/stellar.js",
|
||||
"author": {
|
||||
"name": "Mark Dalgleish",
|
||||
"url": "http://markdalgleish.com"
|
||||
},
|
||||
"keywords": [
|
||||
"parallax",
|
||||
"scroll",
|
||||
"effect",
|
||||
"animation"
|
||||
],
|
||||
"licenses": [
|
||||
{
|
||||
"type": "MIT",
|
||||
"url": "http://markdalgleish.mit-license.org"
|
||||
}
|
||||
],
|
||||
"dependencies": {
|
||||
"jquery": ">=1.4.3"
|
||||
},
|
||||
"bugs": "https://github.com/markdalgleish/stellar.js/issues",
|
||||
"repository": {
|
||||
"type": "git",
|
||||
"url": "git://github.com/markdalgleish/stellar.js.git"
|
||||
},
|
||||
"maintainers": [
|
||||
{
|
||||
"name": "Mark Dalgleish",
|
||||
"url": "http://markdalgleish.com"
|
||||
}
|
||||
],
|
||||
"files": [
|
||||
"jquery.stellar.js"
|
||||
],
|
||||
"scripts": {
|
||||
"test": "grunt test"
|
||||
},
|
||||
"devDependencies": {
|
||||
"grunt": "~0.3.17"
|
||||
}
|
||||
}
|
||||
|
|
@ -1,29 +0,0 @@
|
|||
{
|
||||
"name": "stellar",
|
||||
"title": "Stellar.js",
|
||||
"version": "0.6.2",
|
||||
"description": "Parallax scrolling made easy.",
|
||||
"homepage": "http://markdalgleish.com/projects/stellar.js",
|
||||
"author": {
|
||||
"name": "Mark Dalgleish",
|
||||
"url": "http://markdalgleish.com"
|
||||
},
|
||||
"keywords": [
|
||||
"parallax",
|
||||
"scroll",
|
||||
"effect",
|
||||
"animation"
|
||||
],
|
||||
"licenses": [
|
||||
{
|
||||
"type": "MIT",
|
||||
"url": "http://markdalgleish.mit-license.org"
|
||||
}
|
||||
],
|
||||
"dependencies": {
|
||||
"jquery": ">=1.4.3"
|
||||
},
|
||||
"bugs": "https://github.com/markdalgleish/stellar.js/issues",
|
||||
"docs": "http://markdalgleish.com/projects/stellar.js/docs",
|
||||
"download": "https://github.com/markdalgleish/stellar.js#download"
|
||||
}
|
||||
|
|
@ -361,8 +361,7 @@ footer {
|
|||
}
|
||||
|
||||
.parallax {
|
||||
background-attachment: fixed;
|
||||
background-size: 100%;
|
||||
position: relative;
|
||||
}
|
||||
.parallax.oe_small {
|
||||
height: 200px;
|
||||
|
|
@ -455,3 +454,24 @@ table.well tr td span {
|
|||
.logo-img {
|
||||
width: 220px;
|
||||
}
|
||||
|
||||
.oe_demo {
|
||||
position: relative;
|
||||
}
|
||||
.oe_demo img {
|
||||
width: 100%;
|
||||
}
|
||||
.oe_demo div {
|
||||
position: absolute;
|
||||
left: 0;
|
||||
background-color: rgba(0, 0, 0, 0.4);
|
||||
opacity: 0.85;
|
||||
bottom: 0px;
|
||||
width: 100%;
|
||||
padding: 7px;
|
||||
color: white;
|
||||
font-weight: bold;
|
||||
}
|
||||
.oe_demo div a {
|
||||
color: white;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -276,8 +276,7 @@ footer
|
|||
background-color: grey
|
||||
|
||||
.parallax
|
||||
background-attachment: fixed
|
||||
background-size: 100%
|
||||
position: relative
|
||||
&.oe_small
|
||||
height: 200px
|
||||
&.oe_medium
|
||||
|
|
@ -347,3 +346,21 @@ table.well tr
|
|||
|
||||
.logo-img
|
||||
width: 220px
|
||||
|
||||
|
||||
.oe_demo
|
||||
position: relative
|
||||
img
|
||||
width: 100%
|
||||
div
|
||||
position: absolute
|
||||
left: 0
|
||||
background-color: rgba(0,0,0,0.4)
|
||||
opacity: 0.85
|
||||
bottom: 0px
|
||||
width: 100%
|
||||
padding: 7px
|
||||
color: white
|
||||
font-weight: bold
|
||||
a
|
||||
color: white
|
||||
|
|
|
|||
Binary file not shown.
|
Before Width: | Height: | Size: 26 KiB After Width: | Height: | Size: 190 KiB |
|
|
@ -402,8 +402,10 @@
|
|||
}
|
||||
});
|
||||
// Adding Static Menus
|
||||
menu.append('<li class="divider"></li><li class="js_change_theme"><a href="/page/website.themes">Change Theme</a></li>');
|
||||
menu.append('<li class="divider"></li><li><a data-action="ace" href="#">HTML Editor</a></li>');
|
||||
menu.append('<li class="divider"></li>');
|
||||
menu.append('<li><a data-action="ace" href="#">HTML Editor</a></li>');
|
||||
menu.append('<li class="js_change_theme"><a href="/page/website.themes">Change Theme</a></li>');
|
||||
menu.append('<li><a href="/web#action=website.action_module_website">Install Apps</a></li>');
|
||||
self.trigger('rte:customize_menu_ready');
|
||||
}
|
||||
);
|
||||
|
|
|
|||
|
|
@ -1,6 +1,21 @@
|
|||
(function () {
|
||||
'use strict';
|
||||
|
||||
|
||||
var start_snippet_animation = function () {
|
||||
hack_to_add_snippet_id();
|
||||
$("[data-snippet-id]").each(function() {
|
||||
var $snipped_id = $(this);
|
||||
if ( !$snipped_id.parents("#oe_snippets").length &&
|
||||
typeof $snipped_id.data("snippet-view") === 'undefined' &&
|
||||
website.snippet.animationRegistry[$snipped_id.data("snippet-id")]) {
|
||||
var snippet = new website.snippet.animationRegistry[$snipped_id.data("snippet-id")]($snipped_id);
|
||||
$snipped_id.data("snippet-view", snippet);
|
||||
}
|
||||
});
|
||||
};
|
||||
$(document).ready(start_snippet_animation);
|
||||
|
||||
var website = openerp.website;
|
||||
website.add_template_file('/website/static/src/xml/website.snippets.xml');
|
||||
|
||||
|
|
@ -22,8 +37,10 @@
|
|||
window.snippets = this.snippets = new website.snippet.BuildingBlock(this);
|
||||
this.snippets.appendTo(this.$el);
|
||||
|
||||
this.rte.on('rte:ready', this, function () {
|
||||
this.on('rte:ready', this, function () {
|
||||
self.snippets.$button.removeClass("hidden");
|
||||
start_snippet_animation();
|
||||
self.trigger('rte:snippets_ready');
|
||||
});
|
||||
|
||||
return this._super.apply(this, arguments);
|
||||
|
|
@ -39,20 +56,8 @@
|
|||
},
|
||||
});
|
||||
|
||||
|
||||
$(document).ready(function () {
|
||||
hack_to_add_snippet_id();
|
||||
$("[data-snippet-id]").each(function() {
|
||||
var $snipped_id = $(this);
|
||||
if (typeof $snipped_id.data("snippet-view") === 'undefined' &&
|
||||
website.snippet.animationRegistry[$snipped_id.data("snippet-id")]) {
|
||||
$snipped_id.data("snippet-view", new website.snippet.animationRegistry[$snipped_id.data("snippet-id")]($snipped_id));
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
/* ----- SNIPPET SELECTOR ---- */
|
||||
|
||||
|
||||
website.snippet = {};
|
||||
var observer = new website.Observer(function (mutations) {
|
||||
if (!_(mutations).find(function (m) {
|
||||
|
|
@ -504,7 +509,7 @@
|
|||
console.debug( "A good node must have a [data-oe-model] attribute or must have at least one parent with [data-oe-model] attribute.");
|
||||
console.debug( "Wrong node(s): ", selector);
|
||||
}
|
||||
|
||||
|
||||
function is_visible($el){
|
||||
return $el.css('display') != 'none'
|
||||
&& $el.css('opacity') != '0'
|
||||
|
|
@ -519,7 +524,7 @@
|
|||
var parents = $(this).parents().filter(function(){ return !is_visible($(this)); });
|
||||
return parents.length === 0;
|
||||
});
|
||||
|
||||
|
||||
$targets.each(function () {
|
||||
var $target = $(this);
|
||||
if (!$target.data('overlay')) {
|
||||
|
|
@ -558,13 +563,13 @@
|
|||
start: function () {
|
||||
},
|
||||
/* onFocusEdit
|
||||
* if they are an editor for this data-snippet-id
|
||||
* if they are an editor for this data-snippet-id
|
||||
* Called before onFocus of snippet editor
|
||||
*/
|
||||
onFocusEdit : function () {},
|
||||
|
||||
/* onBlurEdit
|
||||
* if they are an editor for this data-snippet-id
|
||||
* if they are an editor for this data-snippet-id
|
||||
* Called after onBlur of snippet editor
|
||||
*/
|
||||
onBlurEdit : function () {},
|
||||
|
|
@ -665,7 +670,7 @@
|
|||
});
|
||||
|
||||
$("body").addClass('move-important');
|
||||
|
||||
|
||||
self._drag_and_drop_after_insert_dropzone();
|
||||
self._drag_and_drop_active_drop_zone($('.oe_drop_zone'));
|
||||
},
|
||||
|
|
@ -775,7 +780,7 @@
|
|||
* This method is called when the user click inside the snippet in the dom
|
||||
*/
|
||||
onFocus : function () {
|
||||
this.$overlay.addClass('oe_active').effect('bounce', {distance: 18, times: 5}, 250);
|
||||
this.$overlay.addClass('oe_active');
|
||||
},
|
||||
|
||||
/* onFocus
|
||||
|
|
@ -855,7 +860,7 @@
|
|||
if (!resize_values.s) $box.find(".oe_handle.s").remove();
|
||||
if (!resize_values.e) $box.find(".oe_handle.e").remove();
|
||||
if (!resize_values.w) $box.find(".oe_handle.w").remove();
|
||||
|
||||
|
||||
this.$overlay.append($box.find(".oe_handles").html());
|
||||
|
||||
this.$overlay.find(".oe_handle").on('mousedown', function (event){
|
||||
|
|
@ -1111,7 +1116,7 @@
|
|||
var index = $active.index();
|
||||
this.$target.find('.carousel-control, .carousel-indicators').removeClass("hidden");
|
||||
this.$indicators.append('<li data-target="#' + this.id + '" data-slide-to="' + cycle + '"></li>');
|
||||
|
||||
|
||||
var $clone = this.$el.find(".item.active").clone();
|
||||
var bg = this.$editor.find('ul[name="carousel-background"] li:not([data-value="'+ $active.css("background-image").replace(/.*:\/\/[^\/]+|\)$/g, '') +'"]):first').data("value");
|
||||
$clone.css("background-image", "url('"+ bg +"')");
|
||||
|
|
@ -1207,24 +1212,23 @@
|
|||
website.snippet.editorRegistry.parallax = website.snippet.editorRegistry.resize.extend({
|
||||
start : function () {
|
||||
this._super();
|
||||
this.change_background($('.parallax', this.$target), 'ul[name="parallax-background"]');
|
||||
this.change_background(this.$target, 'ul[name="parallax-background"]');
|
||||
this.scroll();
|
||||
this.change_size();
|
||||
},
|
||||
scroll: function(){
|
||||
scroll: function () {
|
||||
var self = this;
|
||||
var $ul = this.$editor.find('ul[name="parallax-scroll"]');
|
||||
var $li = $ul.find("li");
|
||||
var $parallax = this.$target.find('.parallax');
|
||||
var speed = $parallax.data('stellar-background-ratio') || 0.5 ;
|
||||
|
||||
var speed = this.$target.data('scroll-background-ratio') || 0.6 ;
|
||||
$ul.find('[data-value="' + speed + '"]').addClass('active');
|
||||
$li.on('click', function (event) {
|
||||
$li.removeClass("active");
|
||||
$(this).addClass("active");
|
||||
var speed = $(this).data('value');
|
||||
$parallax.attr('data-stellar-background-ratio', speed);
|
||||
self.$target.attr('data-scroll-background-ratio', speed);
|
||||
self.$target.data("snippet-view").set_values();
|
||||
});
|
||||
|
||||
},
|
||||
clean_for_save: function () {
|
||||
this._super();
|
||||
|
|
@ -1232,12 +1236,11 @@
|
|||
},
|
||||
change_size: function () {
|
||||
var self = this;
|
||||
var $el = $('.oe_big,.oe_medium,.oe_small', this.$target);
|
||||
|
||||
var size = 'oe_big';
|
||||
if ($el.hasClass('oe_small'))
|
||||
if (this.$target.hasClass('oe_small'))
|
||||
size = 'oe_small';
|
||||
else if ($el.hasClass('oe_medium'))
|
||||
else if (this.$target.hasClass('oe_medium'))
|
||||
size = 'oe_medium';
|
||||
var $ul = this.$editor.find('ul[name="parallax-size"]');
|
||||
var $li = $ul.find("li");
|
||||
|
|
@ -1247,21 +1250,50 @@
|
|||
$li.on('click', function (event) {
|
||||
$li.removeClass("active");
|
||||
$(this).addClass("active");
|
||||
self.$target.data("snippet-view").set_values();
|
||||
})
|
||||
.on('mouseover', function (event) {
|
||||
$el.removeClass('oe_big oe_small oe_medium');
|
||||
$el.addClass($(event.currentTarget).data("value"));
|
||||
self.$target.removeClass('oe_big oe_small oe_medium');
|
||||
self.$target.addClass($(event.currentTarget).data("value"));
|
||||
})
|
||||
.on('mouseout', function (event) {
|
||||
$el.removeClass('oe_big oe_small oe_medium');
|
||||
$el.addClass($ul.find('li.active').data("value"));
|
||||
self.$target.removeClass('oe_big oe_small oe_medium');
|
||||
self.$target.addClass($ul.find('li.active').data("value"));
|
||||
});
|
||||
}
|
||||
});
|
||||
website.snippet.animationRegistry.parallax = website.snippet.Animation.extend({
|
||||
start: function () {
|
||||
$.stellar({ horizontalScrolling: false, verticalOffset: 0 });
|
||||
var self = this;
|
||||
this.set_values();
|
||||
var on_scroll = function () {
|
||||
var speed = parseFloat(self.$target.attr("data-scroll-background-ratio") || 0);
|
||||
if (speed == 1) return;
|
||||
var offset = parseFloat(self.$target.attr("data-scroll-background-offset") || 0);
|
||||
var top = offset + window.scrollY * speed;
|
||||
self.$target.css("background-position", "0px " + top + "px");
|
||||
};
|
||||
$(window).off("scroll").on("scroll", on_scroll);
|
||||
},
|
||||
set_values: function () {
|
||||
var self = this;
|
||||
var speed = parseFloat(self.$target.attr("data-scroll-background-ratio") || 0);
|
||||
|
||||
if (speed == 1) {
|
||||
this.$target.css("background-attachment", "fixed").css("background-position", "0px 0px");
|
||||
return;
|
||||
} else {
|
||||
this.$target.css("background-attachment", "scroll");
|
||||
}
|
||||
|
||||
this.$target.attr("data-scroll-background-offset", 0);
|
||||
var img = new Image();
|
||||
img.onload = function () {
|
||||
self.$target.attr("data-scroll-background-offset", self.$target.outerHeight() - this.height);
|
||||
$(window).scroll();
|
||||
};
|
||||
img.src = this.$target.css("background-image").replace(/url\(['"]*|['"]*\)/g, "");
|
||||
}
|
||||
});
|
||||
|
||||
/*
|
||||
|
|
|
|||
|
|
@ -24,10 +24,14 @@
|
|||
stepId: 'edit-page',
|
||||
element: 'button[data-action=edit]',
|
||||
placement: 'bottom',
|
||||
reflex: true,
|
||||
title: "Edit this page",
|
||||
content: "Every page of your website can be modified through the <i>Edit</i> button.",
|
||||
template: render('website.tour_popover'),
|
||||
onShow: function () {
|
||||
editor.on('rte:snippets_ready', editor, function() {
|
||||
self.movetoStep('add-block');
|
||||
});
|
||||
},
|
||||
},
|
||||
{
|
||||
stepId: 'add-block',
|
||||
|
|
@ -37,11 +41,6 @@
|
|||
content: "To add content in a page, you can insert building blocks.",
|
||||
template: render('website.tour_popover'),
|
||||
onShow: function () {
|
||||
function refreshAddBlockStep () {
|
||||
self.tour.showStep(self.indexOfStep('add-block'));
|
||||
editor.off('rte:ready', editor, refreshAddBlockStep);
|
||||
}
|
||||
editor.on('rte:ready', editor, refreshAddBlockStep);
|
||||
$('button[data-action=snippet]').click(function () {
|
||||
self.movetoStep('drag-banner');
|
||||
});
|
||||
|
|
|
|||
|
|
@ -21,14 +21,19 @@
|
|||
<ul class="nav navbar-nav navbar-right">
|
||||
<li><a data-action="show-mobile-preview" href="#"><span title="Mobile preview" class="icon-mobile-phone"/></a></li>
|
||||
<li class="divider-vertical"></li>
|
||||
<li><a data-action="promote-current-page" href="#"><span title="Promote page on the web">Promote</span></a></li>
|
||||
<li class="dropdown js_hide_on_translate">
|
||||
<a class="dropdown-toggle" data-toggle="dropdown" href="#">Structure <span class="caret"></span></a>
|
||||
<a class="dropdown-toggle" data-toggle="dropdown" href="#">Content <span class="caret"></span></a>
|
||||
<ul class="dropdown-menu" role="menu">
|
||||
<li><a data-action="edit-structure" href="#"><span title="Edit Top Menu">Top Menu</span></a></li>
|
||||
<!-- <a data-action="edit-footer" href="#"><span title="Edit Footer">Footer</span></a></li> -->
|
||||
<li><a data-action="edit-structure" href="#"><span title="Edit Top Menu">Edit Menu</span></a></li>
|
||||
<li class="divider"> </li>
|
||||
<li><a href="">New Page</a></li> <!-- Todo: Implement with inheritancy in each module-->
|
||||
<li><a href="">New Blog Post</a></li>
|
||||
<li><a href="">New Event</a></li>
|
||||
<li><a href="">New Job Offer</a></li>
|
||||
<li><a href="">New Product</a></li>
|
||||
</ul>
|
||||
</li>
|
||||
<li><a data-action="promote-current-page" href="#"><span title="Promote page on the web">Promote</span></a></li>
|
||||
<li class="dropdown js_hide_on_translate">
|
||||
<a id="customize-menu-button" class="dropdown-toggle" data-toggle="dropdown" href="#">Customize <span class="caret"></span></a>
|
||||
<ul class="dropdown-menu" role="menu" id="customize-menu">
|
||||
|
|
@ -41,9 +46,6 @@
|
|||
<!-- filled in JS -->
|
||||
</ul>
|
||||
</li>
|
||||
<li>
|
||||
<a href="/web#action=website.action_module_website">Apps</a>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -691,10 +691,9 @@
|
|||
<ul class="dropdown-menu" name="parallax-background">
|
||||
<li data-value="/website/static/src/img/banner/greenfields.jpg"><a>Greenfields</a></li>
|
||||
<li data-value="/website/static/src/img/banner/landscape.jpg"><a>Landscape</a></li>
|
||||
<li data-value="/website/static/src/img/parallax/parallax_photo1.jpg"><a>Photo Woman</a></li>
|
||||
<li data-value="/website/static/src/img/banner/mountains.jpg"><a>Mountains</a></li>
|
||||
<li data-value="/website/static/src/img/parallax/parallax_bg.jpg"><a>Office</a></li>
|
||||
<li class="oe_custom_bg"><a><b>Chose your picture</b></a></li>
|
||||
<li class="oe_custom_bg"><a><b>Choose your picture</b></a></li>
|
||||
</ul>
|
||||
</li>
|
||||
<li class="oe_snippet_options dropdown-submenu">
|
||||
|
|
@ -708,10 +707,9 @@
|
|||
<li data-value="2"><a>Very Fast</a></li>
|
||||
</ul>
|
||||
</li>
|
||||
<div class="oe_snippet_body" style="position:relative">
|
||||
<div class="parallax oe_structure oe_small" style="background-image: url('/website/static/src/img/parallax/parallax_photo1.jpg')" data-stellar-background-ratio="0.3">
|
||||
|
||||
</div>
|
||||
<div class="oe_snippet_body parallax oe_small oe_structure"
|
||||
style="background-image: url('/website/static/src/img/parallax/parallax_bg.jpg')"
|
||||
data-scroll-background-ratio="0.6">
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
|
|
|||
|
|
@ -76,7 +76,6 @@
|
|||
<script type="text/javascript" src="/web/static/lib/qweb/qweb2.js"></script>
|
||||
<script type="text/javascript" src="/web/static/src/js/openerpframework.js"></script>
|
||||
|
||||
<script type="text/javascript" src="/website/static/lib/stellar/jquery.stellar.js"></script>
|
||||
<script type="text/javascript" src="/website/static/src/js/website.js"></script>
|
||||
|
||||
<t t-if="editable">
|
||||
|
|
@ -118,19 +117,13 @@
|
|||
<span class="icon-bar"></span>
|
||||
<span class="icon-bar"></span>
|
||||
</button>
|
||||
<a class="navbar-brand" href="/"><em>Your</em> <b>Company</b></a>
|
||||
<a class="navbar-brand" href="/">Your<b>Company</b></a>
|
||||
</div>
|
||||
<div class="collapse navbar-collapse navbar-top-collapse">
|
||||
<ul class="nav navbar-nav navbar-right" id="top_menu">
|
||||
<t t-foreach="website.get_menu().child_id" t-as="submenu">
|
||||
<t t-call="website.submenu"/>
|
||||
</t>
|
||||
|
||||
<li class="active" t-if="user_id.id == website.public_user.id">
|
||||
<a t-attf-href="/web#redirect=#{ url_for('') }">
|
||||
Sign in
|
||||
</a>
|
||||
</li>
|
||||
<li class="active dropdown" t-ignore="true" t-if="user_id.id != website.public_user.id">
|
||||
<a href="#" class="dropdown-toggle" data-toggle="dropdown">
|
||||
<span t-esc="user_id.name"/>
|
||||
|
|
@ -225,6 +218,16 @@
|
|||
</html>
|
||||
</template>
|
||||
|
||||
<template id="show_sign_in" inherit_option_id="website.layout" inherit_id="website.layout" name="Show Sign In">
|
||||
<xpath expr="//ul[@id='top_menu']" position="inside">
|
||||
<li class="active" t-if="user_id.id == website.public_user.id">
|
||||
<a t-attf-href="/web#redirect=#{ url_for('') }">
|
||||
Sign in
|
||||
</a>
|
||||
</li>
|
||||
</xpath>
|
||||
</template>
|
||||
|
||||
<template id="footer_custom" inherit_option_id="website.layout" name="Custom Footer">
|
||||
<xpath expr="//div[@id='footer_container']" position="before">
|
||||
<div class="oe_structure">
|
||||
|
|
@ -502,25 +505,23 @@ Sitemap: <t t-esc="url_root"/>sitemap.xml
|
|||
|
||||
<template id="aboutus" name="About us" page="True">
|
||||
<t t-call="website.layout">
|
||||
<div id="wrap">
|
||||
<div data-snippet-id="parallax">
|
||||
<div style="background-image: url('/website/static/src/img/parallax/parallax_bg.jpg')" data-stellar-background-ratio="0.3" class="parallax oe_structure mt32 mb32 oe_small">
|
||||
<div class="container">
|
||||
<div class="row">
|
||||
<div class="col-md-12 mt32 mb32" data-snippet-id="colmd">
|
||||
<div class="text-center">
|
||||
<img src="/web/static/src/img/logo.png" class="img shadow logo-img"/>
|
||||
</div>
|
||||
<h3 class="text-center text-muted" t-field="res_company.rml_header1"></h3>
|
||||
</div>
|
||||
</div>
|
||||
<div id="wrap" class="oe_structure">
|
||||
|
||||
<section data-snippet-id="title">
|
||||
<div class="container">
|
||||
<div class="row">
|
||||
<div class="col-md-12">
|
||||
<h1 class="text-center">About us</h1>
|
||||
<h3 class="text-muted text-center">Great products for great people</h3>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="oe_structure"/>
|
||||
<div class="container mb32">
|
||||
<div class="row col-wrap" id="aboutus">
|
||||
<div class="col-sm-8 mt16">
|
||||
</section>
|
||||
|
||||
<section data-snippet-id="text-image">
|
||||
<div class="container">
|
||||
<div class="row">
|
||||
<div class="col-md-6 mt32">
|
||||
<p>
|
||||
We are a team of passionated people whose goal is to improve everyone's
|
||||
life through disruptive products. We build great products to solve your
|
||||
|
|
@ -531,12 +532,37 @@ Sitemap: <t t-esc="url_root"/>sitemap.xml
|
|||
their performance.
|
||||
</p>
|
||||
</div>
|
||||
<div class="col-sm-3 col-sm-offset-1">
|
||||
<img src="/website/static/src/img/library/business_conference.jpg" class="img img-responsive shadow" alt="Out Team"/>
|
||||
<div class="col-md-4 col-md-offset-2 mt16 mb16">
|
||||
<img src="/website/static/src/img/library/business_conference.jpg" class="img img-responsive shadow" alt="Our Team"/>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="oe_structure"/>
|
||||
</section>
|
||||
|
||||
<div class="parallax oe_structure mt16 oe_medium mb64" data-scroll-background-offset="0" data-scroll-background-ratio="1" data-snippet-id="parallax" style="background-image: url(http://localhost:8069/website/static/src/img/parallax/parallax_bg.jpg); background-attachment: scroll; background-position: 0px 0px; ">
|
||||
<section class="mb32 mt16" data-snippet-id="references">
|
||||
<div class="container">
|
||||
<div class="row">
|
||||
<div class="col-md-12 mt16 mb8">
|
||||
<h1 class="text-center">What do customers say about us...</h1>
|
||||
</div>
|
||||
<div class="col-md-4 col-md-offset-1 mt16 mb0">
|
||||
<blockquote data-snippet-id="quote">
|
||||
<p><span style="background-color:#FFFFFF;">Write here a quote from one of your customer. Quotes are are great way to give confidence in your products or services.</span></p>
|
||||
<small><span style="background-color:#FFFFFF;">Author of this quote</span></small>
|
||||
</blockquote>
|
||||
</div>
|
||||
<div class="col-md-4 col-md-offset-2 mt16 mb32">
|
||||
<blockquote data-snippet-id="quote">
|
||||
<p><span style="background-color:#FFFFFF;">OpenERP provides essential platform for our project management. Things are better organized and more visible with it.</span></p>
|
||||
<small><span style="background-color:#FFFFFF;">John Doe, CEO</span></small>
|
||||
</blockquote>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</t>
|
||||
</template>
|
||||
|
|
|
|||
|
|
@ -45,9 +45,6 @@
|
|||
</div>
|
||||
<group>
|
||||
<group string="Social Icons">
|
||||
<p class="oe_grey" colspan="2">
|
||||
Keep these fields empty to not show the related social icon.
|
||||
</p>
|
||||
<field name="social_twitter" placeholder="https://twitter.com/openerp"/>
|
||||
<field name="social_facebook" placeholder="https://facebook.com/openerp"/>
|
||||
<field name="social_googleplus" placeholder="https://plus.google.com/+openerp"/>
|
||||
|
|
|
|||
|
|
@ -35,24 +35,23 @@ class WebsiteBlog(http.Controller):
|
|||
|
||||
@website.route([
|
||||
'/blog/',
|
||||
'/blog/<int:blog_post_id>/',
|
||||
'/blog/<int:blog_post_id>/page/<int:page>/',
|
||||
'/blog/cat/<int:category_id>/',
|
||||
'/blog/cat/<int:category_id>/page/<int:page>/',
|
||||
'/blog/tag/',
|
||||
'/blog/tag/<int:tag_id>/',
|
||||
'/blog/page/<int:page>/',
|
||||
'/blog/<model("blog.post"):blog_post>/',
|
||||
'/blog/<model("blog.post"):blog_post>/page/<int:page>/',
|
||||
'/blog/cat/<model("blog.category"):category>/',
|
||||
'/blog/cat/<model("blog.category"):category>/page/<int:page>/',
|
||||
'/blog/tag/<model("blog.tag"):tag>/',
|
||||
'/blog/tag/<model("blog.tag"):tag>/page/<int:page>/',
|
||||
], type='http', auth="public", multilang=True)
|
||||
def blog(self, category_id=None, blog_post_id=None, tag_id=None, page=1, **post):
|
||||
def blog(self, category=None, blog_post=None, tag=None, page=1, enable_editor=None):
|
||||
""" Prepare all values to display the blog.
|
||||
|
||||
:param integer category_id: id of the category currently browsed.
|
||||
:param integer tag_id: id of the tag that is currently used to filter
|
||||
blog posts
|
||||
:param integer blog_post_id: ID of the blog post currently browsed. If not
|
||||
set, the user is browsing the category and
|
||||
a post pager is calculated. If set the user
|
||||
is reading the blog post and a comments pager
|
||||
is calculated.
|
||||
:param category: category currently browsed.
|
||||
:param tag: tag that is currently used to filter blog posts
|
||||
:param blog_post: blog post currently browsed. If not set, the user is
|
||||
browsing the category and a post pager is calculated.
|
||||
If set the user is reading the blog post and a
|
||||
comments pager is calculated.
|
||||
:param integer page: current page of the pager. Can be the category or
|
||||
post pager.
|
||||
:param dict post: kwargs, may contain
|
||||
|
|
@ -73,44 +72,39 @@ class WebsiteBlog(http.Controller):
|
|||
"""
|
||||
cr, uid, context = request.cr, request.uid, request.context
|
||||
blog_post_obj = request.registry['blog.post']
|
||||
tag_obj = request.registry['blog.tag']
|
||||
category_obj = request.registry['blog.category']
|
||||
|
||||
tag = None
|
||||
category = None
|
||||
blog_post = None
|
||||
blog_posts = None
|
||||
pager = None
|
||||
nav = {}
|
||||
|
||||
category_ids = category_obj.search(cr, uid, [], context=context)
|
||||
categories = category_obj.browse(cr, uid, category_ids, context=context)
|
||||
|
||||
if tag_id:
|
||||
tag = tag_obj.browse(cr, uid, tag_id, context=context)
|
||||
if category_id:
|
||||
category = category_obj.browse(cr, uid, category_id, context=context)
|
||||
elif blog_post_id:
|
||||
blog_post = blog_post_obj.browse(cr, uid, blog_post_id, context=context)
|
||||
blog_message_ids = blog_post.website_message_ids
|
||||
if blog_post:
|
||||
category = blog_post.category_id
|
||||
category_id = category.id
|
||||
|
||||
if not blog_post_id:
|
||||
if category and tag:
|
||||
blog_posts = [cat_post for cat_post in category.blog_post_ids
|
||||
if tag_id in [post_tag.id for post_tag in cat_post.tag_ids]]
|
||||
elif category:
|
||||
pager = request.website.pager(
|
||||
url="/blog/%s/" % blog_post.id,
|
||||
total=len(blog_post.website_message_ids),
|
||||
page=page,
|
||||
step=self._post_comment_per_page,
|
||||
scope=7
|
||||
)
|
||||
pager_begin = (page - 1) * self._post_comment_per_page
|
||||
pager_end = page * self._post_comment_per_page
|
||||
blog_post.website_message_ids = blog_post.website_message_ids[pager_begin:pager_end]
|
||||
else:
|
||||
if category:
|
||||
pager_url = "/blog/cat/%s/" % category.id
|
||||
blog_posts = category.blog_post_ids
|
||||
elif tag:
|
||||
pager_url = '/blog/tag/%s/' % tag.id
|
||||
blog_posts = tag.blog_post_ids
|
||||
else:
|
||||
pager_url = '/blog/'
|
||||
blog_post_ids = blog_post_obj.search(cr, uid, [], context=context)
|
||||
blog_posts = blog_post_obj.browse(cr, uid, blog_post_ids, context=context)
|
||||
|
||||
if blog_posts:
|
||||
pager = request.website.pager(
|
||||
url="/blog/cat/%s/" % category_id,
|
||||
url=pager_url,
|
||||
total=len(blog_posts),
|
||||
page=page,
|
||||
step=self._category_post_per_page,
|
||||
|
|
@ -120,19 +114,9 @@ class WebsiteBlog(http.Controller):
|
|||
pager_end = page * self._category_post_per_page
|
||||
blog_posts = blog_posts[pager_begin:pager_end]
|
||||
|
||||
if blog_post:
|
||||
pager = request.website.pager(
|
||||
url="/blog/%s/" % blog_post_id,
|
||||
total=len(blog_message_ids),
|
||||
page=page,
|
||||
step=self._post_comment_per_page,
|
||||
scope=7
|
||||
)
|
||||
pager_begin = (page - 1) * self._post_comment_per_page
|
||||
pager_end = page * self._post_comment_per_page
|
||||
blog_post.website_message_ids = blog_post.website_message_ids[pager_begin:pager_end]
|
||||
|
||||
nav = {}
|
||||
for group in blog_post_obj.read_group(cr, uid, [], ['name', 'create_date'], groupby="create_date", orderby="create_date asc", context=context):
|
||||
# FIXME: vietnamese month names contain spaces. Set sail for fail.
|
||||
year = group['create_date'].split(" ")[1]
|
||||
if not year in nav:
|
||||
nav[year] = {'name': year, 'create_date_count': 0, 'months': []}
|
||||
|
|
@ -147,7 +131,7 @@ class WebsiteBlog(http.Controller):
|
|||
'blog_posts': blog_posts,
|
||||
'pager': pager,
|
||||
'nav_list': nav,
|
||||
'enable_editor': post.get('enable_editor')
|
||||
'enable_editor': enable_editor,
|
||||
}
|
||||
|
||||
if blog_post:
|
||||
|
|
|
|||
|
|
@ -79,13 +79,14 @@ class website_event(http.Controller):
|
|||
]
|
||||
|
||||
# search domains
|
||||
current_date = dates[0][1]
|
||||
current_date = None
|
||||
current_type = None
|
||||
current_country = None
|
||||
for date in dates:
|
||||
if searches["date"] == date[0]:
|
||||
domain_search["date"] = date[2]
|
||||
current_date = date[1]
|
||||
if date[0] != 'all':
|
||||
current_date = date[1]
|
||||
if searches["type"] != 'all':
|
||||
current_type = type_obj.browse(cr, uid, int(searches['type']), context=context)
|
||||
domain_search["type"] = [("type", "=", int(searches["type"]))]
|
||||
|
|
|
|||
|
|
@ -13,21 +13,20 @@
|
|||
<template id="index" name="Events">
|
||||
<t t-call="website.layout">
|
||||
<div id="wrap">
|
||||
<div class="oe_structure"/>
|
||||
<div class="container">
|
||||
<div class="oe_structure"/>
|
||||
<h1 class="text-center">
|
||||
Our Events
|
||||
Next Events
|
||||
</h1>
|
||||
<h3 class="text-center text-muted">
|
||||
<t t-esc="current_date"/><t t-if="current_type">,
|
||||
<t t-esc="current_type.name"/></t><t t-if="current_country">,
|
||||
<t t-esc="current_date or ''"/><span t-if="current_type"><t t-if="current_date">,</t>
|
||||
<t t-esc="current_type.name"/></span><span t-if="current_country"><t t-if="current_type or current_date">,</t>
|
||||
<t t-esc="current_country.name"/>
|
||||
</t>
|
||||
</span>
|
||||
</h3>
|
||||
<div class="row mt16 mb32">
|
||||
<div class="col-md-3 col-sm-4 css_noprint" id="left_column">
|
||||
<ul class="nav nav-pills nav-stacked">
|
||||
<li class="nav-header">Date</li>
|
||||
<t t-foreach="dates" t-as="date">
|
||||
<li t-att-class="searches.get('date') == date[0] and 'active' or ''" t-if="date[3]">
|
||||
<a t-href="/event/#{ search_path }&date=#{ date[0] }"><t t-esc="date[1]"/>
|
||||
|
|
@ -37,7 +36,7 @@
|
|||
</t>
|
||||
</ul>
|
||||
</div>
|
||||
<div class="col-sm-8 col-md-9">
|
||||
<div class="col-sm-7 col-md-6" id="middle_column">
|
||||
<t t-call="website.pager" >
|
||||
<t t-set="classname">pull-left</t>
|
||||
</t>
|
||||
|
|
@ -45,17 +44,11 @@
|
|||
</div>
|
||||
<ul class="media-list">
|
||||
<li t-foreach="event_ids" t-as="event" class="media" data-publish="">
|
||||
<t t-call="website.publish_management">
|
||||
<t t-set="object" t-value="event"/>
|
||||
<t t-set="publish_controller">/event/publish</t>
|
||||
</t>
|
||||
<div class="media-body">
|
||||
<span t-if="not event.event_ticket_ids" class="label label-danger pull-right">Registration Closed</span>
|
||||
<t t-if="event.event_ticket_ids">
|
||||
<span t-if="event.register_avail == 9999" class="label label-default pull-right label-info">Tickets Available</span>
|
||||
<span t-if="not event.register_avail" class="label label-danger pull-right">Sold Out</span>
|
||||
<span t-if="event.register_avail and event.register_avail != 9999" t-attf-class="label label-default pull-right label-#{ event.register_avail <= 10 and 'warning' or 'info' }">
|
||||
Tickets Available
|
||||
<span t-if="event.register_avail and event.register_avail <= ((event.register_max or 0) / 4)" class="label pull-right label-info">
|
||||
Only <t t-esc="event.register_avail"/> Remaining
|
||||
</span>
|
||||
</t>
|
||||
<h4 class="media-heading"><a t-href="/event/#{ event.id }/"><span t-field="event.name"> </span></a></h4>
|
||||
|
|
@ -76,6 +69,10 @@
|
|||
</div>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
<div class="col-sm-2 col-md-3 oe_structure" id="right_column">
|
||||
|
||||
|
||||
</div>
|
||||
<div class="col-md-8 col-lg-offset-4 text-center">
|
||||
<t t-call="website.pager" />
|
||||
|
|
@ -87,10 +84,45 @@
|
|||
</t>
|
||||
</template>
|
||||
|
||||
<template id="event_category" inherit_id="website_event.index" inherit_option_id="website_event.index" name="Category">
|
||||
<template id="event_right_photos" inherit_id="website_event.index" inherit_option_id="website_event.index" name="Photos">
|
||||
<xpath expr="//div[@id='right_column']" position="inside">
|
||||
<div class="row">
|
||||
<div class="col-md-12 mb16">
|
||||
<div class="oe_demo">
|
||||
<img src="http://ebmedia.eventbrite.com/s3-build/17022-rc2013-11-04-acfb89e/django/images/pages/home/featcats_bizpro.jpg"/>
|
||||
<div class="text-center"><a href="/">Photos of Events</a></div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-12 mb16">
|
||||
<div class="oe_demo">
|
||||
<img src="http://ebmedia.eventbrite.com/s3-build/17022-rc2013-11-04-acfb89e/django/images/pages/home/featcats_bizpro.jpg"/>
|
||||
<div class="text-center"><a href="/">Customer Quotes</a></div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</xpath>
|
||||
</template>
|
||||
|
||||
<template id="event_right_quotes" inherit_id="website_event.index" inherit_option_id="website_event.index" name="Quotes">
|
||||
<xpath expr="//div[@id='right_column']" position="inside">
|
||||
<div class="row">
|
||||
<div class="col-md-12 mb16">
|
||||
<blockquote class="oe_snippet_body">
|
||||
<p>
|
||||
Write here a quote from one of your attendees.
|
||||
It gives confidence in your
|
||||
events.
|
||||
</p>
|
||||
<small>Author</small>
|
||||
</blockquote>
|
||||
</div>
|
||||
</div>
|
||||
</xpath>
|
||||
</template>
|
||||
|
||||
<template id="event_category" inherit_id="website_event.index" inherit_option_id="website_event.index" name="Filter by Category">
|
||||
<xpath expr="//div[@id='left_column']" position="inside">
|
||||
<ul class="nav nav-pills nav-stacked mt32">
|
||||
<li class="nav-header">Category</li>
|
||||
<t t-foreach="types">
|
||||
<li t-if="type" t-att-class="searches.get('type') == str(type and type[0]) and 'active' or ''">
|
||||
<a t-href="/event/#{ search_path }&type=#{ type[0] }"><t t-esc="type[1]"/>
|
||||
|
|
@ -101,10 +133,9 @@
|
|||
</ul>
|
||||
</xpath>
|
||||
</template>
|
||||
<template id="event_location" inherit_id="website_event.index" inherit_option_id="website_event.index" name="Location">
|
||||
<template id="event_location" inherit_id="website_event.index" inherit_option_id="website_event.index" name="Filter by Country">
|
||||
<xpath expr="//div[@id='left_column']" position="inside">
|
||||
<ul class="nav nav-pills nav-stacked mt32">
|
||||
<li class="nav-header">Location</li>
|
||||
<t t-foreach="countries">
|
||||
<li t-if="country_id" t-att-class="searches.get('country') == str(country_id and country_id[0]) and 'active' or ''">
|
||||
<a t-href="/event/#{ search_path }&country=#{ country_id[0] }"><t t-esc="country_id[1]"/>
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ import base64
|
|||
class website_hr_recruitment(http.Controller):
|
||||
|
||||
@website.route(['/jobs', '/jobs/page/<int:page>/', '/department/<id>/', '/department/<id>/page/<int:page>/'], type='http', auth="public", multilang=True)
|
||||
def jobs(self, id=0, page=1, **post):
|
||||
def jobs(self, id=0, page=1):
|
||||
id = id and int(id) or 0
|
||||
hr_job_obj = request.registry['hr.job']
|
||||
hr_department_obj = request.registry['hr.department']
|
||||
|
|
@ -51,7 +51,7 @@ class website_hr_recruitment(http.Controller):
|
|||
return request.website.render("website_hr_recruitment.index", values)
|
||||
|
||||
@website.route(['/job/detail/<model("hr.job"):job>'], type='http', auth="public", multilang=True)
|
||||
def detail(self, job=None, **kwargs):
|
||||
def detail(self, job):
|
||||
values = {
|
||||
'job': job,
|
||||
'vals_date': job.write_date.split(' ')[0],
|
||||
|
|
@ -77,7 +77,7 @@ class website_hr_recruitment(http.Controller):
|
|||
return request.website.render("website_hr_recruitment.thankyou", values)
|
||||
|
||||
@website.route(['/apply/<model("hr.job"):job>'], type='http', auth="public", multilang=True)
|
||||
def applyjobpost(self, job=None, **kwargs):
|
||||
def applyjobpost(self, job):
|
||||
return request.website.render("website_hr_recruitment.applyjobpost", { 'job': job })
|
||||
|
||||
@website.route('/job/publish', type='json', auth="admin", multilang=True)
|
||||
|
|
|
|||
|
|
@ -341,25 +341,22 @@ class Ecommerce(http.Controller):
|
|||
}
|
||||
return request.website.render("website_sale.products", values)
|
||||
|
||||
@website.route(['/shop/product/<int:product_id>/'], type='http', auth="public", multilang=True)
|
||||
def product(self, product_id=0, **post):
|
||||
@website.route(['/shop/product/<model("product.template"):product>/'], type='http', auth="public", multilang=True)
|
||||
def product(self, product, search='', category='', filter='', promo=None, lang_code=None):
|
||||
|
||||
if 'promo' in post:
|
||||
self.change_pricelist(post.get('promo'))
|
||||
if promo:
|
||||
self.change_pricelist(promo)
|
||||
|
||||
product_obj = request.registry.get('product.template')
|
||||
category_obj = request.registry.get('product.public.category')
|
||||
|
||||
category_ids = category_obj.search(request.cr, request.uid, [(1, '=', 1)], context=request.context)
|
||||
category_ids = category_obj.search(request.cr, request.uid, [], context=request.context)
|
||||
category_list = category_obj.name_get(request.cr, request.uid, category_ids, context=request.context)
|
||||
category_list = sorted(category_list, key=lambda category: category[1])
|
||||
|
||||
category = None
|
||||
if post.get('category') and int(post.get('category')):
|
||||
category = category_obj.browse(request.cr, request.uid, int(post.get('category')), context=request.context)
|
||||
if category:
|
||||
category = category_obj.browse(request.cr, request.uid, int(category), context=request.context)
|
||||
|
||||
request.context['pricelist'] = self.get_pricelist()
|
||||
product = product_obj.browse(request.cr, request.uid, product_id, context=request.context)
|
||||
|
||||
values = {
|
||||
'Ecommerce': self,
|
||||
|
|
@ -368,9 +365,9 @@ class Ecommerce(http.Controller):
|
|||
'main_object': product,
|
||||
'product': product,
|
||||
'search': {
|
||||
'search': post.get('search') or '',
|
||||
'category': post.get('category') or '',
|
||||
'filter': post.get('filter') or '',
|
||||
'search': search,
|
||||
'category': category and str(category.id),
|
||||
'filter': filter,
|
||||
}
|
||||
}
|
||||
return request.website.render("website_sale.product", values)
|
||||
|
|
@ -483,7 +480,7 @@ class Ecommerce(http.Controller):
|
|||
product_ids = []
|
||||
if order:
|
||||
for line in order.order_line:
|
||||
suggested_ids += [p.id for p in line.product_id and line.product_id.suggested_product_ids or [] for line in order.order_line]
|
||||
suggested_ids += [p.id for p in line.product_id and line.product_id.suggested_product_ids or []]
|
||||
product_ids.append(line.product_id.id)
|
||||
suggested_ids = list(set(suggested_ids) - set(product_ids))
|
||||
if suggested_ids:
|
||||
|
|
|
|||
Loading…
Reference in New Issue