diff --git a/addons/decimal_precision/decimal_precision.py b/addons/decimal_precision/decimal_precision.py index b237f053ebb..5576038d54d 100644 --- a/addons/decimal_precision/decimal_precision.py +++ b/addons/decimal_precision/decimal_precision.py @@ -22,9 +22,9 @@ import openerp from openerp import SUPERUSER_ID from openerp import tools -from openerp.osv import osv, fields +from openerp.osv import orm, fields -class decimal_precision(osv.osv): +class decimal_precision(orm.Model): _name = 'decimal.precision' _columns = { 'name': fields.char('Usage', size=50, select=True, required=True), @@ -71,4 +71,29 @@ def get_precision(application): return (16, res) return change_digit +class DecimalPrecisionFloat(orm.AbstractModel): + """ Override qweb.field.float to add a `decimal_precision` domain option + and use that instead of the column's own value if it is specified + """ + _inherit = 'ir.qweb.field.float' + + + def precision(self, cr, uid, column, options=None, context=None): + dp = options and options.get('decimal_precision') + if dp: + return self.pool['decimal.precision'].precision_get( + cr, uid, dp) + + return super(DecimalPrecisionFloat, self).precision( + cr, uid, column, options=options, context=context) + +class DecimalPrecisionTestModel(orm.Model): + _name = 'decimal.precision.test' + + _columns = { + 'float': fields.float(), + 'float_2': fields.float(digits=(16, 2)), + 'float_4': fields.float(digits=(16, 4)), + } + # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/decimal_precision/tests/__init__.py b/addons/decimal_precision/tests/__init__.py new file mode 100644 index 00000000000..feee24c8f15 --- /dev/null +++ b/addons/decimal_precision/tests/__init__.py @@ -0,0 +1,6 @@ +# -*- coding: utf-8 -*- +import test_qweb_float + +checks = [ + test_qweb_float +] diff --git a/addons/decimal_precision/tests/test_qweb_float.py b/addons/decimal_precision/tests/test_qweb_float.py new file mode 100644 index 00000000000..93334170f37 --- /dev/null +++ b/addons/decimal_precision/tests/test_qweb_float.py @@ -0,0 +1,66 @@ +# -*- coding: utf-8 -*- +from openerp.tests import common + +class TestFloatExport(common.TransactionCase): + def setUp(self): + super(TestFloatExport, self).setUp() + self.Model = self.registry('decimal.precision.test') + + def get_converter(self, name): + converter = self.registry('ir.qweb.field.float') + column = self.Model._all_columns[name].column + + return lambda value, options=None: converter.value_to_html( + self.cr, self.uid, value, column, options=options, context=None) + + def test_basic_float(self): + converter = self.get_converter('float') + self.assertEqual( + converter(42.0), + "42.0") + self.assertEqual( + converter(42.12345), + "42.12345") + + converter = self.get_converter('float_2') + self.assertEqual( + converter(42.0), + "42.00") + self.assertEqual( + converter(42.12345), + "42.12") + + converter = self.get_converter('float_4') + self.assertEqual( + converter(42.0), + '42.0000') + self.assertEqual( + converter(42.12345), + '42.1234') + + def test_precision_domain(self): + DP = self.registry('decimal.precision') + DP.create(self.cr, self.uid, { + 'name': 'A', + 'digits': 2, + }) + DP.create(self.cr, self.uid, { + 'name': 'B', + 'digits': 6, + }) + + converter = self.get_converter('float') + self.assertEqual( + converter(42.0, {'decimal_precision': 'A'}), + '42.00') + self.assertEqual( + converter(42.0, {'decimal_precision': 'B'}), + '42.000000') + + converter = self.get_converter('float_4') + self.assertEqual( + converter(42.12345, {'decimal_precision': 'A'}), + '42.12') + self.assertEqual( + converter(42.12345, {'decimal_precision': 'B'}), + '42.123450') diff --git a/addons/website/controllers/main.py b/addons/website/controllers/main.py index 083f9f3aef7..30f384a606b 100644 --- a/addons/website/controllers/main.py +++ b/addons/website/controllers/main.py @@ -218,8 +218,7 @@ class Website(openerp.addons.web.controllers.main.Home): irt._get_source.clear_cache(irt) # FIXME: find why ir.translation does not invalidate return True - # # FIXME: auth, anybody can upload an attachment if URL known/found - @website.route('/website/attach', type='http', auth='admin') + @website.route('/website/attach', type='http', auth='user') def attach(self, func, upload): req = request.httprequest if req.method != 'POST': @@ -229,12 +228,18 @@ class Website(openerp.addons.web.controllers.main.Home): try: attachment_id = request.registry['ir.attachment'].create(request.cr, request.uid, { 'name': upload.filename, - 'datas': base64.encodestring(upload.read()), + 'datas': upload.read().encode('base64'), 'datas_fname': upload.filename, 'res_model': 'ir.ui.view', }, request.context) - # FIXME: auth=user... no good. - url = '/website/attachment/%d' % attachment_id + + url = website.urlplus('/website/image', { + 'model': 'ir.attachment', + 'id': attachment_id, + 'field': 'datas', + 'max_height': MAX_IMAGE_HEIGHT, + 'max_width': MAX_IMAGE_WIDTH, + }) except Exception, e: logger.exception("Failed to upload image to attachment") message = str(e) @@ -283,7 +288,7 @@ class Images(http.Controller): return response.make_conditional(request.httprequest) @website.route('/website/image', auth="public") - def image(self, model, id, field): + def image(self, model, id, field, max_width=maxint, max_height=maxint): Model = request.registry[model] response = werkzeug.wrappers.Response() @@ -291,7 +296,7 @@ class Images(http.Controller): id = int(id) ids = Model.search(request.cr, request.uid, - [('id', '=', id)], context=request.context)\ + [('id', '=', id)], context=request.context) \ or Model.search(request.cr, openerp.SUPERUSER_ID, [('id', '=', id), ('website_published', '=', True)], context=request.context) @@ -312,8 +317,8 @@ class Images(http.Controller): response.last_modified = datetime.datetime.strptime( record[concurrency], server_format) + # Field does not exist on model or field set to False if not record.get(field): - # Field does not exist on model or field set to False # FIXME: maybe a field which does not exist should be a 404? return self.placeholder(response) @@ -324,19 +329,9 @@ class Images(http.Controller): if response.status_code == 304: return response - return self.set_image_data(response, record[field].decode('base64')) - - # FIXME: auth - # FIXME: delegate to image? - @website.route('/website/attachment/', auth='admin') - def attachment(self, id): - attachment = request.registry['ir.attachment'].browse( - request.cr, request.uid, id, request.context) - return self.set_image_data( - werkzeug.wrappers.Response(), - attachment.datas.decode('base64'), - fit=IMAGE_LIMITS,) + response, record[field].decode('base64'), + fit=(int(max_width), int(max_height))) def set_image_data(self, response, data, fit=(maxint, maxint)): """ Sets an inferred mime type on the response object, and puts the @@ -356,10 +351,13 @@ class Images(http.Controller): if w < max_w and h < max_h: response.set_data(data) - return response + else: + image.thumbnail(fit, Image.ANTIALIAS) + image.save(response.stream, image.format) + # invalidate content-length computed by make_conditional as writing + # to response.stream does not do it (as of werkzeug 0.9.3) + del response.headers['Content-Length'] - image.thumbnail(fit, Image.ANTIALIAS) - image.save(response.stream, image.format) return response diff --git a/addons/website/data/website_data.xml b/addons/website/data/website_data.xml index 58891dfa323..854462ca606 100644 --- a/addons/website/data/website_data.xml +++ b/addons/website/data/website_data.xml @@ -163,10 +163,10 @@ vegetables - vegetables.jpg + vegetables.png ir.ui.view url - /website/static/src/img/library/vegetables.jpg + /website/static/src/img/library/vegetables.png diff --git a/addons/website/models/ir_qweb.py b/addons/website/models/ir_qweb.py index f348bd7d9c3..d7bd704b895 100644 --- a/addons/website/models/ir_qweb.py +++ b/addons/website/models/ir_qweb.py @@ -7,17 +7,20 @@ Also, adds methods to convert values back to openerp models. """ import cStringIO +import datetime import itertools import logging import re import urllib2 +import urlparse import werkzeug.utils +from dateutil import parser from lxml import etree, html from PIL import Image as I from openerp.osv import orm, fields -from openerp.tools import ustr +from openerp.tools import ustr, DEFAULT_SERVER_DATE_FORMAT, DEFAULT_SERVER_DATETIME_FORMAT REMOTE_CONNECTION_TIMEOUT = 2.5 @@ -39,12 +42,12 @@ class Field(orm.AbstractModel): _inherit = 'ir.qweb.field' def attributes(self, cr, uid, field_name, record, options, - source_element, g_att, t_att, qweb_context): + source_element, g_att, t_att, qweb_context, context=None): column = record._model._all_columns[field_name].column return itertools.chain( super(Field, self).attributes(cr, uid, field_name, record, options, source_element, g_att, t_att, - qweb_context), + qweb_context, context=context), [('data-oe-translate', 1 if column.translate else 0)] ) @@ -67,7 +70,56 @@ class Float(orm.AbstractModel): _name = 'website.qweb.field.float' _inherit = ['website.qweb.field', 'ir.qweb.field.float'] - value_from_string = float + def from_html(self, cr, uid, model, column, element, context=None): + lang = self.user_lang(cr, uid, context=context) + + value = element.text_content().strip() + + return float(value.replace(lang.thousands_sep, '') + .replace(lang.decimal_point, '.')) + + +def parse_fuzzy(in_format, value): + day_first = in_format.find('%d') < in_format.find('%m') + + if '%y' in in_format: + year_first = in_format.find('%y') < in_format.find('%d') + else: + year_first = in_format.find('%Y') < in_format.find('%d') + + return parser.parse(value, dayfirst=day_first, yearfirst=year_first) + +class Date(orm.AbstractModel): + _name = 'website.qweb.field.date' + _inherit = ['website.qweb.field', 'ir.qweb.field.date'] + + def from_html(self, cr, uid, model, column, element, context=None): + lang = self.user_lang(cr, uid, context=context) + in_format = lang.date_format.encode('utf-8') + + value = element.text_content().strip() + try: + dt = datetime.datetime.strptime(in_format, value) + except ValueError: + dt = parse_fuzzy(in_format, value) + + return dt.strftime(DEFAULT_SERVER_DATE_FORMAT) + +class DateTime(orm.AbstractModel): + _name = 'website.qweb.field.datetime' + _inherit = ['website.qweb.field', 'ir.qweb.field.datetime'] + + def from_html(self, cr, uid, model, column, element, context=None): + lang = self.user_lang(cr, uid, context=context) + in_format = (u"%s %s" % (lang.date_format, lang.time_format)).encode('utf-8') + + value = element.text_content().strip() + try: + dt = datetime.datetime.strptime(in_format, value) + except ValueError: + dt = parse_fuzzy(in_format, value) + + return dt.strftime(DEFAULT_SERVER_DATETIME_FORMAT) class Text(orm.AbstractModel): _name = 'website.qweb.field.text' @@ -127,7 +179,7 @@ class Image(orm.AbstractModel): _inherit = ['website.qweb.field', 'ir.qweb.field.image'] def to_html(self, cr, uid, field_name, record, options, - source_element, t_att, g_att, qweb_context): + source_element, t_att, g_att, qweb_context, context=None): assert source_element.nodeName != 'img',\ "Oddly enough, the root tag of an image field can not be img. " \ "That is because the image goes into the tag, or it gets the " \ @@ -135,9 +187,9 @@ class Image(orm.AbstractModel): return super(Image, self).to_html( cr, uid, field_name, record, options, - source_element, t_att, g_att, qweb_context) + source_element, t_att, g_att, qweb_context, context=context) - def record_to_html(self, cr, uid, field_name, record, column, options=None): + def record_to_html(self, cr, uid, field_name, record, column, options=None, context=None): cls = '' if 'class' in options: cls = ' class="%s"' % werkzeug.utils.escape(options['class']) @@ -148,10 +200,11 @@ class Image(orm.AbstractModel): def from_html(self, cr, uid, model, column, element, context=None): url = element.find('img').get('src') - m = re.match(r'^/website/attachment/(\d+)$', url) - if m: + url_object = urlparse.urlsplit(url) + query = urlparse.parse_qs(url_object.query) + if url_object.path == '/website/image' and query['model'] == 'ir.attachment': attachment = self.pool['ir.attachment'].browse( - cr, uid, int(m.group(1)), context=context) + cr, uid, int(query['id']), context=context) return attachment.datas # remote URL? @@ -183,4 +236,9 @@ class Monetary(orm.AbstractModel): _inherit = ['website.qweb.field', 'ir.qweb.field.monetary'] def from_html(self, cr, uid, model, column, element, context=None): - return float(element.find('span').text) + lang = self.user_lang(cr, uid, context=context) + + value = element.find('span').text.strip() + + return float(value.replace(lang.thousands_sep, '') + .replace(lang.decimal_point, '.')) diff --git a/addons/website/models/ir_ui_view.py b/addons/website/models/ir_ui_view.py index d6ad607fa3f..ab09336d6cb 100644 --- a/addons/website/models/ir_ui_view.py +++ b/addons/website/models/ir_ui_view.py @@ -1,8 +1,10 @@ # -*- coding: utf-8 -*- +from urlparse import urlparse from lxml import etree, html -from openerp.osv import osv, fields +from openerp.osv import osv, fields +from openerp.addons.base import ir class view(osv.osv): _inherit = "ir.ui.view" @@ -82,15 +84,41 @@ class view(osv.osv): return out def replace_arch_section(self, cr, uid, view_id, section_xpath, replacement, context=None): - arch = replacement - if section_xpath: - previous_arch = etree.fromstring(self.browse(cr, uid, view_id, context=context).arch.encode('utf-8')) + # remove branding from replacement section + for att in ir.ir_ui_view.MOVABLE_BRANDING: + replacement.attrib.pop(att, None) + + if not section_xpath: + # replace all of the arch, not just a fragment + arch = replacement + else: + arch = etree.fromstring(self.browse(cr, uid, view_id, context=context).arch.encode('utf-8')) # ensure there's only one match - [previous_section] = previous_arch.xpath(section_xpath) + [previous_section] = arch.xpath(section_xpath) + previous_section.getparent().replace(previous_section, replacement) - arch = previous_arch + return arch + URL_ATTRS = { + 'form': 'action', + 'a': 'href', + 'link': 'href', + 'frame': 'src', + 'iframe': 'src', + 'script': 'src', + } + def _normalize_urls(self, root): + for element in root.iter(): + attr = self.URL_ATTRS.get(element.tag) + if attr is None or attr not in element.attrib: + continue + + value = element.get(attr) + if not urlparse(value).scheme: + element.attrib.pop(attr) + element.set('t-' + attr, value) + def save(self, cr, uid, res_id, value, xpath=None, context=None): """ Update a view section. The view section may embed fields to write @@ -103,6 +131,8 @@ class view(osv.osv): arch_section = html.fromstring( value, parser=html.HTMLParser(encoding='utf-8')) + self._normalize_urls(arch_section) + if xpath is None: # value is an embedded field on its own, not a view section self.save_embedded_field(cr, uid, arch_section, context=context) diff --git a/addons/website/models/website.py b/addons/website/models/website.py index c79ada6e9e4..d7f47c01b25 100644 --- a/addons/website/models/website.py +++ b/addons/website/models/website.py @@ -238,10 +238,26 @@ class website(osv.osv): return { "page_count": page_count, "offset": (page - 1) * step, - "page": {'url': get_url(page), 'num': page}, - "page_start": {'url': get_url(pmin), 'num': pmin}, - "page_end": {'url': get_url(min(pmax, page + 1)), - 'num': min(pmax, page + 1)}, + "page": { + 'url': get_url(page), + 'num': page + }, + "page_start": { + 'url': get_url(pmin), + 'num': pmin + }, + "page_previous": { + 'url': get_url(max(pmin, page - 1)), + 'num': max(pmin, page - 1) + }, + "page_next": { + 'url': get_url(min(pmax, page + 1)), + 'num': min(pmax, page + 1) + }, + "page_end": { + 'url': get_url(pmax), + 'num': pmax + }, "pages": [ {'url': get_url(page), 'num': page} for page in xrange(pmin, pmax+1) @@ -348,13 +364,18 @@ class website(osv.osv): class ir_attachment(osv.osv): _inherit = "ir.attachment" def _website_url_get(self, cr, uid, ids, name, arg, context=None): - context = context or {} result = {} for attach in self.browse(cr, uid, ids, context=context): - if attach.type=='url': + if attach.type == 'url': result[attach.id] = attach.url else: - result[attach.id] = "/website/attachment/"+str(attach.id) + result[attach.id] = urlplus('/website/image', { + 'model': 'ir.attachment', + 'field': 'datas', + 'id': attach.id, + 'max_width': 1024, + 'max_height': 768, + }) return result _columns = { 'website_url': fields.function(_website_url_get, string="Attachment URL", type='char') @@ -386,6 +407,17 @@ class base_language_install(osv.osv): 'website_ids': fields.many2many('website', string='Websites to translate'), } + def default_get(self, cr, uid, fields, context=None): + if context is None: + context = {} + defaults = super(base_language_install, self).default_get(cr, uid, fields, context) + website_id = context.get('params', {}).get('website_id') + if website_id: + if 'website_ids' not in defaults: + defaults['website_ids'] = [] + defaults['website_ids'].append(website_id) + return defaults + def lang_install(self, cr, uid, ids, context=None): if context is None: context = {} diff --git a/addons/website/security/ir.model.access.csv b/addons/website/security/ir.model.access.csv index 4fe9a0888b4..431170e462b 100644 --- a/addons/website/security/ir.model.access.csv +++ b/addons/website/security/ir.model.access.csv @@ -5,7 +5,10 @@ access_website_converter_test,access_website_converter_test,model_website_conver access_website_converter_test_sub,access_website_converter_test_sub,model_website_converter_test_sub,,1,1,1,1 access_website_qweb,access_website_qweb,model_website_qweb,,0,0,0,0 access_website_qweb_field,access_website_qweb_field,model_website_qweb_field,,0,0,0,0 +access_website_qweb_field_integer,access_website_qweb_field_integer,model_website_qweb_field_integer,,0,0,0,0 access_website_qweb_field_float,access_website_qweb_field_float,model_website_qweb_field_float,,0,0,0,0 +access_website_qweb_field_date,access_website_qweb_field_date,model_website_qweb_field_date,,0,0,0,0 +access_website_qweb_field_datetime,access_website_qweb_field_datetime,model_website_qweb_field_datetime,,0,0,0,0 access_website_qweb_field_text,access_website_qweb_field_text,model_website_qweb_field_text,,0,0,0,0 access_website_qweb_field_selection,access_website_qweb_field_selection,model_website_qweb_field_selection,,0,0,0,0 access_website_qweb_field_many2one,access_website_qweb_field_many2one,model_website_qweb_field_many2one,,0,0,0,0 diff --git a/addons/website/static/lib/ckeditor/core/dom/range.js b/addons/website/static/lib/ckeditor/core/dom/range.js index d567a50ad43..9a330fc8a70 100644 --- a/addons/website/static/lib/ckeditor/core/dom/range.js +++ b/addons/website/static/lib/ckeditor/core/dom/range.js @@ -1360,7 +1360,7 @@ CKEDITOR.dom.range = function( root ) { * * {@link CKEDITOR#SHRINK_TEXT} - Shrink the range boudaries to anchor by the side of enclosed text * node, range remains if there's no text nodes on boundaries at all. * - * @param {Boolean} selectContents Whether result range anchors at the inner OR outer boundary of the node. + * @param {Boolean} [selectContents] Whether result range anchors at the inner OR outer boundary of the node. */ shrink: function( mode, selectContents, shrinkOnBlockBoundary ) { // Unable to shrink a collapsed range. diff --git a/addons/website/static/lib/ckeditor/core/selection.js b/addons/website/static/lib/ckeditor/core/selection.js index e888c3d557c..f3e47c9debb 100644 --- a/addons/website/static/lib/ckeditor/core/selection.js +++ b/addons/website/static/lib/ckeditor/core/selection.js @@ -798,7 +798,7 @@ * * @method * @member CKEDITOR.editor - * @param {Boolean} forceRealSelection Return real selection, instead of saved or fake one. + * @param {Boolean} [forceRealSelection] Return real selection, instead of saved or fake one. * @returns {CKEDITOR.dom.selection} A selection object or null if not available for the moment. */ CKEDITOR.editor.prototype.getSelection = function( forceRealSelection ) { diff --git a/addons/website/static/lib/stellar/LICENSE-MIT b/addons/website/static/lib/stellar/LICENSE-MIT new file mode 100644 index 00000000000..b590574757d --- /dev/null +++ b/addons/website/static/lib/stellar/LICENSE-MIT @@ -0,0 +1,20 @@ +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. \ No newline at end of file diff --git a/addons/website/static/lib/stellar/README.md b/addons/website/static/lib/stellar/README.md new file mode 100644 index 00000000000..e87107d87b2 --- /dev/null +++ b/addons/website/static/lib/stellar/README.md @@ -0,0 +1,308 @@ +[![Build Status](https://secure.travis-ci.org/markdalgleish/stellar.js.png)](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 +
+``` + +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 +
+``` + +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 +
+``` + +## 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 +
+``` + +The offset parent can also have its own offsets: + +``` html +
+``` + +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 diff --git a/addons/website/static/lib/stellar/component.json b/addons/website/static/lib/stellar/component.json new file mode 100644 index 00000000000..f4b651386b7 --- /dev/null +++ b/addons/website/static/lib/stellar/component.json @@ -0,0 +1,8 @@ +{ + "name": "jquery.stellar", + "version": "0.6.2", + "main": ["./jquery.stellar.js"], + "dependencies": { + "jquery": ">=1.4.3" + } +} \ No newline at end of file diff --git a/addons/website/static/lib/stellar/grunt.js b/addons/website/static/lib/stellar/grunt.js new file mode 100644 index 00000000000..114348d92ac --- /dev/null +++ b/addons/website/static/lib/stellar/grunt.js @@ -0,0 +1,71 @@ +/*global module:false*/ +module.exports = function(grunt) { + + // Project configuration. + grunt.initConfig({ + pkg: '', + 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: ['', '.js>'], + dest: '<%= pkg.name %>.js' + } + }, + min: { + dist: { + src: ['', ''], + dest: '<%= pkg.name %>.min.js' + } + }, + watch: { + 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'); + +}; diff --git a/addons/website/static/lib/stellar/jquery.stellar.js b/addons/website/static/lib/stellar/jquery.stellar.js new file mode 100644 index 00000000000..a64c8153000 --- /dev/null +++ b/addons/website/static/lib/stellar/jquery.stellar.js @@ -0,0 +1,660 @@ +/*! + * 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 = $('
', { 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)); \ No newline at end of file diff --git a/addons/website/static/lib/stellar/jquery.stellar.min.js b/addons/website/static/lib/stellar/jquery.stellar.min.js new file mode 100644 index 00000000000..dd7827adce4 --- /dev/null +++ b/addons/website/static/lib/stellar/jquery.stellar.min.js @@ -0,0 +1,2 @@ +/*! Stellar.js v0.6.2 | Copyright 2013, Mark Dalgleish | http://markdalgleish.com/projects/stellar.js | http://markdalgleish.mit-license.org */ +(function(e,t,n,r){function d(t,n){this.element=t,this.options=e.extend({},s,n),this._defaults=s,this._name=i,this.init()}var i="stellar",s={scrollProperty:"scroll",positionProperty:"position",horizontalScrolling:!0,verticalScrolling:!0,horizontalOffset:0,verticalOffset:0,responsive:!1,parallaxBackgrounds:!0,parallaxElements:!0,hideDistantElements:!0,hideElement:function(e){e.hide()},showElement:function(e){e.show()}},o={scroll:{getLeft:function(e){return e.scrollLeft()},setLeft:function(e,t){e.scrollLeft(t)},getTop:function(e){return e.scrollTop()},setTop:function(e,t){e.scrollTop(t)}},position:{getLeft:function(e){return parseInt(e.css("left"),10)*-1},getTop:function(e){return parseInt(e.css("top"),10)*-1}},margin:{getLeft:function(e){return parseInt(e.css("margin-left"),10)*-1},getTop:function(e){return parseInt(e.css("margin-top"),10)*-1}},transform:{getLeft:function(e){var t=getComputedStyle(e[0])[f];return t!=="none"?parseInt(t.match(/(-?[0-9]+)/g)[4],10)*-1:0},getTop:function(e){var t=getComputedStyle(e[0])[f];return t!=="none"?parseInt(t.match(/(-?[0-9]+)/g)[5],10)*-1:0}}},u={position:{setLeft:function(e,t){e.css("left",t)},setTop:function(e,t){e.css("top",t)}},transform:{setPosition:function(e,t,n,r,i){e[0].style[f]="translate3d("+(t-n)+"px, "+(r-i)+"px, 0)"}}},a=function(){var t=/^(Moz|Webkit|Khtml|O|ms|Icab)(?=[A-Z])/,n=e("script")[0].style,r="",i;for(i in n)if(t.test(i)){r=i.match(t)[0];break}return"WebkitOpacity"in n&&(r="Webkit"),"KhtmlOpacity"in n&&(r="Khtml"),function(e){return r+(r.length>0?e.charAt(0).toUpperCase()+e.slice(1):e)}}(),f=a("transform"),l=e("
",{style:"background:#fff"}).css("background-position-x")!==r,c=l?function(e,t,n){e.css({"background-position-x":t,"background-position-y":n})}:function(e,t,n){e.css("background-position",t+" "+n)},h=l?function(e){return[e.css("background-position-x"),e.css("background-position-y")]}:function(e){return e.css("background-position").split(" ")},p=t.requestAnimationFrame||t.webkitRequestAnimationFrame||t.mozRequestAnimationFrame||t.oRequestAnimationFrame||t.msRequestAnimationFrame||function(e){setTimeout(e,1e3/60)};d.prototype={init:function(){this.options.name=i+"_"+Math.floor(Math.random()*1e9),this._defineElements(),this._defineGetters(),this._defineSetters(),this._handleWindowLoadAndResize(),this._detectViewport(),this.refresh({firstLoad:!0}),this.options.scrollProperty==="scroll"?this._handleScrollEvent():this._startAnimationLoop()},_defineElements:function(){this.element===n.body&&(this.element=t),this.$scrollElement=e(this.element),this.$element=this.element===t?e("body"):this.$scrollElement,this.$viewportElement=this.options.viewportElement!==r?e(this.options.viewportElement):this.$scrollElement[0]===t||this.options.scrollProperty==="scroll"?this.$scrollElement:this.$scrollElement.parent()},_defineGetters:function(){var e=this,t=o[e.options.scrollProperty];this._getScrollLeft=function(){return t.getLeft(e.$scrollElement)},this._getScrollTop=function(){return t.getTop(e.$scrollElement)}},_defineSetters:function(){var t=this,n=o[t.options.scrollProperty],r=u[t.options.positionProperty],i=n.setLeft,s=n.setTop;this._setScrollLeft=typeof i=="function"?function(e){i(t.$scrollElement,e)}:e.noop,this._setScrollTop=typeof s=="function"?function(e){s(t.$scrollElement,e)}:e.noop,this._setPosition=r.setPosition||function(e,n,i,s,o){t.options.horizontalScrolling&&r.setLeft(e,n,i),t.options.verticalScrolling&&r.setTop(e,s,o)}},_handleWindowLoadAndResize:function(){var n=this,r=e(t);n.options.responsive&&r.bind("load."+this.name,function(){n.refresh()}),r.bind("resize."+this.name,function(){n._detectViewport(),n.options.responsive&&n.refresh()})},refresh:function(n){var r=this,i=r._getScrollLeft(),s=r._getScrollTop();(!n||!n.firstLoad)&&this._reset(),this._setScrollLeft(0),this._setScrollTop(0),this._setOffsets(),this._findParticles(),this._findBackgrounds(),n&&n.firstLoad&&/WebKit/.test(navigator.userAgent)&&e(t).load(function(){var e=r._getScrollLeft(),t=r._getScrollTop();r._setScrollLeft(e+1),r._setScrollTop(t+1),r._setScrollLeft(e),r._setScrollTop(t)}),this._setScrollLeft(i),this._setScrollTop(s)},_detectViewport:function(){var e=this.$viewportElement.offset(),t=e!==null&&e!==r;this.viewportWidth=this.$viewportElement.width(),this.viewportHeight=this.$viewportElement.height(),this.viewportOffsetTop=t?e.top:0,this.viewportOffsetLeft=t?e.left:0},_findParticles:function(){var t=this,n=this._getScrollLeft(),i=this._getScrollTop();if(this.particles!==r)for(var s=this.particles.length-1;s>=0;s--)this.particles[s].$element.data("stellar-elementIsActive",r);this.particles=[];if(!this.options.parallaxElements)return;this.$element.find("[data-stellar-ratio]").each(function(n){var i=e(this),s,o,u,a,f,l,c,h,p,d=0,v=0,m=0,g=0;if(!i.data("stellar-elementIsActive"))i.data("stellar-elementIsActive",this);else if(i.data("stellar-elementIsActive")!==this)return;t.options.showElement(i),i.data("stellar-startingLeft")?(i.css("left",i.data("stellar-startingLeft")),i.css("top",i.data("stellar-startingTop"))):(i.data("stellar-startingLeft",i.css("left")),i.data("stellar-startingTop",i.css("top"))),u=i.position().left,a=i.position().top,f=i.css("margin-left")==="auto"?0:parseInt(i.css("margin-left"),10),l=i.css("margin-top")==="auto"?0:parseInt(i.css("margin-top"),10),h=i.offset().left-f,p=i.offset().top-l,i.parents().each(function(){var t=e(this);if(t.data("stellar-offset-parent")===!0)return d=m,v=g,c=t,!1;m+=t.position().left,g+=t.position().top}),s=i.data("stellar-horizontal-offset")!==r?i.data("stellar-horizontal-offset"):c!==r&&c.data("stellar-horizontal-offset")!==r?c.data("stellar-horizontal-offset"):t.horizontalOffset,o=i.data("stellar-vertical-offset")!==r?i.data("stellar-vertical-offset"):c!==r&&c.data("stellar-vertical-offset")!==r?c.data("stellar-vertical-offset"):t.verticalOffset,t.particles.push({$element:i,$offsetParent:c,isFixed:i.css("position")==="fixed",horizontalOffset:s,verticalOffset:o,startingPositionLeft:u,startingPositionTop:a,startingOffsetLeft:h,startingOffsetTop:p,parentOffsetLeft:d,parentOffsetTop:v,stellarRatio:i.data("stellar-ratio")!==r?i.data("stellar-ratio"):1,width:i.outerWidth(!0),height:i.outerHeight(!0),isHidden:!1})})},_findBackgrounds:function(){var t=this,n=this._getScrollLeft(),i=this._getScrollTop(),s;this.backgrounds=[];if(!this.options.parallaxBackgrounds)return;s=this.$element.find("[data-stellar-background-ratio]"),this.$element.data("stellar-background-ratio")&&(s=s.add(this.$element)),s.each(function(){var s=e(this),o=h(s),u,a,f,l,p,d,v,m,g,y=0,b=0,w=0,E=0;if(!s.data("stellar-backgroundIsActive"))s.data("stellar-backgroundIsActive",this);else if(s.data("stellar-backgroundIsActive")!==this)return;s.data("stellar-backgroundStartingLeft")?c(s,s.data("stellar-backgroundStartingLeft"),s.data("stellar-backgroundStartingTop")):(s.data("stellar-backgroundStartingLeft",o[0]),s.data("stellar-backgroundStartingTop",o[1])),p=s.css("margin-left")==="auto"?0:parseInt(s.css("margin-left"),10),d=s.css("margin-top")==="auto"?0:parseInt(s.css("margin-top"),10),v=s.offset().left-p-n,m=s.offset().top-d-i,s.parents().each(function(){var t=e(this);if(t.data("stellar-offset-parent")===!0)return y=w,b=E,g=t,!1;w+=t.position().left,E+=t.position().top}),u=s.data("stellar-horizontal-offset")!==r?s.data("stellar-horizontal-offset"):g!==r&&g.data("stellar-horizontal-offset")!==r?g.data("stellar-horizontal-offset"):t.horizontalOffset,a=s.data("stellar-vertical-offset")!==r?s.data("stellar-vertical-offset"):g!==r&&g.data("stellar-vertical-offset")!==r?g.data("stellar-vertical-offset"):t.verticalOffset,t.backgrounds.push({$element:s,$offsetParent:g,isFixed:s.css("background-attachment")==="fixed",horizontalOffset:u,verticalOffset:a,startingValueLeft:o[0],startingValueTop:o[1],startingBackgroundPositionLeft:isNaN(parseInt(o[0],10))?0:parseInt(o[0],10),startingBackgroundPositionTop:isNaN(parseInt(o[1],10))?0:parseInt(o[1],10),startingPositionLeft:s.position().left,startingPositionTop:s.position().top,startingOffsetLeft:v,startingOffsetTop:m,parentOffsetLeft:y,parentOffsetTop:b,stellarRatio:s.data("stellar-background-ratio")===r?1:s.data("stellar-background-ratio")})})},_reset:function(){var e,t,n,r,i;for(i=this.particles.length-1;i>=0;i--)e=this.particles[i],t=e.$element.data("stellar-startingLeft"),n=e.$element.data("stellar-startingTop"),this._setPosition(e.$element,t,t,n,n),this.options.showElement(e.$element),e.$element.data("stellar-startingLeft",null).data("stellar-elementIsActive",null).data("stellar-backgroundIsActive",null);for(i=this.backgrounds.length-1;i>=0;i--)r=this.backgrounds[i],r.$element.data("stellar-backgroundStartingLeft",null).data("stellar-backgroundStartingTop",null),c(r.$element,r.startingValueLeft,r.startingValueTop)},destroy:function(){this._reset(),this.$scrollElement.unbind("resize."+this.name).unbind("scroll."+this.name),this._animationLoop=e.noop,e(t).unbind("load."+this.name).unbind("resize."+this.name)},_setOffsets:function(){var n=this,r=e(t);r.unbind("resize.horizontal-"+this.name).unbind("resize.vertical-"+this.name),typeof this.options.horizontalOffset=="function"?(this.horizontalOffset=this.options.horizontalOffset(),r.bind("resize.horizontal-"+this.name,function(){n.horizontalOffset=n.options.horizontalOffset()})):this.horizontalOffset=this.options.horizontalOffset,typeof this.options.verticalOffset=="function"?(this.verticalOffset=this.options.verticalOffset(),r.bind("resize.vertical-"+this.name,function(){n.verticalOffset=n.options.verticalOffset()})):this.verticalOffset=this.options.verticalOffset},_repositionElements:function(){var e=this._getScrollLeft(),t=this._getScrollTop(),n,r,i,s,o,u,a,f=!0,l=!0,h,p,d,v,m;if(this.currentScrollLeft===e&&this.currentScrollTop===t&&this.currentWidth===this.viewportWidth&&this.currentHeight===this.viewportHeight)return;this.currentScrollLeft=e,this.currentScrollTop=t,this.currentWidth=this.viewportWidth,this.currentHeight=this.viewportHeight;for(m=this.particles.length-1;m>=0;m--)i=this.particles[m],s=i.isFixed?1:0,this.options.horizontalScrolling?(h=(e+i.horizontalOffset+this.viewportOffsetLeft+i.startingPositionLeft-i.startingOffsetLeft+i.parentOffsetLeft)*-(i.stellarRatio+s-1)+i.startingPositionLeft,d=h-i.startingPositionLeft+i.startingOffsetLeft):(h=i.startingPositionLeft,d=i.startingOffsetLeft),this.options.verticalScrolling?(p=(t+i.verticalOffset+this.viewportOffsetTop+i.startingPositionTop-i.startingOffsetTop+i.parentOffsetTop)*-(i.stellarRatio+s-1)+i.startingPositionTop,v=p-i.startingPositionTop+i.startingOffsetTop):(p=i.startingPositionTop,v=i.startingOffsetTop),this.options.hideDistantElements&&(l=!this.options.horizontalScrolling||d+i.width>(i.isFixed?0:e)&&d<(i.isFixed?0:e)+this.viewportWidth+this.viewportOffsetLeft,f=!this.options.verticalScrolling||v+i.height>(i.isFixed?0:t)&&v<(i.isFixed?0:t)+this.viewportHeight+this.viewportOffsetTop),l&&f?(i.isHidden&&(this.options.showElement(i.$element),i.isHidden=!1),this._setPosition(i.$element,h,i.startingPositionLeft,p,i.startingPositionTop)):i.isHidden||(this.options.hideElement(i.$element),i.isHidden=!0);for(m=this.backgrounds.length-1;m>=0;m--)o=this.backgrounds[m],s=o.isFixed?0:1,u=this.options.horizontalScrolling?(e+o.horizontalOffset-this.viewportOffsetLeft-o.startingOffsetLeft+o.parentOffsetLeft-o.startingBackgroundPositionLeft)*(s-o.stellarRatio)+"px":o.startingValueLeft,a=this.options.verticalScrolling?(t+o.verticalOffset-this.viewportOffsetTop-o.startingOffsetTop+o.parentOffsetTop-o.startingBackgroundPositionTop)*(s-o.stellarRatio)+"px":o.startingValueTop,c(o.$element,u,a)},_handleScrollEvent:function(){var e=this,t=!1,n=function(){e._repositionElements(),t=!1},r=function(){t||(p(n),t=!0)};this.$scrollElement.bind("scroll."+this.name,r),r()},_startAnimationLoop:function(){var e=this;this._animationLoop=function(){p(e._animationLoop),e._repositionElements()},this._animationLoop()}},e.fn[i]=function(t){var n=arguments;if(t===r||typeof t=="object")return this.each(function(){e.data(this,"plugin_"+i)||e.data(this,"plugin_"+i,new d(this,t))});if(typeof t=="string"&&t[0]!=="_"&&t!=="init")return this.each(function(){var r=e.data(this,"plugin_"+i);r instanceof d&&typeof r[t]=="function"&&r[t].apply(r,Array.prototype.slice.call(n,1)),t==="destroy"&&e.data(this,"plugin_"+i,null)})},e[i]=function(n){var r=e(t);return r.stellar.apply(r,Array.prototype.slice.call(arguments,0))},e[i].scrollProperty=o,e[i].positionProperty=u,t.Stellar=d})(jQuery,this,document); \ No newline at end of file diff --git a/addons/website/static/lib/stellar/package.json b/addons/website/static/lib/stellar/package.json new file mode 100644 index 00000000000..1df062d9935 --- /dev/null +++ b/addons/website/static/lib/stellar/package.json @@ -0,0 +1,46 @@ +{ + "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" + } +} diff --git a/addons/website/static/lib/stellar/stellar.jquery.json b/addons/website/static/lib/stellar/stellar.jquery.json new file mode 100644 index 00000000000..1eeffdffc1b --- /dev/null +++ b/addons/website/static/lib/stellar/stellar.jquery.json @@ -0,0 +1,29 @@ +{ + "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" +} \ No newline at end of file diff --git a/addons/website/static/src/css/editor.css b/addons/website/static/src/css/editor.css index a009bf61f23..8fa0ad80f5f 100644 --- a/addons/website/static/src/css/editor.css +++ b/addons/website/static/src/css/editor.css @@ -1,4 +1,3 @@ -@charset "utf-8"; /* ---- CKEditor Minimal Reset ---- */ .navbar.navbar-inverse .cke_chrome { border: none; @@ -112,6 +111,11 @@ table.editorbar-panel td.selected { background-color: #b1c9d9; } +.oe_translate_or { + color: white; + padding: 0 0.2em; +} + .oe_translate_examples li { margin: 10px; padding: 4px; @@ -169,6 +173,11 @@ table.editorbar-panel td.selected { white-space: pre-wrap; } +.oe_carlos_danger { + outline: 1px solid red !important; + background-color: #ffd9dd !important; +} + /* ---- SNIPPET EDITOR ---- */ #oe_snippets { position: fixed; @@ -608,7 +617,6 @@ table.editorbar-panel td.selected { right: 0; z-index: 1000; height: 100%; - width: 720px; } .oe_ace_view_editor .oe_ace_view_editor_title { width: 100%; @@ -637,11 +645,13 @@ table.editorbar-panel td.selected { right: 0; bottom: 51px; left: 0; - width: 720px; +} +.oe_ace_view_editor .ace_editor .ace_gutter { + cursor: ew-resize; } .oe_ace_view_editor.oe_ace_open { - filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=100); - opacity: 1; + filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=97); + opacity: 0.97; } .oe_ace_view_editor.oe_ace_closed { z-index: -1000; diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass index 461667d8e54..5dbe7a8eee9 100644 --- a/addons/website/static/src/css/editor.sass +++ b/addons/website/static/src/css/editor.sass @@ -106,6 +106,9 @@ table.editorbar-panel background-color: #b1c9d9 // ---- TRANSLATIONS ---- {{{ +.oe_translate_or + color: white + padding: 0 0.2em .oe_translate_examples li margin: 10px padding: 4px @@ -151,6 +154,10 @@ table.editorbar-panel content: " " white-space: pre-wrap +.oe_carlos_danger + outline: 1px solid red !important + background-color: #ffd9dd !important + /* ---- SNIPPET EDITOR ---- */ #oe_snippets @@ -466,7 +473,6 @@ $highlighted_text_color: #ffffff /* ---- ACE EDITOR ---- */ -$ace_width: 720px $editorbar_height: 30px // TODO Fix => might break with themes $navbar_height: 51px @@ -481,7 +487,6 @@ $navbar_height: 51px right: 0 z-index: 1000 height: 100% - width: $ace_width .oe_ace_view_editor_title width: 100% padding-top: 0 @@ -502,9 +507,10 @@ $navbar_height: 51px right: 0 bottom: $navbar_height left: 0 - width: $ace_width + .ace_gutter + cursor: ew-resize &.oe_ace_open - +opacity(1) + +opacity(0.97) &.oe_ace_closed z-index: -1000 +opacity(0) diff --git a/addons/website/static/src/css/website.css b/addons/website/static/src/css/website.css index ce87e592136..c851c7e43f6 100644 --- a/addons/website/static/src/css/website.css +++ b/addons/website/static/src/css/website.css @@ -360,12 +360,19 @@ footer { background-color: grey; } -.parallax_full { - background: #eeeeee bottom center repeat fixed; - min-height: 650px; - width: 100%; +.parallax { + background-attachment: fixed; background-size: 100%; } +.parallax.oe_small { + height: 200px; +} +.parallax.oe_medium { + height: 300px; +} +.parallax.oe_big { + height: 450px; +} /* -- Hack for removing double scrollbar from mobile preview -- */ div#mobile-preview.modal { diff --git a/addons/website/static/src/css/website.sass b/addons/website/static/src/css/website.sass index 5197653429c..4d9a6ae01c0 100644 --- a/addons/website/static/src/css/website.sass +++ b/addons/website/static/src/css/website.sass @@ -275,11 +275,15 @@ footer .active background-color: grey -.parallax_full - background: #eee bottom center repeat fixed - min-height: 650px - width: 100% +.parallax + background-attachment: fixed background-size: 100% + &.oe_small + height: 200px + &.oe_medium + height: 300px + &.oe_big + height: 450px /* -- Hack for removing double scrollbar from mobile preview -- */ div#mobile-preview.modal diff --git a/addons/website/static/src/img/library/vegetables.jpg b/addons/website/static/src/img/library/vegetables.jpg deleted file mode 100644 index 61a2518bbc4..00000000000 Binary files a/addons/website/static/src/img/library/vegetables.jpg and /dev/null differ diff --git a/addons/website/static/src/img/library/vegetables.png b/addons/website/static/src/img/library/vegetables.png new file mode 100644 index 00000000000..ae0359e8954 Binary files /dev/null and b/addons/website/static/src/img/library/vegetables.png differ diff --git a/addons/website/static/src/img/parallax/parallax_photo1.jpg b/addons/website/static/src/img/parallax/parallax_photo1.jpg new file mode 100644 index 00000000000..c82dfcb9406 Binary files /dev/null and b/addons/website/static/src/img/parallax/parallax_photo1.jpg differ diff --git a/addons/website/static/src/js/website.ace.js b/addons/website/static/src/js/website.ace.js index faf3e8f7e04..02f5eb68d5e 100644 --- a/addons/website/static/src/js/website.ace.js +++ b/addons/website/static/src/js/website.ace.js @@ -100,6 +100,13 @@ self.aceEditor.resize(); self.$el.width(width); } + function storeEditorWidth() { + window.localStorage.setItem('ace_editor_width', self.$el.width()); + } + function readEditorWidth() { + var width = window.localStorage.getItem('ace_editor_width'); + return parseInt(width || 720, 10); + } function startResizing (e) { self.refX = e.pageX; self.resizing = true; @@ -113,16 +120,23 @@ var width = self.$el.width() - offset; self.refX = e.pageX; resizeEditor(width); + storeEditorWidth(); } } document.body.addEventListener('mouseup', stopResizing, true); self.$('.ace_gutter').mouseup(stopResizing).mousedown(startResizing).click(stopResizing); $(document).mousemove(updateWidth); + $('button[data-action=edit]').click(function () { + self.close(); + }); + resizeEditor(readEditorWidth()); }, loadViews: function (views) { var self = this; - var activeViews = _.filter(views, function (view) { + var activeViews = _.uniq(_.filter(views, function (view) { return view.active; + }), false, function (view) { + return view.id; }); var $viewList = self.$('#ace-view-list'); _.each(activeViews, function (view) { diff --git a/addons/website/static/src/js/website.editor.js b/addons/website/static/src/js/website.editor.js index c1f05d9b661..f9d2aef339b 100644 --- a/addons/website/static/src/js/website.editor.js +++ b/addons/website/static/src/js/website.editor.js @@ -56,7 +56,7 @@ //noinspection JSValidateTypes editor.addCommand('link', { - exec: function (editor, data) { + exec: function (editor) { link_dialog(editor); return true; }, @@ -65,7 +65,7 @@ }); //noinspection JSValidateTypes editor.addCommand('image', { - exec: function (editor, data) { + exec: function (editor) { image_dialog(editor); return true; }, @@ -177,7 +177,7 @@ var editor = new website.EditorBar(); var $body = $(document.body); editor.prependTo($body).then(function () { - if (location.search.indexOf("unable_editor") >= 0) { + if (location.search.indexOf("enable_editor") >= 0) { editor.edit(); } }); @@ -219,7 +219,7 @@ var view_id = $(event.currentTarget).data('view-id'); openerp.jsonRpc('/website/customize_template_toggle', 'call', { 'view_id': view_id - }).then( function(result) { + }).then( function() { window.location.reload(); }); }); @@ -253,7 +253,6 @@ ); }, edit: function () { - var self = this; this.$buttons.edit.prop('disabled', true); this.$('#website-top-view').hide(); this.$('#website-top-edit').show(); @@ -273,30 +272,58 @@ editor.destroy(); // FIXME: select editables then filter by dirty? var defs = this.rte.fetch_editables(root) - .removeClass('oe_editable cke_focus') - .removeAttr('contentEditable') .filter('.oe_dirty') + .removeAttr('contentEditable') + .removeClass('oe_dirty oe_editable cke_focus oe_carlos_danger') .map(function () { var $el = $(this); // TODO: Add a queue with concurrency limit in webclient // https://github.com/medikoo/deferred/blob/master/lib/ext/function/gate.js return self.saving_mutex.exec(function () { return self.saveElement($el) - .fail(function () { - var data = $el.data(); - console.error(_.str.sprintf('Could not save %s(%d).%s', data.oeModel, data.oeId, data.oeField)); + .then(undefined, function (thing, response) { + // because ckeditor regenerates all the dom, + // we can't just setup the popover here as + // everything will be destroyed by the DOM + // regeneration. Add markings instead, and + // returns a new rejection with all relevant + // info + var id = _.uniqueId('carlos_danger_'); + $el.addClass('oe_dirty oe_carlos_danger'); + $el.addClass(id); + return $.Deferred().reject({ + id: id, + error: response.data, + }); }); }); }).get(); return $.when.apply(null, defs).then(function () { website.reload(); + }, function (failed) { + // If there were errors, re-enable edition + self.rte.start_edition(true).then(function () { + // jquery's deferred being a pain in the ass + if (!_.isArray(failed)) { failed = [failed]; } + + _(failed).each(function (failure) { + $(root).find('.' + failure.id) + .removeClass(failure.id) + .popover({ + trigger: 'hover', + content: failure.error.message, + placement: 'auto top', + }) + // Force-show popovers so users will notice them. + .popover('show'); + }) + }); }); }, /** * Saves an RTE content, which always corresponds to a view section (?). */ saveElement: function ($el) { - $el.removeClass('oe_dirty'); var markup = $el.prop('outerHTML'); return openerp.jsonRpc('/web/dataset/call', 'call', { model: 'ir.ui.view', @@ -350,6 +377,7 @@ // The detail attribute indicates the number of times a mouse button has been pressed // we just want the triple click if (e.detail !== 3) { return; } + e.preventDefault(); // Get closest block-level element to the triple-clicked // element (using ckeditor's block list because why not) @@ -422,15 +450,25 @@ return true; }, - start_edition: function ($elements) { + /** + * Makes the page editable + * + * @param {Boolean} [restart=false] in case the edition was already set + * up once and is being re-enabled. + * @returns {$.Deferred} deferred indicating when the RTE is ready + */ + start_edition: function (restart) { var self = this; // create a single editor for the whole page var root = document.getElementById('wrapwrap'); - $(root).on('dragstart', 'img', function (e) { - e.preventDefault(); - }); - this.webkitSelectionFixer(root); - this.tableNavigation(root); + if (!restart) { + $(root).on('dragstart', 'img', function (e) { + e.preventDefault(); + }); + this.webkitSelectionFixer(root); + this.tableNavigation(root); + } + var def = $.Deferred(); var editor = this.editor = CKEDITOR.inline(root, self._config()); editor.on('instanceReady', function () { editor.setReadOnly(false); @@ -446,7 +484,9 @@ document.execCommand("enableInlineTableEditing", false, "false"); self.trigger('rte:ready'); + def.resolve(); }); + return def; }, setup_editables: function (root) { @@ -483,7 +523,7 @@ .filter(function () { var $this = $(this); // keep view sections and fields which are *not* in - // view sections for toplevel editables + // view sections for top-level editables return $this.data('oe-model') === 'ir.ui.view' || !$this.closest('[data-oe-model = "ir.ui.view"]').length; }); @@ -854,7 +894,7 @@ this.preview_image(); }, - file_selection: function (e) { + file_selection: function () { this.$('button.filepicker').removeClass('btn-danger btn-success'); var self = this; diff --git a/addons/website/static/src/js/website.js b/addons/website/static/src/js/website.js index 963a0b1664d..682a6175086 100644 --- a/addons/website/static/src/js/website.js +++ b/addons/website/static/src/js/website.js @@ -21,9 +21,6 @@ templates.push(template); }; website.load_templates = function(templates) { - var def = $.Deferred(); - var count = templates.length; - var dones = _(templates).map(function (t) { return new $.Deferred(function (d) { openerp.qweb.add_template(t, function(err) { @@ -39,8 +36,8 @@ }; website.reload = function () { location.hash = "scrollTop=" + window.document.body.scrollTop; - if (location.search.indexOf("unable_editor") > -1) { - window.location.href = window.location.href.replace(/unable_editor(=[^&]*)?/g, ''); + if (location.search.indexOf("enable_editor") > -1) { + window.location.href = window.location.href.replace(/enable_editor(=[^&]*)?/g, ''); } else { window.location.reload(); } @@ -151,7 +148,7 @@ }); }); - $(document).on('click', '.js_publish_management .js_publish_btn', function (e) { + $(document).on('click', '.js_publish_management .js_publish_btn', function () { var $data = $(this).parents(".js_publish_management:first"); var $btn = $data.find('.btn:first'); var publish = $btn.hasClass("btn-success"); diff --git a/addons/website/static/src/js/website.snippets.js b/addons/website/static/src/js/website.snippets.js index 35568e8336e..0b1ab4e13cd 100644 --- a/addons/website/static/src/js/website.snippets.js +++ b/addons/website/static/src/js/website.snippets.js @@ -24,6 +24,9 @@ }, save: function () { this.snippets.make_active(false); + + // TODO TOFIX: call clean_for_save on all snippets of the page, not only modified ones + // important for banner of parallax that changes data automatically. this.snippets.clean_for_save(); remove_added_snippet_id(); this._super(); @@ -193,7 +196,7 @@ } self.make_active($target); }); - $("[data-oe-model]").on('click', function (ev) { + $("[data-oe-model]").on('click', function () { if (!snipped_event_flag && self.$active_snipped_id && !self.$active_snipped_id.parents("[data-snippet-id]:first")) { self.make_active(false); } @@ -221,6 +224,7 @@ }, clean_for_save: function () { for (var k in this.snippets) { + if (!this.snippets.hasOwnProperty(k)) { continue; } var editor = $(this.snippets[k]).data("snippet-editor"); if (editor) { editor.clean_for_save(); @@ -338,13 +342,13 @@ }); }, stop: function(ev, ui){ - if (action === 'insert' && ! dropped) { - var el = $('.oe_drop_zone').nearest({x: ui.position.left, y: ui.position.top}).first() - if (el) { - el.after($toInsert) - dropped = true; - } - } + if (action === 'insert' && ! dropped) { + var $el = $('.oe_drop_zone').nearest({x: ui.position.left, y: ui.position.top}).first(); + if ($el) { + $el.after($toInsert); + dropped = true; + } + } $('.oe_drop_zone').droppable('destroy').remove(); if (dropped) { @@ -457,7 +461,7 @@ // count += $zones.length; // $zones.remove(); - $zones = $('.oe_drop_zone > .oe_drop_zone:not(.oe_vertical)').remove(); // no recusrive zones + $zones = $('.oe_drop_zone > .oe_drop_zone:not(.oe_vertical)').remove(); // no recursive zones count += $zones.length; $zones.remove(); } while (count > 0); @@ -468,14 +472,13 @@ var zone = $(this); var prev = zone.prev(); var next = zone.next(); - var float_prev = zone.prev().css('float') || 'none'; - var float_next = zone.next().css('float') || 'none'; - var disp_prev = zone.prev().css('display') || null; - var disp_next = zone.next().css('display') || null; + var float_prev = prev.css('float') || 'none'; + var float_next = next.css('float') || 'none'; + var disp_prev = prev.css('display') || null; + var disp_next = next.css('display') || null; if( (float_prev === 'left' || float_prev === 'right') && (float_next === 'left' || float_next === 'right') ){ zone.remove(); - return; }else if( !( disp_prev === null || disp_next === null || disp_prev === 'block' @@ -686,7 +689,7 @@ var self = this; var $styles = this.$overlay.find('.oe_options'); var $ul = $styles.find('ul:first'); - _.each(this.parent.style_templates, function (val, key) { + _.each(this.parent.style_templates, function (val) { if (!self.parent.dom_filter(val.selector).is(self.$target)) { return; } @@ -754,7 +757,7 @@ /* * build_snippet - * This method is called just after that a thumbnail is drag and droped into a drop zone + * This method is called just after that a thumbnail is drag and dropped into a drop zone * (after the insertion of this.$body, if this.$body exists) */ build_snippet: function ($target) { @@ -768,7 +771,7 @@ }, /* onFocus - * This method is called when the user click outide the snippet in the dom, after a focus + * This method is called when the user click outside the snippet in the dom, after a focus */ onBlur : function () { this.$overlay.removeClass('oe_active'); @@ -787,7 +790,7 @@ var $ul = this.$editor.find(ul_options); var bg_value = (typeof bg === 'string' ? this.$target.find(bg) : $(bg)).css("background-image").replace(/url\(['"]*|['"]*\)/g, ""); - // bind envent on options + // bind event on options var $li = $ul.find("li"); $li.on('click', function (event) { if ($(this).data("value")) { @@ -890,7 +893,8 @@ var regClass = new RegExp("\\s*" + resize[0][begin].replace(/[-]*[0-9]+/, '[-]*[0-9]+'), 'g'); var cursor = $handle.css("cursor")+'-important'; - $("body").addClass(cursor); + var $body = $(document.body); + $body.addClass(cursor); var body_mousemove = function (event){ event.preventDefault(); @@ -917,15 +921,15 @@ self.parent.cover_target(self.$overlay, self.$target); } }; - $('body').mousemove(body_mousemove); var body_mouseup = function(){ - $('body').unbind('mousemove', body_mousemove); - $('body').unbind('mouseup', body_mouseup); - $("body").removeClass(cursor); + $body.unbind('mousemove', body_mousemove); + $body.unbind('mouseup', body_mouseup); + $body.removeClass(cursor); self.parent.editor_busy = false; }; - $('body').mouseup(body_mouseup); + $body.mousemove(body_mousemove); + $body.mouseup(body_mouseup); }); }, getSize: function () { @@ -995,7 +999,7 @@ if (compass !== 'w') return; - // don't change the rigth border position when we change the offset (replace col size) + // don't change the right border position when we change the offset (replace col size) var beginCol = Number(beginClass.match(/col-md-([0-9]+)|$/)[1] || 0); var beginOffset = Number(beginClass.match(/col-md-offset-([0-9-]+)|$/)[1] || beginClass.match(/col-lg-offset-([0-9-]+)|$/)[1] || 0); var offset = Number(this.grid.w[0][current].match(/col-md-offset-([0-9-]+)|$/)[1] || 0); @@ -1018,7 +1022,7 @@ website.snippet.animationRegistry.carousel = website.snippet.Animation.extend({ start: function () { - this.$target.carousel(); + this.$target.carousel({interval: false}); }, }); website.snippet.editorRegistry.carousel = website.snippet.editorRegistry.resize.extend({ @@ -1074,14 +1078,6 @@ self.$target.carousel(); }); - this.$target.on('dblclick', '.item.active .carousel-image img', function (event) { - var $img = $(event.currentTarget); - var editor = new website.editor.ImageDialog(); - editor.on('start', self, function (o) {o.url = $img.attr("src");}); - editor.on('save', self, function (o) {$img.attr("src", o.url);}); - editor.appendTo($('body')); - }); - this.rebind_event(); }, // rebind event to active carousel on edit mode @@ -1133,7 +1129,6 @@ var style = false; var $el = this.$inner.find('.item.active'); var $ul = this.$editor.find('ul[name="carousel-style"]'); - var $li = $ul.find("li"); if ($el.hasClass('text_only')) style = 'text_only'; @@ -1165,7 +1160,6 @@ }); }, change_size: function () { - var self = this; var $el = this.$target; var size = 'oe_big'; @@ -1197,7 +1191,61 @@ website.snippet.editorRegistry.parallax = website.snippet.editorRegistry.resize.extend({ start : function () { this._super(); - this.change_background(this.$target, 'ul[name="parallax-background"]'); + this.change_background($('.parallax', this.$target), 'ul[name="parallax-background"]'); + this.scroll(); + this.change_size(); + }, + scroll: function(){ + 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 ; + + $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); + }); + + }, + clean_for_save: function () { + this._super(); + this.$target.find(".parallax").css("background-position", ''); + }, + 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')) + size = 'oe_small'; + else if ($el.hasClass('oe_medium')) + size = 'oe_medium'; + + var $ul = this.$editor.find('ul[name="parallax-size"]'); + var $li = $ul.find("li"); + + $ul.find('[data-value="' + size + '"]').addClass('active'); + + $li.on('click', function (event) { + $li.removeClass("active"); + $(this).addClass("active"); + }) + .on('mouseover', function (event) { + $el.removeClass('oe_big oe_small oe_medium'); + $el.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")); + }); + } + }); + website.snippet.animationRegistry.parallax = website.snippet.Animation.extend({ + start: function () { + $.stellar({ horizontalScrolling: false, verticalOffset: 0 }); }, }); diff --git a/addons/website/static/src/js/website.tour.basic.js b/addons/website/static/src/js/website.tour.basic.js new file mode 100644 index 00000000000..876d2a7b5b9 --- /dev/null +++ b/addons/website/static/src/js/website.tour.basic.js @@ -0,0 +1,163 @@ +(function () { + 'use strict'; + + var website = openerp.website; + + var render = website.tour.render; + + website.EditorBasicTour = website.EditorTour.extend({ + id: 'add_banner_tour', + name: "Insert a banner", + init: function (editor) { + var self = this; + var $body = $(document.body); + self.steps = [ + { + stepId: 'welcome', + orphan: true, + backdrop: true, + title: "Welcome to your website!", + content: "This tutorial will guide you to build your first page. We will start by adding a banner.", + template: render('website.tour_popover', { next: "Start Tutorial", end: "Skip It" }), + }, + { + 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 Edit button.", + template: render('website.tour_popover'), + }, + { + stepId: 'add-block', + element: 'button[data-action=snippet]', + placement: 'bottom', + title: "Insert building blocks", + 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'); + }); + } + }, + { + stepId: 'drag-banner', + element: '#website-top-navbar [data-snippet-id=carousel].ui-draggable', + placement: 'bottom', + title: "Drag & Drop a Banner", + content: "Drag the Banner block and drop it in your page.

Tip: release the mouse button when you are in a valid zone, with a preview of the banner.

", + template: render('website.tour_popover'), + onShow: function () { + function beginDrag () { + $('.popover.tour').remove(); + function goToNextStep () { + $('#oe_snippets').hide(); + self.movetoStep('edit-title'); + $body.off('mouseup', goToNextStep); + } + $body.off('mousedown', beginDrag); + $body.on('mouseup', goToNextStep); + } + + $body.on('mousedown', beginDrag); + }, + }, + { + stepId: 'edit-title', + element: '#wrap [data-snippet-id=carousel]:first .carousel-caption', + placement: 'left', + title: "Customize banner's text", + content: "Click in the text and start editing it. Click continue once it's done.", + template: render('website.tour_popover', { next: "Continue" }), + onHide: function () { + var $banner = $("#wrap [data-snippet-id=carousel]:first"); + if ($banner.length) { + $banner.click(); + } + }, + }, + { + stepId: 'customize-banner', + element: '.oe_overlay_options .oe_options', + placement: 'left', + title: "Customize the banner", + content: "You can customize components of your page through the Customize menu. Try to change the background of your banner.", + template: render('website.tour_popover', { next: "Continue" }), + onShow: function () { + $('.dropdown-menu [name=carousel-background]').click(function () { + self.movetoStep('save-changes'); + }); + }, + }, + { + stepId: 'save-changes', + element: 'button[data-action=save]', + placement: 'right', + reflex: true, + title: "Save your modifications", + content: "Once you click on save, your website page is updated.", + template: render('website.tour_popover'), + onHide: function () { + self.saveStep('part-2'); + }, + + }, + { + stepId: 'part-2', + orphan: true, + title: "Congratulation!", + content: "Your homepage have been updated. Now, we suggest you to insert others building blocks like texts and images to structure your page.", + template: render('website.tour_popover', { next: "Continue" }), + }, + { + stepId: 'show-tutorials', + element: '#help-menu-button', + placement: 'left', + title: "Help is always available", + content: "But you can always click here if you want more tutorials.", + template: render('website.tour_popover', { end: "Close" }), + } + ]; + return this._super(); + }, + startOfPart2: function () { + var currentStepIndex = this.currentStepIndex(); + var secondPartIndex = this.indexOfStep('part-2'); + var showTutorialsIndex = this.indexOfStep('show-tutorials'); + return (currentStepIndex === secondPartIndex || currentStepIndex === showTutorialsIndex) && !this.tour.ended(); + }, + canResume: function () { + return this.startOfPart2() || this._super(); + }, + }); + + website.EditorBar.include({ + start: function () { + var menu = $('#help-menu'); + var basicTour = new website.EditorBasicTour(this); + var $menuItem = $($.parseHTML('
  • '+basicTour.name+'
    • ')); + $menuItem.click(function () { + basicTour.reset(); + basicTour.start(); + }); + menu.append($menuItem); + var url = new website.UrlParser(window.location.href); + if (url.search.indexOf('?tutorial=true') === 0 || basicTour.startOfPart2()) { + basicTour.start(); + } + $('.tour-backdrop').click(function (e) { + e.stopImmediatePropagation(); + e.preventDefault(); + }); + return this._super(); + }, + }); + +}()); diff --git a/addons/website/static/src/js/website.tour.js b/addons/website/static/src/js/website.tour.js index bfb9a0461d9..f5d3237c28d 100644 --- a/addons/website/static/src/js/website.tour.js +++ b/addons/website/static/src/js/website.tour.js @@ -4,9 +4,11 @@ var website = openerp.website; website.templates.push('/website/static/src/xml/website.tour.xml'); - function render (template, dict) { - return openerp.qweb.render(template, dict); - } + website.tour = { + render: function render (template, dict) { + return openerp.qweb.render(template, dict); + } + }; website.EditorTour = openerp.Class.extend({ tour: undefined, @@ -19,7 +21,7 @@ keyboard: false, }); this.tour.addSteps(_.map(this.steps, function (step) { - step.title = render('website.tour_popover_title', { title: step.title }); + step.title = website.tour.render('website.tour_popover_title', { title: step.title }); return step; })); this.monkeyPatchTour(); @@ -81,137 +83,6 @@ }, }); - website.EditorBasicTour = website.EditorTour.extend({ - id: 'add_banner_tour', - name: "Insert a banner", - init: function (editor) { - var self = this; - self.steps = [ - { - stepId: 'welcome', - orphan: true, - backdrop: true, - title: "Welcome to your website!", - content: "This tutorial will guide you to build your first page. We will start by adding a banner.", - template: render('website.tour_popover', { next: "Start Tutorial", end: "Skip It" }), - }, - { - 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 Edit button.", - template: render('website.tour_popover'), - }, - { - stepId: 'add-block', - element: 'button[data-action=snippet]', - placement: 'bottom', - title: "Insert building blocks", - 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'); - }); - } - }, - { - stepId: 'drag-banner', - element: '#website-top-navbar [data-snippet-id=carousel].ui-draggable', - placement: 'bottom', - title: "Drag & Drop a Banner", - content: "Drag the Banner block and drop it in your page.

    Tip: release the mouse button when you are in a valid zone, with a preview of the banner.

    ", - template: render('website.tour_popover'), - onShow: function () { - function beginDrag () { - $('.popover.tour').remove(); - $('body').off('mousedown', beginDrag); - function goToNextStep () { - $('#oe_snippets').hide(); - self.movetoStep('edit-title'); - $('body').off('mouseup', goToNextStep); - } - $('body').on('mouseup', goToNextStep); - } - $('body').on('mousedown', beginDrag); - }, - }, - { - stepId: 'edit-title', - element: '#wrap [data-snippet-id=carousel]:first .carousel-caption', - placement: 'left', - title: "Customize banner's text", - content: "Click in the text and start editing it. Click continue once it's done.", - template: render('website.tour_popover', { next: "Continue" }), - onHide: function () { - var $banner = $("#wrap [data-snippet-id=carousel]:first"); - if ($banner.length) { - $banner.click(); - } - }, - }, - { - stepId: 'customize-banner', - element: '.oe_overlay_options .oe_options', - placement: 'left', - title: "Customize the banner", - content: "You can customize components of your page through the Customize menu. Try to change the background of your banner.", - template: render('website.tour_popover', { next: "Continue" }), - onShow: function () { - $('.dropdown-menu [name=carousel-background]').click(function () { - self.movetoStep('save-changes'); - }); - }, - }, - { - stepId: 'save-changes', - element: 'button[data-action=save]', - placement: 'right', - reflex: true, - title: "Save your modifications", - content: "Once you click on save, your website page is updated.", - template: render('website.tour_popover'), - onHide: function () { - self.saveStep('part-2'); - }, - - }, - { - stepId: 'part-2', - orphan: true, - title: "Congratulation!", - content: "Your homepage have been updated. Now, we suggest you to insert others building blocks like texts and images to structure your page.", - template: render('website.tour_popover', { next: "Continue" }), - }, - { - stepId: 'show-tutorials', - element: '#help-menu-button', - placement: 'left', - title: "Help is always available", - content: "But you can always click here if you want more tutorials.", - template: render('website.tour_popover', { end: "Close" }), - }, - ]; - return this._super(); - }, - startOfPart2: function () { - var currentStepIndex = this.currentStepIndex(); - var secondPartIndex = this.indexOfStep('part-2'); - var showTutorialsIndex = this.indexOfStep('show-tutorials'); - return (currentStepIndex === secondPartIndex || currentStepIndex === showTutorialsIndex) && !this.tour.ended(); - }, - canResume: function () { - return this.startOfPart2() || this._super(); - }, - }); - website.UrlParser = openerp.Class.extend({ init: function (url) { var a = document.createElement('a'); @@ -227,30 +98,4 @@ }, }); - website.EditorBar.include({ - start: function () { - website.tutorials = { - basic: new website.EditorBasicTour(this), - }; - var menu = $('#help-menu'); - _.each(website.tutorials, function (tutorial) { - var $menuItem = $($.parseHTML('
  • '+tutorial.name+'
    • ')); - $menuItem.click(function () { - tutorial.reset(); - tutorial.start(); - }); - menu.append($menuItem); - }); - var url = new website.UrlParser(window.location.href); - if (url.search.indexOf('?tutorial=true') === 0 || website.tutorials.basic.startOfPart2()) { - website.tutorials.basic.start(); - } - $('.tour-backdrop').click(function (e) { - e.stopImmediatePropagation(); - e.preventDefault(); - }); - return this._super(); - }, - }); - }()); diff --git a/addons/website/static/src/js/website.translator.js b/addons/website/static/src/js/website.translator.js index fddb5ef7b51..7e237598530 100644 --- a/addons/website/static/src/js/website.translator.js +++ b/addons/website/static/src/js/website.translator.js @@ -6,11 +6,16 @@ var nodialog = 'website_translator_nodialog'; website.EditorBar.include({ + events: _.extend({}, website.EditorBar.prototype.events, { + 'click a[data-action=edit_master]': 'edit_master', + }), start: function () { var self = this; this.initial_content = {}; return this._super.apply(this, arguments).then(function () { - self.$('button[data-action=edit]').text("Translate"); + self.$('button[data-action=edit]') + .text("Translate") + .after(openerp.qweb.render('website.TranslatorAdditionalButtons')); self.$('[data-action=snippet]').hide(); self.$('#customize-menu-button').hide(); }); @@ -24,7 +29,7 @@ dialog.on('activate', this, function () { localStorage[nodialog] = dialog.$('input[name=do_not_show]').prop('checked') || ''; dialog.$el.modal('hide'); - this.translate().then(function () { + self.translate().then(function () { mysuper.call(self); }); }); @@ -34,6 +39,14 @@ }); } }, + edit_master: function (ev) { + ev.preventDefault(); + var link = $('.js_language_selector a[data-default-lang]')[0]; + if (link) { + link.search += (link.search ? '&' : '?') + 'enable_editor=1'; + window.location = link.attributes.href.value; + } + }, translate: function () { var self = this; this.translations = null; @@ -44,7 +57,7 @@ self.translations = translations; self.processTranslatableNodes(); // Disable non translatable t-fields - $('[data-oe-type][data-oe-translate=0]').removeAttr('data-oe-type'); + $('[data-oe-type][data-oe-translate="0"]').removeAttr('data-oe-type'); }); }, processTranslatableNodes: function () { @@ -143,7 +156,6 @@ if (node.attributes['data-oe-translate'].value == '1') { node.className += ' oe_translatable_field'; } - return; } else if (node.childNodes.length === 1 && this.isTextNode(node.childNodes[0]) && !node.getAttribute('data-oe-model')) { @@ -175,7 +187,7 @@ $(root).click(function (ev) { ev.preventDefault(); }); - return $('[data-oe-translate=1]'); + return $('[data-oe-translate="1"]'); } }); diff --git a/addons/website/static/src/xml/website.seo.xml b/addons/website/static/src/xml/website.seo.xml index 580779283ad..17d68fb70f0 100644 --- a/addons/website/static/src/xml/website.seo.xml +++ b/addons/website/static/src/xml/website.seo.xml @@ -17,7 +17,7 @@

    1. Define Keywords describing your page content

    - +
    diff --git a/addons/website/static/src/xml/website.translator.xml b/addons/website/static/src/xml/website.translator.xml index f35cf583da9..dac074688d8 100644 --- a/addons/website/static/src/xml/website.translator.xml +++ b/addons/website/static/src/xml/website.translator.xml @@ -1,5 +1,9 @@ + + or + Edit Master +
    diff --git a/addons/website/views/website_templates.xml b/addons/website/views/website_templates.xml index 48b241654f8..430ed49e08b 100644 --- a/addons/website/views/website_templates.xml +++ b/addons/website/views/website_templates.xml @@ -43,6 +43,7 @@ + @@ -52,6 +53,7 @@ + @@ -71,6 +73,7 @@ + @@ -100,15 +103,16 @@
  • - - + + -