From b3599c6848b7d2b82ceba4cab9e7ee25e2ba73c8 Mon Sep 17 00:00:00 2001 From: mwolff44 Date: Thu, 26 May 2016 15:47:39 +0200 Subject: [PATCH 01/34] django 1.6 templates compatibility update --- .../admin/edit_inline/one-to-one-inline.html | 12 +++++------- yawdadmin/templates/admin/edit_inline/popup.html | 2 +- yawdadmin/templates/admin/edit_inline/stacked.html | 4 +--- yawdadmin/templates/admin/edit_inline/tabular.html | 2 +- .../admin/edit_inline/translatable-inline.html | 14 ++++---------- 5 files changed, 12 insertions(+), 22 deletions(-) mode change 100644 => 100755 yawdadmin/templates/admin/edit_inline/one-to-one-inline.html mode change 100644 => 100755 yawdadmin/templates/admin/edit_inline/popup.html mode change 100644 => 100755 yawdadmin/templates/admin/edit_inline/stacked.html mode change 100644 => 100755 yawdadmin/templates/admin/edit_inline/tabular.html mode change 100644 => 100755 yawdadmin/templates/admin/edit_inline/translatable-inline.html diff --git a/yawdadmin/templates/admin/edit_inline/one-to-one-inline.html b/yawdadmin/templates/admin/edit_inline/one-to-one-inline.html old mode 100644 new mode 100755 index 62e0b41..915d296 --- a/yawdadmin/templates/admin/edit_inline/one-to-one-inline.html +++ b/yawdadmin/templates/admin/edit_inline/one-to-one-inline.html @@ -1,15 +1,13 @@ -{% load i18n admin_static %}
{% if inline_admin_formset.opts.show_title %} - {{ inline_admin_formset.opts.verbose_name|title }}{% if inline_admin_formset.opts.collapse %} {% endif %}{% if inline_admin_formset.opts.description %} -
{{inline_admin_formset.opts.description|safe}}
{% endif %}{% endif %} +{% load i18n admin_static %}
+ {{ inline_admin_formset.opts.verbose_name_plural|title }}{% if inline_admin_formset.opts.collapse %} {% endif %}{% if inline_admin_formset.opts.description %} +
{{inline_admin_formset.opts.description|safe}}
{% endif %}
{{ inline_admin_formset.formset.management_form }}{% if inline_admin_formset.formset.non_form_errors %} -
+
{{ inline_admin_formset.formset.non_form_errors }}
{% endif %}{% for inline_admin_form in inline_admin_formset %}
{% if inline_admin_form.form.non_field_errors %} -
- {{ inline_admin_form.form.non_field_errors }} -
{% endif %}{% with fprefix=inline_admin_formset.formset.prefix %}{% for fieldset in inline_admin_form %} + {{ inline_admin_form.form.non_field_errors }}{% endif %}{% with fprefix=inline_admin_formset.formset.prefix %}{% for fieldset in inline_admin_form %} {% include "admin/includes/fieldset.html" %}{% endfor %}{% endwith %}{% if inline_admin_form.has_auto_field or inline_admin_form.needs_explicit_pk_field %} {{ inline_admin_form.pk_field.field }}{% endif %} {{ inline_admin_form.fk_field.field }} diff --git a/yawdadmin/templates/admin/edit_inline/popup.html b/yawdadmin/templates/admin/edit_inline/popup.html old mode 100644 new mode 100755 index 1ffb85a..0df11d2 --- a/yawdadmin/templates/admin/edit_inline/popup.html +++ b/yawdadmin/templates/admin/edit_inline/popup.html @@ -107,4 +107,4 @@

{% trans 'Delete' })(yawdadmin.jQuery); {% endif %}{% else %} {{ inline_admin_formset.formset.management_form }} - {% endif %} + {% endif %} \ No newline at end of file diff --git a/yawdadmin/templates/admin/edit_inline/stacked.html b/yawdadmin/templates/admin/edit_inline/stacked.html old mode 100644 new mode 100755 index 5c9a2ef..f8587b4 --- a/yawdadmin/templates/admin/edit_inline/stacked.html +++ b/yawdadmin/templates/admin/edit_inline/stacked.html @@ -20,9 +20,7 @@

{% blocktrans with inline_admin_formset.opts.verbose_name|title as modaltitl

{% endif %}{% if inline_admin_form.form.non_field_errors %} -
- {{ inline_admin_form.form.non_field_errors }} -
{% endif %}{% with fprefix=inline_admin_formset.formset.prefix inlinefieldset=1 %}{% for fieldset in inline_admin_form %} + {{ inline_admin_form.form.non_field_errors }}{% endif %}{% with fprefix=inline_admin_formset.formset.prefix inlinefieldset=1 %}{% for fieldset in inline_admin_form %} {% include "admin/includes/fieldset.html" %}{% endfor %}{% endwith %}{% if inline_admin_form.has_auto_field or inline_admin_form.needs_explicit_pk_field %} {{ inline_admin_form.pk_field.field }}{% endif %} {{ inline_admin_form.fk_field.field }}{% if inline_admin_formset.opts.modal %} diff --git a/yawdadmin/templates/admin/edit_inline/tabular.html b/yawdadmin/templates/admin/edit_inline/tabular.html old mode 100644 new mode 100755 index 4c609f4..513fed8 --- a/yawdadmin/templates/admin/edit_inline/tabular.html +++ b/yawdadmin/templates/admin/edit_inline/tabular.html @@ -53,4 +53,4 @@ deleteText: "{% trans 'Remove' %}" }); })(yawdadmin.jQuery);{% block extrainlinejs %}{% endblock %} - + \ No newline at end of file diff --git a/yawdadmin/templates/admin/edit_inline/translatable-inline.html b/yawdadmin/templates/admin/edit_inline/translatable-inline.html old mode 100644 new mode 100755 index b18b662..1c65fae --- a/yawdadmin/templates/admin/edit_inline/translatable-inline.html +++ b/yawdadmin/templates/admin/edit_inline/translatable-inline.html @@ -12,9 +12,9 @@

{{ inline_admin_formset.opts.verbose_name_plural|title }}

{% endif %}{% {% trans "Please set at least one language to manage translatable objects." %}
{% else %}
{% if inline_admin_formset.formset|length > 1 %} -
{% endif %}{% endfor %} From 2d4d62085c91df1db5906a5c19faf1c6afb9793a Mon Sep 17 00:00:00 2001 From: mwolff44 Date: Thu, 26 May 2016 15:47:53 +0200 Subject: [PATCH 02/34] Bug fixed for oauth2client==2.0.1 --- yawdadmin/views.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/yawdadmin/views.py b/yawdadmin/views.py index cd07dc6..af7d364 100644 --- a/yawdadmin/views.py +++ b/yawdadmin/views.py @@ -1,5 +1,8 @@ import json -from oauth2client import xsrfutil +try: + from oauth2client import xsrfutil +except ImportError: + from oauth2client.contrib import xsrfutil from oauth2client.file import Storage from django.conf import settings from django.contrib import messages From b13b21eecfebf55c1afe5b803c430e47bca1a262 Mon Sep 17 00:00:00 2001 From: mwolff44 Date: Thu, 26 May 2016 16:10:51 +0200 Subject: [PATCH 03/34] Readme update --- README.rst | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/README.rst b/README.rst index d14374a..26162d6 100644 --- a/README.rst +++ b/README.rst @@ -1,14 +1,10 @@ yawd-admin, a django administration website ====================================================== -yawd-admin now has a live demo at -`http://yawd-admin.yawd.eu/ `_. -Use demo / demo as username & passowrd. - .. image:: docs/yawd-admin-screenshot.png :align: center -`yawd-admin `_ is an +yawd-admin is an administration website for django. It extends the default django admin site and offers the following: @@ -22,23 +18,27 @@ site and offers the following: * Mechanism for opening the original django admin popup windows with fancybox * Seamless integration with `yawd-translations` for multilingual admin websites -.. note:: +History +============== + +master (dev) +++++++++++++ +is developped under django 1.6.x and does NOT work with older Django releases. + +v0.7.0 +++++++ +is developed under Django 1.5.x and does NOT work with older Django releases. + +v0.6.1 +++++++ - yawd-admin v0.6.1 is the last version intended to work with - Django 1.4. yawd-admin v.0.7.0 and on is developed under Django 1.5.x - and does NOT work with older Django releases. For those still using - Django 1.4, you can checkout the ``0.6.x`` branch or use the yawd-admin - v0.6.1 pypi package. New features will not be backported to the ``0.6.x`` - branch. Since many of us run production systems tied to Django 1.4, both - v0.6.1 and the latest documentation will be online on readthedocs.org. +is the last version intended to work with Django 1.4. New features will not be backported to the ``0.6.x`` branch. Since many of us run production systems tied to Django 1.4, both v0.6.1 and the latest documentation will be online on readthedocs.org. Usage and demo ============== See the `yawd-admin documentation `_ -for information on how to install the demo and use yawd-admin. There is also an -online version of the demo at `http://yawd-admin.yawd.eu/ `_. -Just use *demo*/*demo* as username and password. +for information on how to install the demo and use yawd-admin. Screenshots =========== From d6a184483fc42beea806ef1dee12ce5c37e4b52e Mon Sep 17 00:00:00 2001 From: mwolff44 Date: Thu, 26 May 2016 16:29:23 +0200 Subject: [PATCH 04/34] templates update + constance admin template added I just integrate the work done here : https://github.com/APSL/yawd-admin --- yawdadmin/templates/admin/base.html | 5 ++ yawdadmin/templates/admin/base_site.html | 2 +- .../admin/constance/change_list.html | 87 +++++++++++++++++++ .../templates/admin/includes/topmenu.html | 4 +- .../templates/admin/logged_out_base.html | 4 +- yawdadmin/templatetags/yawdadmin_tags.py | 1 + 6 files changed, 98 insertions(+), 5 deletions(-) create mode 100644 yawdadmin/templates/admin/constance/change_list.html diff --git a/yawdadmin/templates/admin/base.html b/yawdadmin/templates/admin/base.html index 0203739..7e49442 100644 --- a/yawdadmin/templates/admin/base.html +++ b/yawdadmin/templates/admin/base.html @@ -11,6 +11,11 @@ {% block extrastyle %}{% endblock %} + + {% if ADMIN_EXTRA_CSS %} + + {% endif %} + {% block extrahead %}{% endblock %}{% block blockbots %} {% endblock %} diff --git a/yawdadmin/templates/admin/base_site.html b/yawdadmin/templates/admin/base_site.html index 7efb534..6ba2986 100644 --- a/yawdadmin/templates/admin/base_site.html +++ b/yawdadmin/templates/admin/base_site.html @@ -1,3 +1,3 @@ {% extends "admin/base.html" %}{% load i18n yawdadmin_tags %} -{% block title %}{% block inner-title %}{{ title }}{% endblock %} | {{ ADMIN_SITE_NAME }}{% endblock %} \ No newline at end of file +{% block title %}{% block inner-title %}{{ title }}{% endblock %} | {{ ADMIN_SITE_NAME|striptags }}{% endblock %} diff --git a/yawdadmin/templates/admin/constance/change_list.html b/yawdadmin/templates/admin/constance/change_list.html new file mode 100644 index 0000000..8879c39 --- /dev/null +++ b/yawdadmin/templates/admin/constance/change_list.html @@ -0,0 +1,87 @@ +{% extends "admin/base_site.html" %} +{% load constance_tags admin_list i18n %} + + +{% block extrastyle %} +{{ block.super }} + + +{{ media.css }} + +{% endblock %} + +{% block extrahead %} +{% url 'admin:jsi18n' as jsi18nurl %} + +{{ block.super }} +{{ media.js }} +{% endblock %} + +{% block bodyclass %}change-list{% endblock %} + +{% block content %} +
+
+
{% csrf_token %} + + + + + + + + + + {% for item in config %} + + + + + + + {% endfor %} +
{% trans "Name" %}{% trans "Default" %}{% trans "Value" %}{% trans "Is modified" %}
{{item.name}} +
{{item.help_text}}
+ 		+ {{ item.default }} + + {{item.form_field.errors}} + {{item.form_field}} + + {% if item.modified %} + {{ item.modified }} + {% else %} + {{ item.modified }} + {% endif %} +
+

+ +

+
+
+
+{% endblock %} + +{% block breadcrumbs %} +
+ + {% trans "Home" %} + + › + + {{ app_label|capfirst }} + + › + {{ opts.verbose_name_plural|capfirst }} +
+{% endblock %} diff --git a/yawdadmin/templates/admin/includes/topmenu.html b/yawdadmin/templates/admin/includes/topmenu.html index 4f8e1f6..0103225 100644 --- a/yawdadmin/templates/admin/includes/topmenu.html +++ b/yawdadmin/templates/admin/includes/topmenu.html @@ -4,7 +4,7 @@
- {{ ADMIN_SITE_NAME }} + {{ ADMIN_SITE_NAME|safe }}
-
\ No newline at end of file +
diff --git a/yawdadmin/templates/admin/logged_out_base.html b/yawdadmin/templates/admin/logged_out_base.html index 9ccc0fd..784a639 100644 --- a/yawdadmin/templates/admin/logged_out_base.html +++ b/yawdadmin/templates/admin/logged_out_base.html @@ -4,7 +4,7 @@ {% block mainbody %}
-

{{ ADMIN_SITE_NAME }}

+

{{ ADMIN_SITE_NAME|safe }}

{% if ADMIN_SITE_DESCRIPTION %}

{{ ADMIN_SITE_DESCRIPTION }}

{% endif %}{% if langs and langs|length > 1 %} @@ -16,4 +16,4 @@

{{ ADMIN_SITE_NAME }}

{% block content %}{% endblock %}
-
{% endblock %} \ No newline at end of file + {% endblock %} diff --git a/yawdadmin/templatetags/yawdadmin_tags.py b/yawdadmin/templatetags/yawdadmin_tags.py index c5f5b28..cf4cdc9 100644 --- a/yawdadmin/templatetags/yawdadmin_tags.py +++ b/yawdadmin/templatetags/yawdadmin_tags.py @@ -67,6 +67,7 @@ def get_admin_site_meta(context): context['ADMIN_SITE_DESCRIPTION'] = getattr(settings, 'ADMIN_SITE_DESCRIPTION', _('Welcome to the yawd-admin administration page. Please sign in to manage your website.')) context['ADMIN_DISABLE_APP_INDEX'] = getattr(settings, 'ADMIN_DISABLE_APP_INDEX', False) + context["ADMIN_EXTRA_CSS"] = getattr(settings, "ADMIN_EXTRA_CSS", None) return '' From a6c6633bb695a21e6f07fd5c9984e60872c069fe Mon Sep 17 00:00:00 2001 From: mwolff44 Date: Thu, 26 May 2016 17:53:16 +0200 Subject: [PATCH 05/34] Update admin_forms.py --- yawdadmin/admin_forms.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/yawdadmin/admin_forms.py b/yawdadmin/admin_forms.py index 2a0f76c..86092ca 100644 --- a/yawdadmin/admin_forms.py +++ b/yawdadmin/admin_forms.py @@ -1,8 +1,8 @@ from django import forms -from django.contrib.auth import get_user_model +from django.contrib.auth.models import User class AdminUserModelForm(forms.ModelForm): class Meta: - model = get_user_model() + model = User fields = ('username', 'first_name', 'last_name', 'email') From 53621cd5da8b0e953508c5c3a27d99734f5ffb4e Mon Sep 17 00:00:00 2001 From: mwolff44 Date: Thu, 26 May 2016 17:58:30 +0200 Subject: [PATCH 06/34] update django version requirement --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 24feeaa..13eb108 100644 --- a/setup.py +++ b/setup.py @@ -24,7 +24,7 @@ include_package_data = True, install_requires = [ "httplib2", - "django >= 1.5", + "django >=1.6, <1.7", "oauth2client" ], zip_safe=False From 810b9ae705b83cc19511b0afab09b82adad0c941 Mon Sep 17 00:00:00 2001 From: mwolff44 Date: Thu, 26 May 2016 18:04:07 +0200 Subject: [PATCH 07/34] add test if models in app --- yawdadmin/sites.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/yawdadmin/sites.py b/yawdadmin/sites.py index 2fcc37f..15fb121 100644 --- a/yawdadmin/sites.py +++ b/yawdadmin/sites.py @@ -310,10 +310,11 @@ def top_menu(self, request): #register custom menus for app in self._top_menu.values(): if isinstance(app, dict): - for child in app['models']: - if not 'show' in child and 'perms' in app and hasattr(app['perms'], '__call__'): - child['show'] = app['perms'](request, child) - app_list.append(app) + if 'models' in app: + for child in app['models']: + if not 'show' in child and 'perms' in app and hasattr(app['perms'], '__call__'): + child['show'] = app['perms'](request, child) + app_list.append(app) app_list.sort(key=lambda x: x['name']) From d3c55485a146be2aa677e64d50c6d133c234f9b5 Mon Sep 17 00:00:00 2001 From: mwolff44 Date: Thu, 26 May 2016 18:07:31 +0200 Subject: [PATCH 08/34] Add spanish language Thx to https://github.com/miguelservinet --- yawdadmin/locale/es/LC_MESSAGES/django.mo | Bin 0 -> 1890 bytes yawdadmin/locale/es/LC_MESSAGES/django.po | 975 ++++++++++++++++++++++ 2 files changed, 975 insertions(+) create mode 100644 yawdadmin/locale/es/LC_MESSAGES/django.mo create mode 100644 yawdadmin/locale/es/LC_MESSAGES/django.po diff --git a/yawdadmin/locale/es/LC_MESSAGES/django.mo b/yawdadmin/locale/es/LC_MESSAGES/django.mo new file mode 100644 index 0000000000000000000000000000000000000000..4e6373d4e89b6dd9de0105483f9ca57f189269f1 GIT binary patch literal 1890 zcmZvb&u<$=6vqb$zg$`%6hiq?9zuvz>AFt%6`Z846FaGee<^lSg#*%fcd}l(o{45= z6D=7VTZegYo?e+C}~e*w>czk-i|f8@LiK8f)?a0dJ*pP#|zIgHPMy#FvzDXz~4Z8;w~EY z`zOf${sLLoSxoZ$9GYjriy-fR3*>vPf^2sUWS#YVd^4v6+3ps|=V*}q_=N!oA%!4oyOCaCpJ@6H99mMs=8rW{E6(m$H7bY0D9AEwioIlT_ z@_o;vvOf07=g*?Pi24F5>o_Sdqr?A~W6$S4hsuRDa$#+pZzttxbojrW6v!Osk*Guw zSJLX}gk;T;*pNC@sn{4u9jhGFko*&g^~pi1$n-x_p?CT6HBpNa zKW^yt`Jss<%zUaYIkB0fURfu$jJT0FZ|q1kOl&eQnj@-&p~>{PEAwuvEm~07k+C9e zJnh3E65DEM4wdLCX~RLWSQNd1vWg_CHe^)@y^co87iq^S@&iSy&Re77t1^mKujGB| zXWko4vJY?M4TV-FmxK*j5L|`k?9JBnsBE*abaP zrb4IP3pQ91HU%91GA)%B-wYN@!P48bxLhv1yHHvxm0%cbtHXqy=XQIw%68Cf2h|GQ zXqTJyg%8@TTA?AG4|-N=mrBIGOq)B62DK{98m-ovm3rfPrCQytb-Pz#s^bh%4|+-t z%haf}wsu(ZYNK&IO^U|GQyWNa)|<8I{T7R*!iLdaX&g5?fNrlo_E!#4ndlV?2huv_ z*LHfF!Sd9OW$h~))O2W~M8{=X?kB#`Ni!?cVAI&4E0aDL58c|*3Qf9e^O{~=qs2=r z1yPBuilsdv=}aA(|BNO{4x?c!B6Ma)bp;$N8Vs!#Klr}LAsTCt@t#P83Cc{Ka zJIQqza>`5lfBDYlb(`mVBJsc!yQZ$zlw1Tr?o;{w6`*n z_Z_~Txlmeu0xd%WIU, YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2013-10-25 18:07+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: admin.py:49 +#, python-format +msgid "%(name)s object with primary key %(key)r does not exist." +msgstr "" + +#: admin.py:210 +msgid "No data sent with the request" +msgstr "" + +#: admin.py:214 +msgid "Unable to reorder objects" +msgstr "" + +#: admin.py:215 templates/admin/edit_inline/popup.html:99 +msgid "The order was saved" +msgstr "" + +#: sites.py:386 +msgid "Site administration" +msgstr "" + +#: sites.py:405 +#, python-format +msgid "%s administration" +msgstr "" + +#: views.py:48 +msgid "The options were succesfully saved." +msgstr "" + +#: views.py:73 +msgid "The user was successfully connected." +msgstr "" + +#: views.py:119 +msgid "" +"The server does not have permissions to write to the token file. Please " +"contact your system administrator." +msgstr "" + +#: views.py:145 +msgid "Your account has been updated successfuly." +msgstr "" + +#: views.py:153 templates/registration/password_change_done.html:6 +#: templates/registration/password_change_form.html:10 +msgid "My account" +msgstr "Mi cuenta" + +#: widgets.py:105 +msgid "YES" +msgstr "SI" + +#: widgets.py:106 +msgid "NO" +msgstr "NO" + +#: templates/admin/404.html:4 templates/admin/404.html.py:8 +msgid "Page not found" +msgstr "Página no encontrada" + +#: templates/admin/404.html:10 +msgid "We're sorry, but the requested page could not be found." +msgstr "" + +#: templates/admin/500.html:4 +msgid "Server error" +msgstr "" + +#: templates/admin/500.html:6 +msgid "Server error (500)" +msgstr "" + +#: templates/admin/500.html:9 +msgid "Server Error (500)" +msgstr "" + +#: templates/admin/500.html:10 +msgid "" +"There's been an error. It's been reported to the site administrators via e-" +"mail and should be fixed shortly. Thanks for your patience." +msgstr "" + +#: templates/admin/actions.html:3 +msgid "Run the selected action" +msgstr "" + +#: templates/admin/actions.html:3 +msgid "Go" +msgstr "Ir" + +#: templates/admin/actions.html:8 +msgid "Click here to select the objects across all pages" +msgstr "" + +#: templates/admin/actions.html:8 +#, python-format +msgid "Select all %(total_count)s %(module_name)s" +msgstr "" + +#: templates/admin/actions.html:11 +msgid "Clear selection" +msgstr "" + +#: templates/admin/analytics.html:6 templates/admin/analytics.html.py:10 +#: templates/admin/includes/topmenu.html:35 +msgid "Configure Google Analytics" +msgstr "" + +#: templates/admin/analytics.html:17 +msgid "Profile ID" +msgstr "" + +#: templates/admin/analytics.html:21 +msgid "Showing last" +msgstr "" + +#: templates/admin/analytics.html:22 +msgid "days" +msgstr "" + +#: templates/admin/analytics.html:25 +msgid "Connected" +msgstr "" + +#: templates/admin/analytics.html:26 templates/admin/analytics.html.py:34 +#: templates/admin/includes/translation_messages_list.html:5 +msgid "Yes" +msgstr "" + +#: templates/admin/analytics.html:26 templates/admin/analytics.html.py:34 +#: templates/admin/includes/translation_messages_list.html:5 +msgid "No" +msgstr "" + +#: templates/admin/analytics.html:29 +msgid "Current session expiry" +msgstr "" + +#: templates/admin/analytics.html:33 +msgid "Refresh token" +msgstr "" + +#: templates/admin/analytics.html:40 templates/admin/analytics.html.py:41 +msgid "Authenticate new account" +msgstr "" + +#: templates/admin/analytics.html:41 +#: templates/admin/auth/user/change_password.html:37 +#: templates/admin/includes/base_form.html:17 +#: templates/admin/includes/fieldset-with-hidden-language.html:15 +#: templates/admin/includes/fieldset.html:17 +#: templates/admin/includes/optionfields.html:9 +msgid "help text" +msgstr "" + +#: templates/admin/analytics.html:41 +msgid "" +"

Use this button to connect to a Google account and enable statistics. The " +"google account must have access to the above Google Analytics Profile ID.

add button above to " +"create a new" +msgstr "No hay ningún registro todavía. Use el botón Agregar para crear un nuevo registro." + +#: templates/admin/delete_confirmation.html:3 +#: templates/admin/delete_confirmation.html:16 +#: templates/admin/delete_selected_confirmation.html:3 +#: templates/admin/submit_line.html:4 +#: templates/admin/edit_inline/popup.html:23 +#: templates/admin/edit_inline/popup.html:33 +#: templates/admin/edit_inline/popup.html:43 +#: templates/admin/import_export/import.html:105 +msgid "Delete" +msgstr "Borrar" + +#: templates/admin/delete_confirmation.html:7 +#: templates/admin/delete_selected_confirmation.html:7 +msgid "delete" +msgstr "borrar" + +#: templates/admin/delete_confirmation.html:21 +#, python-format +msgid "" +"Deleting the %(object_name)s '%(escaped_object)s' would result in deleting " +"related objects, but your account doesn't have permission to delete the " +"following types of objects:" +msgstr "" + +#: templates/admin/delete_confirmation.html:25 +#, python-format +msgid "" +"Deleting the %(object_name)s '%(escaped_object)s' would require deleting the " +"following protected related objects:" +msgstr "" + +#: templates/admin/delete_confirmation.html:29 +#, python-format +msgid "" +"Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? " +"All of the following related items will be deleted:" +msgstr "" + +#: templates/admin/delete_confirmation.html:36 +#: templates/admin/delete_selected_confirmation.html:37 +#: templates/admin/edit_inline/popup.html:42 +msgid "Cancel" +msgstr "Cancelar" + +#: templates/admin/delete_confirmation.html:37 +#: templates/admin/delete_selected_confirmation.html:38 +msgid "Yes, I'm sure" +msgstr "Si, estoy seguro" + +#: templates/admin/delete_selected_confirmation.html:15 +msgid "Delete multiple objects" +msgstr "Borrar varios registros" + +#: templates/admin/delete_selected_confirmation.html:20 +#, python-format +msgid "" +"Deleting the selected %(objects_name)s would result in deleting related " +"objects, but your account doesn't have permission to delete the following " +"types of objects:" +msgstr "" + +#: templates/admin/delete_selected_confirmation.html:24 +#, python-format +msgid "" +"Deleting the selected %(objects_name)s would require deleting the following " +"protected related objects:" +msgstr "" + +#: templates/admin/delete_selected_confirmation.html:28 +#, python-format +msgid "" +"Are you sure you want to delete the selected %(objects_name)s? All of the " +"following objects and their related items will be deleted:" +msgstr "" + +#: templates/admin/edit_translation_messages.html:9 +msgid "Translate Static Messages" +msgstr "" + +#: templates/admin/filter.html:1 +#, python-format +msgid "%(filter_title)s" +msgstr "" + +#: templates/admin/index.html:11 +msgid "Date" +msgstr "Fecha" + +#: templates/admin/index.html:11 templates/admin/import_export/import.html:101 +msgid "New" +msgstr "Nuevo" + +#: templates/admin/index.html:11 +msgid "Returning" +msgstr "" + +#: templates/admin/index.html:11 templates/admin/index.html.py:45 +msgid "Total visits" +msgstr "" + +#: templates/admin/index.html:16 +msgid "Last 30 days visits" +msgstr "" + +#: templates/admin/index.html:36 templates/reversion/recover_list.html:9 +msgid "Home" +msgstr "" + +#: templates/admin/index.html:46 +msgid "Visitors" +msgstr "" + +#: templates/admin/index.html:47 +msgid "Pageviews" +msgstr "" + +#: templates/admin/index.html:48 +msgid "Avg. visit time" +msgstr "" + +#: templates/admin/index.html:49 +msgid "Bounce rate" +msgstr "" + +#: templates/admin/index.html:50 +msgid "New visits" +msgstr "" + +#: templates/admin/index.html:54 +#: templates/admin/edit_inline/translatable-inline.html:11 +msgid "Warning!" +msgstr "" + +#: templates/admin/index.html:55 +msgid "Analytics data could not be generated" +msgstr "" + +#: templates/admin/index.html:56 +msgid "The key has expired." +msgstr "" + +#: templates/admin/index.html:57 +#, python-format +msgid "" +"The analytics user is not authenticated. Click " +"here to connect a user with the analytics account." +msgstr "" + +#: templates/admin/index.html:58 +msgid "" +"Your account has no data yet. Just be patient, visits will come! :)" +msgstr "" + +#: templates/admin/index.html:59 +msgid "Error code" +msgstr "" + +#: templates/admin/index.html:66 +#, python-format +msgid "'%(name)s' section links." +msgstr "" + +#: templates/admin/index.html:108 +msgid "Recent Actions" +msgstr "" + +#: templates/admin/index.html:110 +msgid "My Actions" +msgstr "" + +#: templates/admin/index.html:112 +msgid "No history yet" +msgstr "" + +#: templates/admin/index.html:119 +msgid "Unknown content" +msgstr "" + +#: templates/admin/invalid_setup.html:10 +msgid "" +"Something's wrong with your database installation. Make sure the appropriate " +"database tables have been created, and make sure the database is readable by " +"the appropriate user." +msgstr "" + +#: templates/admin/login.html:15 +msgid "Sign In" +msgstr "" + +#: templates/admin/login.html:21 +msgid "Login" +msgstr "" + +#: templates/admin/login.html:31 +#: templates/admin/auth/user/change_password.html:32 +msgid "Password" +msgstr "" + +#: templates/admin/login.html:41 +#: templates/registration/password_reset_complete.html:10 +msgid "Log in" +msgstr "" + +#: templates/admin/login.html:42 +msgid "Forgot password?" +msgstr "" + +#: templates/admin/object_history.html:7 +msgid "history" +msgstr "" + +#: templates/admin/object_history.html:25 +#: templates/reversion/object_history.html:12 +#: templates/reversion/recover_list.html:24 +#: templates/reversion-compare/object_history.html:24 +msgid "Date/time" +msgstr "" + +#: templates/admin/object_history.html:26 +#: templates/reversion/object_history.html:13 +#: templates/reversion-compare/object_history.html:25 +msgid "User" +msgstr "" + +#: templates/admin/object_history.html:27 +#: templates/reversion/object_history.html:14 +msgid "Action" +msgstr "" + +#: templates/admin/object_history.html:38 +#: templates/reversion/object_history.html:30 +#: templates/reversion-compare/object_history.html:56 +msgid "" +"This object doesn't have a change history. It probably wasn't added via this " +"admin site." +msgstr "" + +#: templates/admin/options.html:19 templates/admin/options.html.py:46 +#: templates/admin/pagination.html:12 templates/admin/submit_line.html:8 +msgid "Save" +msgstr "" + +#: templates/admin/options.html:31 +msgid "Translatable options" +msgstr "" + +#: templates/admin/pagination.html:9 +msgid "Show all" +msgstr "" + +#: templates/admin/search_form.html:7 +#, python-format +msgid "%(counter)s result" +msgid_plural "%(counter)s results" +msgstr[0] "" +msgstr[1] "" + +#: templates/admin/search_form.html:7 +#, python-format +msgid "%(full_result_count)s total" +msgstr "" + +#: templates/admin/search_form.html:7 +msgid "Search..." +msgstr "Buscar..." + +#: templates/admin/submit_line.html:5 +msgid "Save as new" +msgstr "" + +#: templates/admin/submit_line.html:6 +msgid "Save and add another" +msgstr "" + +#: templates/admin/submit_line.html:7 +msgid "Save and continue editing" +msgstr "" + +#: templates/admin/translation_messages.html:54 +msgid "Generate messages" +msgstr "" + +#: templates/admin/translation_messages.html:54 +msgid "Regenerate messages" +msgstr "" + +#: templates/admin/translation_messages.html:60 +msgid "Update messages" +msgstr "" + +#: templates/admin/auth/user/add_form.html:4 +msgid "" +"First, enter a username and password. Then, you'll be able to edit more user " +"options." +msgstr "" + +#: templates/admin/auth/user/add_form.html:5 +msgid "Enter a username and password." +msgstr "" + +#: templates/admin/auth/user/change_form.html:6 +#: templates/admin/auth/user/change_password.html:14 +#: templates/admin/auth/user/change_password.html:41 +#: templates/registration/my_account.html:9 +msgid "Change password" +msgstr "" + +#: templates/admin/auth/user/change_password.html:27 +#, python-format +msgid "Enter a new password for the user %(username)s." +msgstr "" + +#: templates/admin/auth/user/change_password.html:36 +#: templates/admin/auth/user/change_password.html:37 +msgid "Password (again)" +msgstr "" + +#: templates/admin/auth/user/change_password.html:37 +msgid "Enter the same password as above, for verification." +msgstr "" + +#: templates/admin/djcelery/change_list.html:8 +msgid "" +"\n" +"\t\t\tPeriodic tasks won't be dispatched unless you set the\n" +"\t\t\tCELERYBEAT_SCHEDULER setting to\n" +"\t\t\tdjcelery.schedulers.DatabaseScheduler,\n" +"\t\t\tor specify it using the -S option to celerybeat" +msgstr "" + +#: templates/admin/edit_inline/popup.html:38 +msgid "You are about to delete this object! Are you sure you want to continue?" +msgstr "" + +#: templates/admin/edit_inline/popup.html:53 +msgid "Remove row" +msgstr "" + +#: templates/admin/edit_inline/popup.html:54 +msgid "Add new row" +msgstr "Agregar nuevo" + +#: templates/admin/edit_inline/popup.html:67 +msgid "was succesfully deleted" +msgstr "ha sido eliminado correctamente" + +#: templates/admin/edit_inline/stacked.html:19 +#, python-format +msgid "Edit %(modaltitle)s" +msgstr "Editar %(modaltitle)s" + +#: templates/admin/edit_inline/stacked.html:41 +#: templates/admin/edit_inline/tabular.html:53 +msgid "Remove" +msgstr "Eliminar?" + +#: templates/admin/edit_inline/stacked.html:42 +#: templates/admin/edit_inline/tabular.html:52 +msgid "Add new" +msgstr "Agregar nuevo" + +#: templates/admin/edit_inline/tabular.html:15 +msgid "Delete?" +msgstr "Eliminar?" + +#: templates/admin/edit_inline/translatable-inline.html:12 +msgid "Please set at least one language to manage translatable objects." +msgstr "" + +#: templates/admin/edit_inline/translatable-inline.html:29 +msgid "Clear the " +msgstr "" + +#: templates/admin/edit_inline/translatable-inline.html:29 +msgid "translation" +msgstr "" + +#: templates/admin/import_export/change_list_export.html:8 +#: templates/admin/import_export/change_list_import_export.html:13 +#: templates/admin/import_export/export.html:8 +#: templates/admin/import_export/export.html:13 +msgid "Export" +msgstr "" + +#: templates/admin/import_export/change_list_import.html:8 +#: templates/admin/import_export/change_list_import_export.html:8 +#: templates/admin/import_export/import.html:9 +#: templates/admin/import_export/import.html:13 +msgid "Import" +msgstr "" + +#: templates/admin/import_export/export.html:38 +#: templates/admin/import_export/import.html:61 +msgid "Submit" +msgstr "" + +#: templates/admin/import_export/import.html:23 +msgid "" +"Bellow is a preview of applied import data. If you are satisfied with a " +"result click Confirm import" +msgstr "" + +#: templates/admin/import_export/import.html:26 +msgid "Confirm import" +msgstr "" + +#: templates/admin/import_export/import.html:35 +msgid "This importer excpect and will import following fields: " +msgstr "" + +#: templates/admin/import_export/import.html:69 +msgid "Errors" +msgstr "" + +#: templates/admin/import_export/import.html:77 +msgid "Line number" +msgstr "" + +#: templates/admin/import_export/import.html:86 +msgid "Preview" +msgstr "" + +#: templates/admin/import_export/import.html:103 +msgid "Skipped" +msgstr "" + +#: templates/admin/import_export/import.html:107 +msgid "Update" +msgstr "" + +#: templates/admin/includes/topmenu.html:39 +msgid "Documentation" +msgstr "" + +#: templates/admin/includes/topmenu.html:42 +msgid "My Account" +msgstr "Mi cuenta" + +#: templates/admin/includes/topmenu.html:45 +msgid "Change Password" +msgstr "Cambiar Password" + +#: templates/admin/includes/topmenu.html:48 +#: templates/registration/logged_out.html:6 +msgid "Logout" +msgstr "Cerrar Sesion" + +#: templates/admin/includes/topmenu.html:72 +msgid "Options" +msgstr "" + +#: templates/admin/includes/translation_messages_list.html:4 +msgid "" +"Are you sure you want to regenerate the messages? This will override your " +"changes. " +msgstr "" + +#: templates/admin/includes/translation_messages_list.html:15 +msgid "Available files" +msgstr "" + +#: templates/admin/translations/language/change_form.html:6 +msgid "Translate messages" +msgstr "" + +#: templates/registration/logged_out.html:7 +msgid "Thanks for spending some quality time with the Web site today." +msgstr "" + +#: templates/registration/logged_out.html:10 +msgid "Log in again" +msgstr "" + +#: templates/registration/my_account.html:22 +msgid "Update account" +msgstr "" + +#: templates/registration/password_change_done.html:7 +#: templates/registration/password_change_done.html:10 +#: templates/registration/password_change_done.html:14 +#: templates/registration/password_change_form.html:4 +#: templates/registration/password_change_form.html:11 +#: templates/registration/password_change_form.html:14 +msgid "Password change" +msgstr "" + +#: templates/registration/password_change_done.html:16 +msgid "Your password was changed successfully." +msgstr "" + +#: templates/registration/password_change_form.html:17 +msgid "" +"Please enter your old password, for security's sake, and then enter your new " +"password twice so we can verify you typed it in correctly." +msgstr "" + +#: templates/registration/password_change_form.html:26 +msgid "Old password" +msgstr "" + +#: templates/registration/password_change_form.html:35 +msgid "New password" +msgstr "" + +#: templates/registration/password_change_form.html:44 +msgid "New password (again)" +msgstr "" + +#: templates/registration/password_change_form.html:52 +#: templates/registration/password_reset_confirm.html:37 +msgid "Change my password" +msgstr "" + +#: templates/registration/password_reset_complete.html:3 +#: templates/registration/password_reset_complete.html:7 +msgid "Password reset complete" +msgstr "" + +#: templates/registration/password_reset_complete.html:8 +msgid "Your password has been set. You may go ahead and log in now." +msgstr "" + +#: templates/registration/password_reset_confirm.html:3 +#: templates/registration/password_reset_confirm.html:43 +#: templates/registration/password_reset_done.html:3 +#: templates/registration/password_reset_done.html:7 +#: templates/registration/password_reset_form.html:3 +#: templates/registration/password_reset_form.html:12 +msgid "Password reset" +msgstr "" + +#: templates/registration/password_reset_confirm.html:12 +msgid "Enter new password" +msgstr "" + +#: templates/registration/password_reset_confirm.html:13 +msgid "" +"Please enter your new password twice so we can verify you typed it in " +"correctly." +msgstr "" + +#: templates/registration/password_reset_confirm.html:40 +msgid "Password reset unsuccessful" +msgstr "" + +#: templates/registration/password_reset_confirm.html:41 +msgid "" +"The password reset link was invalid, possibly because it has already been " +"used. Please request a new password reset." +msgstr "" + +#: templates/registration/password_reset_done.html:9 +#: templates/registration/password_reset_form.html:14 +msgid "" +"Forgotten your password? Enter your e-mail address below, and we'll e-mail " +"instructions for setting a new one." +msgstr "" + +#: templates/registration/password_reset_done.html:12 +msgid "" +"We've e-mailed you instructions for setting your password to the e-mail " +"address you submitted. You should be receiving it shortly." +msgstr "" + +#: templates/registration/password_reset_email.html:2 +#, python-format +msgid "" +"You're receiving this e-mail because you requested a password reset for your " +"user account at %(site_name)s." +msgstr "" + +#: templates/registration/password_reset_email.html:4 +msgid "Please go to the following page and choose a new password:" +msgstr "" + +#: templates/registration/password_reset_email.html:8 +msgid "Your username, in case you've forgotten:" +msgstr "" + +#: templates/registration/password_reset_email.html:10 +msgid "Thanks for using our site!" +msgstr "" + +#: templates/registration/password_reset_email.html:12 +#, python-format +msgid "The %(site_name)s team" +msgstr "" + +#: templates/registration/password_reset_form.html:30 +msgid "Reset my password" +msgstr "" + +#: templates/registration/password_reset_form.html:30 +msgid "Take me to login" +msgstr "" + +#: templates/reversion/change_list.html:9 +#, python-format +msgid "Add %(name)s" +msgstr "" + +#: templates/reversion/change_list.html:15 +#: templates/reversion/recover_form.html:11 +#: templates/reversion/recover_list.html:12 +#, python-format +msgid "Recover deleted %(name)s" +msgstr "" + +#: templates/reversion/object_history.html:6 +#: templates/reversion-compare/object_history.html:7 +msgid "" +"Choose a date from the list below to revert to a previous version of this " +"object." +msgstr "" + +#: templates/reversion/recover_form.html:17 +msgid "Press the save button below to recover this version of the object." +msgstr "" + +#: templates/reversion/recover_list.html:18 +msgid "" +"Choose a date from the list below to recover a deleted version of an object." +msgstr "" + +#: templates/reversion/recover_list.html:38 +msgid "There are no deleted objects to recover." +msgstr "" + +#: templates/reversion/revision_form.html:13 +#, python-format +msgid "Revert %(verbose_name)s" +msgstr "" + +#: templates/reversion/revision_form.html:35 +msgid "Press the save button below to revert to this version of the object." +msgstr "" + +#: templates/reversion-compare/compare.html:25 +#, python-format +msgid "Compare %(name)s" +msgstr "" + +#: templates/reversion-compare/compare.html:33 +#: templates/reversion-compare/object_history.html:42 +msgid "DATETIME_FORMAT" +msgstr "" + +#: templates/reversion-compare/compare.html:33 +#, python-format +msgid "" +"\n" +" Compare %(date1)s with %(date2)s:\n" +" " +msgstr "" + +#: templates/reversion-compare/compare.html:38 +#: templates/reversion-compare/compare.html:67 +msgid "Go back to history list" +msgstr "" + +#: templates/reversion-compare/compare.html:56 +msgid "Edit comment:" +msgstr "" + +#: templates/reversion-compare/compare.html:60 +msgid "Note:" +msgstr "" + +#: templates/reversion-compare/object_history.html:18 +#: templates/reversion-compare/object_history.html:20 +msgid "compare" +msgstr "" + +#: templates/reversion-compare/object_history.html:26 +msgid "Comment" +msgstr "" + +#: templatetags/yawdadmin_tags.py:65 +msgid "Django Administration" +msgstr "" + +#: templatetags/yawdadmin_tags.py:67 +msgid "" +"Welcome to the yawd-admin administration page. Please sign in to manage your " +"website." +msgstr "" From 297289e215338f07c5ce752b293fd49bc9b2705d Mon Sep 17 00:00:00 2001 From: mwolff44 Date: Thu, 26 May 2016 18:22:51 +0200 Subject: [PATCH 09/34] update jquery fancybox 2.1.5 --- .../css/fancybox/fancybox_loading.gif | Bin 3866 -> 6567 bytes .../css/fancybox/fancybox_loading@2x.gif | Bin 0 -> 13984 bytes .../css/fancybox/fancybox_sprite@2x.png | Bin 0 -> 6553 bytes .../css/fancybox/helpers/fancybox_buttons.png | Bin 0 -> 1080 bytes .../helpers/jquery.fancybox-buttons.css | 97 + .../helpers/jquery.fancybox-buttons.js | 122 + .../fancybox/helpers/jquery.fancybox-media.js | 199 ++ .../helpers/jquery.fancybox-thumbs.css | 55 + .../helpers/jquery.fancybox-thumbs.js | 162 ++ .../css/fancybox/jquery.fancybox.css | 29 +- .../css/fancybox/jquery.fancybox.js | 2020 +++++++++++++++++ .../css/fancybox/jquery.fancybox.pack.js | 46 + 12 files changed, 2728 insertions(+), 2 deletions(-) create mode 100644 yawdadmin/static/yawd-admin/css/fancybox/fancybox_loading@2x.gif create mode 100644 yawdadmin/static/yawd-admin/css/fancybox/fancybox_sprite@2x.png create mode 100644 yawdadmin/static/yawd-admin/css/fancybox/helpers/fancybox_buttons.png create mode 100644 yawdadmin/static/yawd-admin/css/fancybox/helpers/jquery.fancybox-buttons.css create mode 100644 yawdadmin/static/yawd-admin/css/fancybox/helpers/jquery.fancybox-buttons.js create mode 100644 yawdadmin/static/yawd-admin/css/fancybox/helpers/jquery.fancybox-media.js create mode 100644 yawdadmin/static/yawd-admin/css/fancybox/helpers/jquery.fancybox-thumbs.css create mode 100644 yawdadmin/static/yawd-admin/css/fancybox/helpers/jquery.fancybox-thumbs.js create mode 100755 yawdadmin/static/yawd-admin/css/fancybox/jquery.fancybox.js create mode 100755 yawdadmin/static/yawd-admin/css/fancybox/jquery.fancybox.pack.js diff --git a/yawdadmin/static/yawd-admin/css/fancybox/fancybox_loading.gif b/yawdadmin/static/yawd-admin/css/fancybox/fancybox_loading.gif index 01586176d793c261db6b6ca4ca7822b2d3b35703..a03a40c097ee728709f65d4ea7397903a389d484 100644 GIT binary patch literal 6567 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 literal 3866 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 Hfr$SAXcFO zlpu(Ls8JA6P{W{NYc1kXYOM{3ii(OuTWdX>n;y^c^`4${?|t8U*In!0e1XN{3&Z}c z|NnWOELa%o9}vd{xWEAbfIvv4P>F@&!Tv!ui=7ak(7eBSVtj&O!iZcJ$@AuAre}7Z z=&Y=+yfJd)^~={(GPR_rBz#f$m9MV2ySk^Qq_(%U+gRDetcu|W@^i9tde8K}d;4zc z*;M_$`a5^;KzK-%rxJ&X2QLn?o!AL$6PjC^Cmu{N%o&l(BYD2O%*~mdU7huH^*3(a zc>T+3DxF$VRuaB6{L0lU?w;r>m0w%gd*#Kgw%=ks&6=k%WIeK+$C_{YoPuau=B zk)Mi!B_ZCPTr9@$b%);|5($_Gxc~7zfBcvLenz)X7Uph+@%iqcoEz9Md`R*#z-GR2 zt8dXVpW?ZVIZ+-Gx=Ycb(>>SzCy`;_Wwyar_cK7Wh&O zrlIseae92AkZ50;y?W<7KWti>V~)@`f6qLxhBEd3d4LHAEHdDkiYOs-Y)E{V> zW6~D2Vh>eoeqwMQvwM#Fl3qfgiFP)WjF1Bwg^0QQ6y5A-#_f4rQ>{ZN!bL)0FKcTj zmtREz>uarK!Iv6s=Pl9&3g{3SgfGt;U2si=UkR|9DQrcaG60u7isr@<0SI=eK&Fo^ zD5be?9#mQCKQjUyhnGl(MIkd-Q|7a?DLlO$K=fO7R5j{NxbUU>FJ2r>(*il^6xhiY z>VYN#BOC1&Nbi>(V6PW1W^Qu2@}*POh)!lqE&*prUJD90A6Ur~1Cn9C3_=KY-6?@2 z+kBkHC|pv+ec`({{OnGtI;_W%MbkT22*IID5#$9S zXvQ)C7@*nAY@T$WGDj4Gs1X2WF#xqhL=24KkO8B4T{q2%dO;l3^!ANQqQmk-HIRco zYYlba_0G!GuXnx?`&;QJn|JA-4k2QTD;$VyMqM~oZ3Y1Sv_

bMxRL(pijsY@019xTxeF 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 literal 0 HcmV?d00001 diff --git a/yawdadmin/static/yawd-admin/css/fancybox/fancybox_sprite@2x.png b/yawdadmin/static/yawd-admin/css/fancybox/fancybox_sprite@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..d0e4779f4bed43fe339f0cf1eb045d8cb9430c87 GIT binary patch literal 6553 zcmb`M=QkW~u*db@d)dVzdQAwsy2UCXh#HGU^eC%u)I{%ui0CCEY7o8m)uTlT!bXYS zYqabB-rRrSzM1dLIWu$Se4cZjXU=(|b#-9mBrGIYSXks5>MHsVYJ!D@Ek=a*;C*@) zB>N!DUaBTuFWl_Be62iev6No9S=(}GxLDcS>f2hqLLmojACj15G*pxf{C@43`=`?V z{B&<<*imdxkW}1CXP`!1$fOD)ShbO?RGVh9hWkinW?gC)41$#k#Vcbndduex2j6%} z5<3@|rleEhTHyz%DHf7yswkqQTLB0*Il0^N(%ZuJ>m@U}CG($h@woom=ggb?+uL`e zQkF~CazPynEH`B2Azv1~9LDpZ#jr6!ELJQ8b`_#40zdQK+jS)u0vlj7$;R3lM<^Dv z)7PqfqZ0#m@(87$#tkOr-*`w;jyBlhk0c#;D1`vWDFCDlLg`hyVfZO-Pl3pV=6nW* zv?+5cC=r*66cEI8BS_50V_J`uawj~QcxkKKku8Ypv)Fl6$ciTxC)OP`eoxRnPE8Z? zH{Lm+b)wo%K?ui01)JxXFE501S;AqBErh(nXaGdnNbr`N>m5;d)MSTM7`5`H|CD`> zm{WI>-XQh%;I+c0({i2d#L#j*S0c{wKz@iUiCA8b3N_0@lik2e)yD1`t1v1hJUta^ zDBXi$UOxUw`$N`yvR3^?oz%h7(eE~?0Nx2MO&NlFCFYspYH)r`WW*qG;?IIcuiD%7d~ZFNWkt4>a^p+tU8Bjxa+ z!ll`Vh8b~E`#%R-IZKUe@2_Q=hZXB@=1l}mdB`#xZKAlMxico>(iZH^uOId3?)~G- zIoWE1x|44-=FDH8|7@uI9WMXMVLvGWgIj}%VIr${#nF%`#IJB@I>`EFp1*UPdfzWq zJ$SL6)+cBZw<;c!s}YysIkRCbb*{IDeZRj#P<}GPvGUZ0=w*lZuQSW(%Y#Gg_E3B0 z9Ii=|I3}GHG-eI_WVXFl5_*K6%BOQeX!6VW(ly0q36cQ5yo(2xlTzsVY&T1V^B4{QhNDrNhYw8v+|C*QK^{#mTglg)5!TGTYd}8k zon&GUIv?jX;>Ua))v6QiBp?f$2flYu6@1BHDd!XChgnEZe47CDWBkq`Bo;6fR-sjY z^5(B++W25Qi@CdaFE#ARdx!S*Q~s2qCjr2Cru*0hy%iYa^4wEAaTO~4Zi7UoC5~&z zN3*!aeC7%+HTlyb6P0H+QU$E>%re!nA5(SzOn=G!mj7w4V0vh(oAV0EQ!9Pt?$Nb7 z^Vx5r?UE>-RjWGefL+RdpE?SpiHh5h)7qqyVWQiX9!5@KddB`z*%KQTRWF(?ZKz0zi~=IeBa&aki86l$I-35q6TB$P6YCpB1> zW0gv&Fx(L-{Wk&J{4=-rq6eXi?6Ps3$p@)u1kPd0C7%qq7%I4j3bv<*W|~(X3GJU` zEy}O?f9I(Rlq(=M{}i3A^}}I3q-JUrSE^BQRBy%g5Svjm;IRiExH!>4dyLL2HlnX9 z?(f$6USpU2Yu@6K4er@bl5QV$_sY8*Vorm5oRZi@aHZBs-E&7y{%AHWqE&gFJLMVB zlj8Nut7#b@owUx(M_I*EgX?h6pRL&0C5xAj7vu0BX+;|okjL z>!;@{QO0A#7nkLx?iB@Q8cDC+Iytdxu@MUP8Ih;}gxO#zkK9FSO^5mx6Oa9wPNlA& z;>?w8{pRKCbw3a5pNXFLTOU{DXZxNOTXXZG{n{^vbUGd>nLBELh3WjEjNgt7G4fyG zu4An&U6MA7<

{cP>K~WSV?QiOUg(!Dd1dWv0J@GIAL)h*?aeE#ulO zk|BhCPH)43#Mp`=Bf0xHCiYY{;2@sygM5xXMzZ%K92->{{Z|j(x?YBs5pATq*L&*r z8$-QkBs%oFGZ1E zS`=@;rpDhdTu)kBxE`@XVMZOqRx+hEt1E(U+scqDrXACRk4X3mLI5>h!%J-zA`=aW zSGbs*ZzFPLxt8_W8Sx2(W)|PWl&rpYY0#|um@d^SJTV$U^CFmI$lv;tFu14AEZklZ zzJVmGv3u`7>k!O-@_cQuIZ%gpuQ+pgtzg~2_>JkkG_|jQ(#~q^uL~|{wjMe(Fzho6 zBb;2MMEWZG?xua1muK@9h7r554RN<$xn>es!t^=ks!~q6voxbz#ozRgL+n{8#Cf=LK1}?L?PGipU>sa z)yHF4R*C`{Dq)ho{B2uWQ?$+FECBTrofb+*{y3xD&a?~N;?BV*)klj7{gr*Rb z3zRa#*zWc+tT!gB#B!bV1-Grf1Z^lFE-pmJU(_sf^>uymMAXgN1@`#1; ze&uuY_Czmy32YL6nG8wkrvSWIFZ9`K+L8KE4x`lHREkN96+(UskQ#`m(JC8#p@k_h ztrFe|Pw3lA`2(v@3ocXtAS9EGdegUP*?yaEZD#K+SkP%o;Dj%9_pzkDk6UHv;@m#h z(ek%E1X4Laemh2;T~ch3b+NPDVdGOs$p3kud2CVlG{x`Sm$*@O9?_n-%A!$BAHnnR zwvp+nMD&ZY1!FE#V8amjJj?Oj?9*FhPp-To`@bYL(Kn8qw9^#x*cGvck6OkEo|Mu= zf$1Je=xGT>@L5ljNQkiCe-cl53FATYs}{62m7Vn59vqn01}#~(BWRG)gz{&;{B zhV4JMP>f)s7Po63UrFw*J42u$*sY;S6 z5p@_fM(slvZGq~1>`3QH>MsTd9jdL?E%V~jRhoTf=;55#BSvEWF%Ac2$OpQvtk<+C z{95iP22@5lt?Rl|g9-M}H0^X$@4Nlid~K2zi1ZC1Ar}EUis9!Pb!?q9H7tuefW_FW zmqv#`QpP3{CxMaIv`t?e zcw11XtJZ?%hu@fVFdP&sV&I$Iq&}6Y{>$a=j1X^TiE)e4z>}YhEKTJr2`+|dpCa># zs8);fZ|#G(rY4?BGvI|M(+MT9B6<8Zgs}rxJZ&$(D4Z+W@~&f-DYgB2ME>E^qgTNu z*<5SZFG7ez7Ym7EfjzDOM8)zVl{F60*)?in+)6Q5Dj)ps-|yKL2lLvmwI(V#!6ae` zWnX%&-F_?)^T%N$+{$IF!h@uCS&swPs4EIH;i?URX6Fa5m+yK7wR|TFlA&)&8o_jV zDTOAl9GzEAs>*RREaP>j8IAD_HfeICPI*5)|7?>i%V-`{-(&{_k39%&gW zo$16PZH!PZMHbXaTSo_t({|xh+<}hxwhQZb2P{!f#O`tfYF2Rj(P|c3g#K)H2ypvsZ@9GF&<5HT5)CTU0M&1@tauT zxlk(W^<{aF)1!N@=DLeBHXe6}+k&2E96!T%44{`bWJn2fu_KsNqI5l6u7CmDdyvz< zk*Hqyk*0`jFyNU2J;q5ZtSePbQ}H0{Z2fAVwA=#RoB3@du%Lz3QS<1U$)ma+HE(`3 zQIhnhQ(NBa?ysA^XwBO}&@U;=ql1GzHOlp|#}iV{6$L#OS;gS;DXkCYiju*z`N zuw8kOKg=TfdfTL&oUsVLHmI$Bw^{xpxMjj4%H-xI#i(*;fPX8sA}qTdyKFrr>c!(v z!P~R#-#oczrNJt#Tdg+1SF>3LtEDmUQBg#8%0D8SsQj(Z;uoSxA79$6Q;k;S0*w&_cj@-Qs@$G|9ky?Oey7=20!DG zD_M2$wQ|stoVX9l10-&_UZAbBwGm;1+ ze}l8!FIrmj70ZyqifJ|{M!FzM9Kr5h6y8GwIv%BcU)c9HT(Yw*Q?xi2rJUvwHP5Tx z2Uc@Te-4Z^5Qq@X5YDl{#KxGBFn%5L#tq@U{Jly2SKEt)3f}zl276=I<;DQjb;bII z7>=kYX4eAu&Zm?}vvHb+b?s?WlClzkWIcOzIiW^r(A1oO=fsQj^p2Ju>fqi%oGJr< z=DPrCJX}m{;wqxWwXxw!`g!~H=jzmyvI3$}N(4DUoCa-gO6GRhwYep8Q7TlTkGH`+ zA3mTX5zLs4Z9|u0*l-ncUHI7jmV!T08p-Xesj@YE!pUgp!`0RHR21Cne)BB9dzxhS zQKY(umEHw(p0EUuoN2r#tHgg0l%ukPwNknrp4OeB%`X- zqM%;a{Jw9@kpEsLAbv`VO+l_I>g&CQ65Ax3NDu=`CUe^(ivCd|`w@Ie;Nz{fZ{Kur zcy`L}>kPTFZGJ%{8VjTaR)Kw)(f{z8_!ob>U)vg$){*%mObM{&)t}vGEi6{;pZBxu z4iL(}RDMhuAuI;r$3$PQ2!z(DoLl%Xk;|>7A5l9zmAk;b)!vH6X1wD<`TuR{=Hu-4 zNv=m$_?b&*AM0&I6pe=)FsTS&y$YKy~XOgKVVnB(F3oa>|jtRW#?W{JEP@c)9qpcy7~BYnCW&Kw~Yz62|BTHwX6+;CklwaE^2p=-)+ZCOO^!`JWa%CDI-Px5F{A zi~`Qd(A|D>X0j5Kr;^=1MqU9@fn&ABSNO5@V09QkW=epK$cbPVY-eEv^D%9ls z)=h6p99=_e83xZTF&iUroj(xLK;o}=4ubBgtd=Z5or*I*8&0aKK~E@($$yto3g&pc zOHZVX0~99aNM>Y?kMkUhTJuu2LK-{tm1mu32m%7}SH`5SwGp=(FzOuV_$A2N~E zT1!%5*$TcvNx@vF#DY5|-ZMASLa!z~A2#*mPwA$1q%*y5XXk~z!Vq4+mi&L@i1=VR zmjkR%?wW>U5}urjk;=mis1_0vdN%qClrLUpK5ntoc5Ve&8*fiOx^7N~384=0Z5_`? zj3nl=7MO7^O9LyypVtop@~J(d5>9Qk>byP#}Hd8ZYz9ahK^a2(Q*y<~&fsQ!`BT;OzkD?(~jc z5F#@X%l4=1;?T>8TgQ$(6Ht1M52=Z=tIcDEjz4x;EcE1!-|L{8<&5NeNxIzZFFd(M zw&c}B%=vB(`}-Gd3RPUGU40LULVDrk8TKsHRk?cK;<6S+b;ZuiY+7KH{OR#xo(Lm2 zcyj3O5soRhN3lSf9No1QjB@{nBpektQqZ@$Whb=4EIR8X7Y1@IUq z;4@>7-Ak-U70Z>;B$EHC z`BqhJp@!B&%oK4yh9HXaibXtJgRKijubV=Ze^A*5f;X%nH#0=vSNcXk zU-48)jQj59@e|M_L%$Cdfq+>j0bE1b*HJF*gY?~+ZUqKtt7f7meA|y6Q*|$3xZZ&6 zf{Nqs(9fGb5^Dan9Oew3p(AvNiYa74kQdk%u21__VSl%k1%>RiTB;omrM0#~ zUGBMa6l;9*nlwa0r49uUL(1l z7ibJ|BM&fA>Xl!Bcqh7il}~Es!)IL>$DfO7+;6L!3K6Ro&)ns{*9o|s+RPwRLuD$s zAN?zUjlL^xOoXBJfcsjFBdb|T<4A*uYr+8ZNx9Ml(%{|BtvPS#m({P7`yAWSu4SbA zd0WyHXh-iZpac+|^M3AS^^QA@}LtfTGuaSGRzSvJ;z+1Dw;M@0^knpip7#_myir zV_Z-WGzPz3Rg26;i-Ket0x$p{nNDHZq9*wdQzPAxpmtxCn35bO6qX+{c9`@ zSq~~@L$|=ov<$%@_oNF)!tpTM&br7j?{Ecn`xRt(NEHjPe%kC7CkBhy6<&Gtd1;C=fA`HRp{C^E`6^wcyVN= S1P^~LSQ@H2DwWEJcmD(3qHSjY literal 0 HcmV?d00001 diff --git a/yawdadmin/static/yawd-admin/css/fancybox/helpers/fancybox_buttons.png b/yawdadmin/static/yawd-admin/css/fancybox/helpers/fancybox_buttons.png new file mode 100644 index 0000000000000000000000000000000000000000..07872072704114b91681e2e6f9697ce1521b64d2 GIT binary patch literal 1080 zcmeAS@N?(olHy`uVBq!ia0vp^Q6S903?%u>HW~n_y#YQUu0R?WSg~RSP%1Go5lD7* zbwQLpe*757ICA6&kW5WYZD?o!GK`Ilf#ib+545$lfs7|lo|Kf7golSGBqXd|yY}6? zcgK$(2by;H@Zldne!PGGe#3?hK*r6RH}~(~f9%+?@87@w1cMhZUi|v?>-O#24<9~! z_3G8{-@iY6_yAP-?b|mX`_G?0|Ns97D*W>0%coDDfKr0iiH$(}%u0g%f*BZ@S=qVy z1VzPVE?Tl=<;G1rjvPIE`Ra{3j~;*c^fm05 z&}0S%rZ1i@jv*CsZ>PnU&vFoGYh)GcNLbUk(XcbqE{E69EG*srz@Pu~uR3~FiyV{r zKBIe^jd`)*o5yoLKHYF_zn{1F51Du38}jGBJ=VP0ecMa>bF+9K`W*ijXIeka_uU8A z*POd= z37@}bnmsYU%ylPY9@}5u*!t|)yNM@Xh;kTr{CTM%UpgJrq;^z1sCv#Ff{JcXH0QycQ=j-SpqK)3sqC&x%d{>uv#p4L4W% zmLHbjTwSCP^ID(pX0NGG_)`a^m0!6nD|Dt#Dvad0vf#zR8xqRnG{y^pfbH6Kc3;s;HW4p`heoW(jKH<7AtsEly z$M&AE{dQl2(Z%x9#dt|gSIbWy<4Xjtobc#5EmRoE7k>Wa#EFw7ELWat{GexP^oT7` zWJjo_z_Z6E{wwPO!J9zw9U;?iErx;1Arv+D^&N20C4AEY>{Ek`B=i66zn9m4$^{AUqIL)kd`}_|Y zirXZ4+!kL{DD1t`cieXN&YnLTl;^yVdNTEd730M4<~70>Dwl5dOP&;N_1dH)?&X@x qGoDO6XT>`g#8(4K<@tG^_7CJ-u|B8Hp&OWk7(8A5T-G@yGywqna}dM; literal 0 HcmV?d00001 diff --git a/yawdadmin/static/yawd-admin/css/fancybox/helpers/jquery.fancybox-buttons.css b/yawdadmin/static/yawd-admin/css/fancybox/helpers/jquery.fancybox-buttons.css new file mode 100644 index 0000000..a26273a --- /dev/null +++ b/yawdadmin/static/yawd-admin/css/fancybox/helpers/jquery.fancybox-buttons.css @@ -0,0 +1,97 @@ +#fancybox-buttons { + position: fixed; + left: 0; + width: 100%; + z-index: 8050; +} + +#fancybox-buttons.top { + top: 10px; +} + +#fancybox-buttons.bottom { + bottom: 10px; +} + +#fancybox-buttons ul { + display: block; + width: 166px; + height: 30px; + margin: 0 auto; + padding: 0; + list-style: none; + border: 1px solid #111; + border-radius: 3px; + -webkit-box-shadow: inset 0 0 0 1px rgba(255,255,255,.05); + -moz-box-shadow: inset 0 0 0 1px rgba(255,255,255,.05); + box-shadow: inset 0 0 0 1px rgba(255,255,255,.05); + background: rgb(50,50,50); + background: -moz-linear-gradient(top, rgb(68,68,68) 0%, rgb(52,52,52) 50%, rgb(41,41,41) 50%, rgb(51,51,51) 100%); + background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,rgb(68,68,68)), color-stop(50%,rgb(52,52,52)), color-stop(50%,rgb(41,41,41)), color-stop(100%,rgb(51,51,51))); + background: -webkit-linear-gradient(top, rgb(68,68,68) 0%,rgb(52,52,52) 50%,rgb(41,41,41) 50%,rgb(51,51,51) 100%); + background: -o-linear-gradient(top, rgb(68,68,68) 0%,rgb(52,52,52) 50%,rgb(41,41,41) 50%,rgb(51,51,51) 100%); + background: -ms-linear-gradient(top, rgb(68,68,68) 0%,rgb(52,52,52) 50%,rgb(41,41,41) 50%,rgb(51,51,51) 100%); + background: linear-gradient(top, rgb(68,68,68) 0%,rgb(52,52,52) 50%,rgb(41,41,41) 50%,rgb(51,51,51) 100%); + filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#444444', endColorstr='#222222',GradientType=0 ); +} + +#fancybox-buttons ul li { + float: left; + margin: 0; + padding: 0; +} + +#fancybox-buttons a { + display: block; + width: 30px; + height: 30px; + text-indent: -9999px; + background-color: transparent; + background-image: url('fancybox_buttons.png'); + background-repeat: no-repeat; + outline: none; + opacity: 0.8; +} + +#fancybox-buttons a:hover { + opacity: 1; +} + +#fancybox-buttons a.btnPrev { + background-position: 5px 0; +} + +#fancybox-buttons a.btnNext { + background-position: -33px 0; + border-right: 1px solid #3e3e3e; +} + +#fancybox-buttons a.btnPlay { + background-position: 0 -30px; +} + +#fancybox-buttons a.btnPlayOn { + background-position: -30px -30px; +} + +#fancybox-buttons a.btnToggle { + background-position: 3px -60px; + border-left: 1px solid #111; + border-right: 1px solid #3e3e3e; + width: 35px +} + +#fancybox-buttons a.btnToggleOn { + background-position: -27px -60px; +} + +#fancybox-buttons a.btnClose { + border-left: 1px solid #111; + width: 35px; + background-position: -56px 0px; +} + +#fancybox-buttons a.btnDisabled { + opacity : 0.4; + cursor: default; +} \ No newline at end of file diff --git a/yawdadmin/static/yawd-admin/css/fancybox/helpers/jquery.fancybox-buttons.js b/yawdadmin/static/yawd-admin/css/fancybox/helpers/jquery.fancybox-buttons.js new file mode 100644 index 0000000..fd8b955 --- /dev/null +++ b/yawdadmin/static/yawd-admin/css/fancybox/helpers/jquery.fancybox-buttons.js @@ -0,0 +1,122 @@ + /*! + * Buttons helper for fancyBox + * version: 1.0.5 (Mon, 15 Oct 2012) + * @requires fancyBox v2.0 or later + * + * Usage: + * $(".fancybox").fancybox({ + * helpers : { + * buttons: { + * position : 'top' + * } + * } + * }); + * + */ +(function ($) { + //Shortcut for fancyBox object + var F = $.fancybox; + + //Add helper object + F.helpers.buttons = { + defaults : { + skipSingle : false, // disables if gallery contains single image + position : 'top', // 'top' or 'bottom' + tpl : '

' + }, + + list : null, + buttons: null, + + beforeLoad: function (opts, obj) { + //Remove self if gallery do not have at least two items + + if (opts.skipSingle && obj.group.length < 2) { + obj.helpers.buttons = false; + obj.closeBtn = true; + + return; + } + + //Increase top margin to give space for buttons + obj.margin[ opts.position === 'bottom' ? 2 : 0 ] += 30; + }, + + onPlayStart: function () { + if (this.buttons) { + this.buttons.play.attr('title', 'Pause slideshow').addClass('btnPlayOn'); + } + }, + + onPlayEnd: function () { + if (this.buttons) { + this.buttons.play.attr('title', 'Start slideshow').removeClass('btnPlayOn'); + } + }, + + afterShow: function (opts, obj) { + var buttons = this.buttons; + + if (!buttons) { + this.list = $(opts.tpl).addClass(opts.position).appendTo('body'); + + buttons = { + prev : this.list.find('.btnPrev').click( F.prev ), + next : this.list.find('.btnNext').click( F.next ), + play : this.list.find('.btnPlay').click( F.play ), + toggle : this.list.find('.btnToggle').click( F.toggle ), + close : this.list.find('.btnClose').click( F.close ) + } + } + + //Prev + if (obj.index > 0 || obj.loop) { + buttons.prev.removeClass('btnDisabled'); + } else { + buttons.prev.addClass('btnDisabled'); + } + + //Next / Play + if (obj.loop || obj.index < obj.group.length - 1) { + buttons.next.removeClass('btnDisabled'); + buttons.play.removeClass('btnDisabled'); + + } else { + buttons.next.addClass('btnDisabled'); + buttons.play.addClass('btnDisabled'); + } + + this.buttons = buttons; + + this.onUpdate(opts, obj); + }, + + onUpdate: function (opts, obj) { + var toggle; + + if (!this.buttons) { + return; + } + + toggle = this.buttons.toggle.removeClass('btnDisabled btnToggleOn'); + + //Size toggle button + if (obj.canShrink) { + toggle.addClass('btnToggleOn'); + + } else if (!obj.canExpand) { + toggle.addClass('btnDisabled'); + } + }, + + beforeClose: function () { + if (this.list) { + this.list.remove(); + } + + this.list = null; + this.buttons = null; + } + }; + +}(jQuery)); diff --git a/yawdadmin/static/yawd-admin/css/fancybox/helpers/jquery.fancybox-media.js b/yawdadmin/static/yawd-admin/css/fancybox/helpers/jquery.fancybox-media.js new file mode 100644 index 0000000..3584c8a --- /dev/null +++ b/yawdadmin/static/yawd-admin/css/fancybox/helpers/jquery.fancybox-media.js @@ -0,0 +1,199 @@ +/*! + * Media helper for fancyBox + * version: 1.0.6 (Fri, 14 Jun 2013) + * @requires fancyBox v2.0 or later + * + * Usage: + * $(".fancybox").fancybox({ + * helpers : { + * media: true + * } + * }); + * + * Set custom URL parameters: + * $(".fancybox").fancybox({ + * helpers : { + * media: { + * youtube : { + * params : { + * autoplay : 0 + * } + * } + * } + * } + * }); + * + * Or: + * $(".fancybox").fancybox({, + * helpers : { + * media: true + * }, + * youtube : { + * autoplay: 0 + * } + * }); + * + * Supports: + * + * Youtube + * http://www.youtube.com/watch?v=opj24KnzrWo + * http://www.youtube.com/embed/opj24KnzrWo + * http://youtu.be/opj24KnzrWo + * http://www.youtube-nocookie.com/embed/opj24KnzrWo + * Vimeo + * http://vimeo.com/40648169 + * http://vimeo.com/channels/staffpicks/38843628 + * http://vimeo.com/groups/surrealism/videos/36516384 + * http://player.vimeo.com/video/45074303 + * Metacafe + * http://www.metacafe.com/watch/7635964/dr_seuss_the_lorax_movie_trailer/ + * http://www.metacafe.com/watch/7635964/ + * Dailymotion + * http://www.dailymotion.com/video/xoytqh_dr-seuss-the-lorax-premiere_people + * Twitvid + * http://twitvid.com/QY7MD + * Twitpic + * http://twitpic.com/7p93st + * Instagram + * http://instagr.am/p/IejkuUGxQn/ + * http://instagram.com/p/IejkuUGxQn/ + * Google maps + * http://maps.google.com/maps?q=Eiffel+Tower,+Avenue+Gustave+Eiffel,+Paris,+France&t=h&z=17 + * http://maps.google.com/?ll=48.857995,2.294297&spn=0.007666,0.021136&t=m&z=16 + * http://maps.google.com/?ll=48.859463,2.292626&spn=0.000965,0.002642&t=m&z=19&layer=c&cbll=48.859524,2.292532&panoid=YJ0lq28OOy3VT2IqIuVY0g&cbp=12,151.58,,0,-15.56 + */ +(function ($) { + "use strict"; + + //Shortcut for fancyBox object + var F = $.fancybox, + format = function( url, rez, params ) { + params = params || ''; + + if ( $.type( params ) === "object" ) { + params = $.param(params, true); + } + + $.each(rez, function(key, value) { + url = url.replace( '$' + key, value || '' ); + }); + + if (params.length) { + url += ( url.indexOf('?') > 0 ? '&' : '?' ) + params; + } + + return url; + }; + + //Add helper object + F.helpers.media = { + defaults : { + youtube : { + matcher : /(youtube\.com|youtu\.be|youtube-nocookie\.com)\/(watch\?v=|v\/|u\/|embed\/?)?(videoseries\?list=(.*)|[\w-]{11}|\?listType=(.*)&list=(.*)).*/i, + params : { + autoplay : 1, + autohide : 1, + fs : 1, + rel : 0, + hd : 1, + wmode : 'opaque', + enablejsapi : 1 + }, + type : 'iframe', + url : '//www.youtube.com/embed/$3' + }, + vimeo : { + matcher : /(?:vimeo(?:pro)?.com)\/(?:[^\d]+)?(\d+)(?:.*)/, + params : { + autoplay : 1, + hd : 1, + show_title : 1, + show_byline : 1, + show_portrait : 0, + fullscreen : 1 + }, + type : 'iframe', + url : '//player.vimeo.com/video/$1' + }, + metacafe : { + matcher : /metacafe.com\/(?:watch|fplayer)\/([\w\-]{1,10})/, + params : { + autoPlay : 'yes' + }, + type : 'swf', + url : function( rez, params, obj ) { + obj.swf.flashVars = 'playerVars=' + $.param( params, true ); + + return '//www.metacafe.com/fplayer/' + rez[1] + '/.swf'; + } + }, + dailymotion : { + matcher : /dailymotion.com\/video\/(.*)\/?(.*)/, + params : { + additionalInfos : 0, + autoStart : 1 + }, + type : 'swf', + url : '//www.dailymotion.com/swf/video/$1' + }, + twitvid : { + matcher : /twitvid\.com\/([a-zA-Z0-9_\-\?\=]+)/i, + params : { + autoplay : 0 + }, + type : 'iframe', + url : '//www.twitvid.com/embed.php?guid=$1' + }, + twitpic : { + matcher : /twitpic\.com\/(?!(?:place|photos|events)\/)([a-zA-Z0-9\?\=\-]+)/i, + type : 'image', + url : '//twitpic.com/show/full/$1/' + }, + instagram : { + matcher : /(instagr\.am|instagram\.com)\/p\/([a-zA-Z0-9_\-]+)\/?/i, + type : 'image', + url : '//$1/p/$2/media/?size=l' + }, + google_maps : { + matcher : /maps\.google\.([a-z]{2,3}(\.[a-z]{2})?)\/(\?ll=|maps\?)(.*)/i, + type : 'iframe', + url : function( rez ) { + return '//maps.google.' + rez[1] + '/' + rez[3] + '' + rez[4] + '&output=' + (rez[4].indexOf('layer=c') > 0 ? 'svembed' : 'embed'); + } + } + }, + + beforeLoad : function(opts, obj) { + var url = obj.href || '', + type = false, + what, + item, + rez, + params; + + for (what in opts) { + if (opts.hasOwnProperty(what)) { + item = opts[ what ]; + rez = url.match( item.matcher ); + + if (rez) { + type = item.type; + params = $.extend(true, {}, item.params, obj[ what ] || ($.isPlainObject(opts[ what ]) ? opts[ what ].params : null)); + + url = $.type( item.url ) === "function" ? item.url.call( this, rez, params, obj ) : format( item.url, rez, params ); + + break; + } + } + } + + if (type) { + obj.href = url; + obj.type = type; + + obj.autoHeight = false; + } + } + }; + +}(jQuery)); \ No newline at end of file diff --git a/yawdadmin/static/yawd-admin/css/fancybox/helpers/jquery.fancybox-thumbs.css b/yawdadmin/static/yawd-admin/css/fancybox/helpers/jquery.fancybox-thumbs.css new file mode 100644 index 0000000..63d2943 --- /dev/null +++ b/yawdadmin/static/yawd-admin/css/fancybox/helpers/jquery.fancybox-thumbs.css @@ -0,0 +1,55 @@ +#fancybox-thumbs { + position: fixed; + left: 0; + width: 100%; + overflow: hidden; + z-index: 8050; +} + +#fancybox-thumbs.bottom { + bottom: 2px; +} + +#fancybox-thumbs.top { + top: 2px; +} + +#fancybox-thumbs ul { + position: relative; + list-style: none; + margin: 0; + padding: 0; +} + +#fancybox-thumbs ul li { + float: left; + padding: 1px; + opacity: 0.5; +} + +#fancybox-thumbs ul li.active { + opacity: 0.75; + padding: 0; + border: 1px solid #fff; +} + +#fancybox-thumbs ul li:hover { + opacity: 1; +} + +#fancybox-thumbs ul li a { + display: block; + position: relative; + overflow: hidden; + border: 1px solid #222; + background: #111; + outline: none; +} + +#fancybox-thumbs ul li img { + display: block; + position: relative; + border: 0; + padding: 0; + max-width: none; +} \ No newline at end of file diff --git a/yawdadmin/static/yawd-admin/css/fancybox/helpers/jquery.fancybox-thumbs.js b/yawdadmin/static/yawd-admin/css/fancybox/helpers/jquery.fancybox-thumbs.js new file mode 100644 index 0000000..5db3d4a --- /dev/null +++ b/yawdadmin/static/yawd-admin/css/fancybox/helpers/jquery.fancybox-thumbs.js @@ -0,0 +1,162 @@ + /*! + * Thumbnail helper for fancyBox + * version: 1.0.7 (Mon, 01 Oct 2012) + * @requires fancyBox v2.0 or later + * + * Usage: + * $(".fancybox").fancybox({ + * helpers : { + * thumbs: { + * width : 50, + * height : 50 + * } + * } + * }); + * + */ +(function ($) { + //Shortcut for fancyBox object + var F = $.fancybox; + + //Add helper object + F.helpers.thumbs = { + defaults : { + width : 50, // thumbnail width + height : 50, // thumbnail height + position : 'bottom', // 'top' or 'bottom' + source : function ( item ) { // function to obtain the URL of the thumbnail image + var href; + + if (item.element) { + href = $(item.element).find('img').attr('src'); + } + + if (!href && item.type === 'image' && item.href) { + href = item.href; + } + + return href; + } + }, + + wrap : null, + list : null, + width : 0, + + init: function (opts, obj) { + var that = this, + list, + thumbWidth = opts.width, + thumbHeight = opts.height, + thumbSource = opts.source; + + //Build list structure + list = ''; + + for (var n = 0; n < obj.group.length; n++) { + list += '
    • '; + } + + this.wrap = $('
    ').addClass(opts.position).appendTo('body'); + this.list = $('
      ' + list + '
    ').appendTo(this.wrap); + + //Load each thumbnail + $.each(obj.group, function (i) { + var href = thumbSource( obj.group[ i ] ); + + if (!href) { + return; + } + + $("").load(function () { + var width = this.width, + height = this.height, + widthRatio, heightRatio, parent; + + if (!that.list || !width || !height) { + return; + } + + //Calculate thumbnail width/height and center it + widthRatio = width / thumbWidth; + heightRatio = height / thumbHeight; + + parent = that.list.children().eq(i).find('a'); + + if (widthRatio >= 1 && heightRatio >= 1) { + if (widthRatio > heightRatio) { + width = Math.floor(width / heightRatio); + height = thumbHeight; + + } else { + width = thumbWidth; + height = Math.floor(height / widthRatio); + } + } + + $(this).css({ + width : width, + height : height, + top : Math.floor(thumbHeight / 2 - height / 2), + left : Math.floor(thumbWidth / 2 - width / 2) + }); + + parent.width(thumbWidth).height(thumbHeight); + + $(this).hide().appendTo(parent).fadeIn(300); + + }).attr('src', href); + }); + + //Set initial width + this.width = this.list.children().eq(0).outerWidth(true); + + this.list.width(this.width * (obj.group.length + 1)).css('left', Math.floor($(window).width() * 0.5 - (obj.index * this.width + this.width * 0.5))); + }, + + beforeLoad: function (opts, obj) { + //Remove self if gallery do not have at least two items + if (obj.group.length < 2) { + obj.helpers.thumbs = false; + + return; + } + + //Increase bottom margin to give space for thumbs + obj.margin[ opts.position === 'top' ? 0 : 2 ] += ((opts.height) + 15); + }, + + afterShow: function (opts, obj) { + //Check if exists and create or update list + if (this.list) { + this.onUpdate(opts, obj); + + } else { + this.init(opts, obj); + } + + //Set active element + this.list.children().removeClass('active').eq(obj.index).addClass('active'); + }, + + //Center list + onUpdate: function (opts, obj) { + if (this.list) { + this.list.stop(true).animate({ + 'left': Math.floor($(window).width() * 0.5 - (obj.index * this.width + this.width * 0.5)) + }, 150); + } + }, + + beforeClose: function () { + if (this.wrap) { + this.wrap.remove(); + } + + this.wrap = null; + this.list = null; + this.width = 0; + } + } + +}(jQuery)); \ No newline at end of file diff --git a/yawdadmin/static/yawd-admin/css/fancybox/jquery.fancybox.css b/yawdadmin/static/yawd-admin/css/fancybox/jquery.fancybox.css index d6ff8a1..367890a 100644 --- a/yawdadmin/static/yawd-admin/css/fancybox/jquery.fancybox.css +++ b/yawdadmin/static/yawd-admin/css/fancybox/jquery.fancybox.css @@ -1,4 +1,4 @@ -/*! fancyBox v2.1.3 fancyapps.com | fancyapps.com/fancybox/#license */ +/*! fancyBox v2.1.5 fancyapps.com | fancyapps.com/fancybox/#license */ .fancybox-wrap, .fancybox-skin, .fancybox-outer, @@ -165,7 +165,16 @@ /* Overlay helper */ .fancybox-lock { - overflow: hidden; + overflow: hidden !important; + width: auto; +} + +.fancybox-lock body { + overflow: hidden !important; +} + +.fancybox-lock-test { + overflow-y: hidden !important; } .fancybox-overlay { @@ -246,4 +255,20 @@ padding: 10px; background: #000; background: rgba(0, 0, 0, .8); +} + +/*Retina graphics!*/ +@media only screen and (-webkit-min-device-pixel-ratio: 1.5), + only screen and (min--moz-device-pixel-ratio: 1.5), + only screen and (min-device-pixel-ratio: 1.5){ + + #fancybox-loading, .fancybox-close, .fancybox-prev span, .fancybox-next span { + background-image: url('fancybox_sprite@2x.png'); + background-size: 44px 152px; /*The size of the normal image, half the size of the hi-res image*/ + } + + #fancybox-loading div { + background-image: url('fancybox_loading@2x.gif'); + background-size: 24px 24px; /*The size of the normal image, half the size of the hi-res image*/ + } } \ No newline at end of file diff --git a/yawdadmin/static/yawd-admin/css/fancybox/jquery.fancybox.js b/yawdadmin/static/yawd-admin/css/fancybox/jquery.fancybox.js new file mode 100755 index 0000000..6158683 --- /dev/null +++ b/yawdadmin/static/yawd-admin/css/fancybox/jquery.fancybox.js @@ -0,0 +1,2020 @@ +/*! + * fancyBox - jQuery Plugin + * version: 2.1.5 (Fri, 14 Jun 2013) + * @requires jQuery v1.6 or later + * + * Examples at http://fancyapps.com/fancybox/ + * License: www.fancyapps.com/fancybox/#license + * + * Copyright 2012 Janis Skarnelis - janis@fancyapps.com + * + */ + +(function (window, document, $, undefined) { + "use strict"; + + var H = $("html"), + W = $(window), + D = $(document), + F = $.fancybox = function () { + F.open.apply( this, arguments ); + }, + IE = navigator.userAgent.match(/msie/i), + didUpdate = null, + isTouch = document.createTouch !== undefined, + + isQuery = function(obj) { + return obj && obj.hasOwnProperty && obj instanceof $; + }, + isString = function(str) { + return str && $.type(str) === "string"; + }, + isPercentage = function(str) { + return isString(str) && str.indexOf('%') > 0; + }, + isScrollable = function(el) { + return (el && !(el.style.overflow && el.style.overflow === 'hidden') && ((el.clientWidth && el.scrollWidth > el.clientWidth) || (el.clientHeight && el.scrollHeight > el.clientHeight))); + }, + getScalar = function(orig, dim) { + var value = parseInt(orig, 10) || 0; + + if (dim && isPercentage(orig)) { + value = F.getViewport()[ dim ] / 100 * value; + } + + return Math.ceil(value); + }, + getValue = function(value, dim) { + return getScalar(value, dim) + 'px'; + }; + + $.extend(F, { + // The current version of fancyBox + version: '2.1.5', + + defaults: { + padding : 15, + margin : 20, + + width : 800, + height : 600, + minWidth : 100, + minHeight : 100, + maxWidth : 9999, + maxHeight : 9999, + pixelRatio: 1, // Set to 2 for retina display support + + autoSize : true, + autoHeight : false, + autoWidth : false, + + autoResize : true, + autoCenter : !isTouch, + fitToView : true, + aspectRatio : false, + topRatio : 0.5, + leftRatio : 0.5, + + scrolling : 'auto', // 'auto', 'yes' or 'no' + wrapCSS : '', + + arrows : true, + closeBtn : true, + closeClick : false, + nextClick : false, + mouseWheel : true, + autoPlay : false, + playSpeed : 3000, + preload : 3, + modal : false, + loop : true, + + ajax : { + dataType : 'html', + headers : { 'X-fancyBox': true } + }, + iframe : { + scrolling : 'auto', + preload : true + }, + swf : { + wmode: 'transparent', + allowfullscreen : 'true', + allowscriptaccess : 'always' + }, + + keys : { + next : { + 13 : 'left', // enter + 34 : 'up', // page down + 39 : 'left', // right arrow + 40 : 'up' // down arrow + }, + prev : { + 8 : 'right', // backspace + 33 : 'down', // page up + 37 : 'right', // left arrow + 38 : 'down' // up arrow + }, + close : [27], // escape key + play : [32], // space - start/stop slideshow + toggle : [70] // letter "f" - toggle fullscreen + }, + + direction : { + next : 'left', + prev : 'right' + }, + + scrollOutside : true, + + // Override some properties + index : 0, + type : null, + href : null, + content : null, + title : null, + + // HTML templates + tpl: { + wrap : '
    ', + image : '', + iframe : '', + error : '

    The requested content cannot be loaded.
    Please try again later.

    ', + closeBtn : '', + next : '', + prev : '' + }, + + // Properties for each animation type + // Opening fancyBox + openEffect : 'fade', // 'elastic', 'fade' or 'none' + openSpeed : 250, + openEasing : 'swing', + openOpacity : true, + openMethod : 'zoomIn', + + // Closing fancyBox + closeEffect : 'fade', // 'elastic', 'fade' or 'none' + closeSpeed : 250, + closeEasing : 'swing', + closeOpacity : true, + closeMethod : 'zoomOut', + + // Changing next gallery item + nextEffect : 'elastic', // 'elastic', 'fade' or 'none' + nextSpeed : 250, + nextEasing : 'swing', + nextMethod : 'changeIn', + + // Changing previous gallery item + prevEffect : 'elastic', // 'elastic', 'fade' or 'none' + prevSpeed : 250, + prevEasing : 'swing', + prevMethod : 'changeOut', + + // Enable default helpers + helpers : { + overlay : true, + title : true + }, + + // Callbacks + onCancel : $.noop, // If canceling + beforeLoad : $.noop, // Before loading + afterLoad : $.noop, // After loading + beforeShow : $.noop, // Before changing in current item + afterShow : $.noop, // After opening + beforeChange : $.noop, // Before changing gallery item + beforeClose : $.noop, // Before closing + afterClose : $.noop // After closing + }, + + //Current state + group : {}, // Selected group + opts : {}, // Group options + previous : null, // Previous element + coming : null, // Element being loaded + current : null, // Currently loaded element + isActive : false, // Is activated + isOpen : false, // Is currently open + isOpened : false, // Have been fully opened at least once + + wrap : null, + skin : null, + outer : null, + inner : null, + + player : { + timer : null, + isActive : false + }, + + // Loaders + ajaxLoad : null, + imgPreload : null, + + // Some collections + transitions : {}, + helpers : {}, + + /* + * Static methods + */ + + open: function (group, opts) { + if (!group) { + return; + } + + if (!$.isPlainObject(opts)) { + opts = {}; + } + + // Close if already active + if (false === F.close(true)) { + return; + } + + // Normalize group + if (!$.isArray(group)) { + group = isQuery(group) ? $(group).get() : [group]; + } + + // Recheck if the type of each element is `object` and set content type (image, ajax, etc) + $.each(group, function(i, element) { + var obj = {}, + href, + title, + content, + type, + rez, + hrefParts, + selector; + + if ($.type(element) === "object") { + // Check if is DOM element + if (element.nodeType) { + element = $(element); + } + + if (isQuery(element)) { + obj = { + href : element.data('fancybox-href') || element.attr('href'), + title : element.data('fancybox-title') || element.attr('title'), + isDom : true, + element : element + }; + + if ($.metadata) { + $.extend(true, obj, element.metadata()); + } + + } else { + obj = element; + } + } + + href = opts.href || obj.href || (isString(element) ? element : null); + title = opts.title !== undefined ? opts.title : obj.title || ''; + + content = opts.content || obj.content; + type = content ? 'html' : (opts.type || obj.type); + + if (!type && obj.isDom) { + type = element.data('fancybox-type'); + + if (!type) { + rez = element.prop('class').match(/fancybox\.(\w+)/); + type = rez ? rez[1] : null; + } + } + + if (isString(href)) { + // Try to guess the content type + if (!type) { + if (F.isImage(href)) { + type = 'image'; + + } else if (F.isSWF(href)) { + type = 'swf'; + + } else if (href.charAt(0) === '#') { + type = 'inline'; + + } else if (isString(element)) { + type = 'html'; + content = element; + } + } + + // Split url into two pieces with source url and content selector, e.g, + // "/mypage.html #my_id" will load "/mypage.html" and display element having id "my_id" + if (type === 'ajax') { + hrefParts = href.split(/\s+/, 2); + href = hrefParts.shift(); + selector = hrefParts.shift(); + } + } + + if (!content) { + if (type === 'inline') { + if (href) { + content = $( isString(href) ? href.replace(/.*(?=#[^\s]+$)/, '') : href ); //strip for ie7 + + } else if (obj.isDom) { + content = element; + } + + } else if (type === 'html') { + content = href; + + } else if (!type && !href && obj.isDom) { + type = 'inline'; + content = element; + } + } + + $.extend(obj, { + href : href, + type : type, + content : content, + title : title, + selector : selector + }); + + group[ i ] = obj; + }); + + // Extend the defaults + F.opts = $.extend(true, {}, F.defaults, opts); + + // All options are merged recursive except keys + if (opts.keys !== undefined) { + F.opts.keys = opts.keys ? $.extend({}, F.defaults.keys, opts.keys) : false; + } + + F.group = group; + + return F._start(F.opts.index); + }, + + // Cancel image loading or abort ajax request + cancel: function () { + var coming = F.coming; + + if (!coming || false === F.trigger('onCancel')) { + return; + } + + F.hideLoading(); + + if (F.ajaxLoad) { + F.ajaxLoad.abort(); + } + + F.ajaxLoad = null; + + if (F.imgPreload) { + F.imgPreload.onload = F.imgPreload.onerror = null; + } + + if (coming.wrap) { + coming.wrap.stop(true, true).trigger('onReset').remove(); + } + + F.coming = null; + + // If the first item has been canceled, then clear everything + if (!F.current) { + F._afterZoomOut( coming ); + } + }, + + // Start closing animation if is open; remove immediately if opening/closing + close: function (event) { + F.cancel(); + + if (false === F.trigger('beforeClose')) { + return; + } + + F.unbindEvents(); + + if (!F.isActive) { + return; + } + + if (!F.isOpen || event === true) { + $('.fancybox-wrap').stop(true).trigger('onReset').remove(); + + F._afterZoomOut(); + + } else { + F.isOpen = F.isOpened = false; + F.isClosing = true; + + $('.fancybox-item, .fancybox-nav').remove(); + + F.wrap.stop(true, true).removeClass('fancybox-opened'); + + F.transitions[ F.current.closeMethod ](); + } + }, + + // Manage slideshow: + // $.fancybox.play(); - toggle slideshow + // $.fancybox.play( true ); - start + // $.fancybox.play( false ); - stop + play: function ( action ) { + var clear = function () { + clearTimeout(F.player.timer); + }, + set = function () { + clear(); + + if (F.current && F.player.isActive) { + F.player.timer = setTimeout(F.next, F.current.playSpeed); + } + }, + stop = function () { + clear(); + + D.unbind('.player'); + + F.player.isActive = false; + + F.trigger('onPlayEnd'); + }, + start = function () { + if (F.current && (F.current.loop || F.current.index < F.group.length - 1)) { + F.player.isActive = true; + + D.bind({ + 'onCancel.player beforeClose.player' : stop, + 'onUpdate.player' : set, + 'beforeLoad.player' : clear + }); + + set(); + + F.trigger('onPlayStart'); + } + }; + + if (action === true || (!F.player.isActive && action !== false)) { + start(); + } else { + stop(); + } + }, + + // Navigate to next gallery item + next: function ( direction ) { + var current = F.current; + + if (current) { + if (!isString(direction)) { + direction = current.direction.next; + } + + F.jumpto(current.index + 1, direction, 'next'); + } + }, + + // Navigate to previous gallery item + prev: function ( direction ) { + var current = F.current; + + if (current) { + if (!isString(direction)) { + direction = current.direction.prev; + } + + F.jumpto(current.index - 1, direction, 'prev'); + } + }, + + // Navigate to gallery item by index + jumpto: function ( index, direction, router ) { + var current = F.current; + + if (!current) { + return; + } + + index = getScalar(index); + + F.direction = direction || current.direction[ (index >= current.index ? 'next' : 'prev') ]; + F.router = router || 'jumpto'; + + if (current.loop) { + if (index < 0) { + index = current.group.length + (index % current.group.length); + } + + index = index % current.group.length; + } + + if (current.group[ index ] !== undefined) { + F.cancel(); + + F._start(index); + } + }, + + // Center inside viewport and toggle position type to fixed or absolute if needed + reposition: function (e, onlyAbsolute) { + var current = F.current, + wrap = current ? current.wrap : null, + pos; + + if (wrap) { + pos = F._getPosition(onlyAbsolute); + + if (e && e.type === 'scroll') { + delete pos.position; + + wrap.stop(true, true).animate(pos, 200); + + } else { + wrap.css(pos); + + current.pos = $.extend({}, current.dim, pos); + } + } + }, + + update: function (e) { + var type = (e && e.type), + anyway = !type || type === 'orientationchange'; + + if (anyway) { + clearTimeout(didUpdate); + + didUpdate = null; + } + + if (!F.isOpen || didUpdate) { + return; + } + + didUpdate = setTimeout(function() { + var current = F.current; + + if (!current || F.isClosing) { + return; + } + + F.wrap.removeClass('fancybox-tmp'); + + if (anyway || type === 'load' || (type === 'resize' && current.autoResize)) { + F._setDimension(); + } + + if (!(type === 'scroll' && current.canShrink)) { + F.reposition(e); + } + + F.trigger('onUpdate'); + + didUpdate = null; + + }, (anyway && !isTouch ? 0 : 300)); + }, + + // Shrink content to fit inside viewport or restore if resized + toggle: function ( action ) { + if (F.isOpen) { + F.current.fitToView = $.type(action) === "boolean" ? action : !F.current.fitToView; + + // Help browser to restore document dimensions + if (isTouch) { + F.wrap.removeAttr('style').addClass('fancybox-tmp'); + + F.trigger('onUpdate'); + } + + F.update(); + } + }, + + hideLoading: function () { + D.unbind('.loading'); + + $('#fancybox-loading').remove(); + }, + + showLoading: function () { + var el, viewport; + + F.hideLoading(); + + el = $('
    ').click(F.cancel).appendTo('body'); + + // If user will press the escape-button, the request will be canceled + D.bind('keydown.loading', function(e) { + if ((e.which || e.keyCode) === 27) { + e.preventDefault(); + + F.cancel(); + } + }); + + if (!F.defaults.fixed) { + viewport = F.getViewport(); + + el.css({ + position : 'absolute', + top : (viewport.h * 0.5) + viewport.y, + left : (viewport.w * 0.5) + viewport.x + }); + } + }, + + getViewport: function () { + var locked = (F.current && F.current.locked) || false, + rez = { + x: W.scrollLeft(), + y: W.scrollTop() + }; + + if (locked) { + rez.w = locked[0].clientWidth; + rez.h = locked[0].clientHeight; + + } else { + // See http://bugs.jquery.com/ticket/6724 + rez.w = isTouch && window.innerWidth ? window.innerWidth : W.width(); + rez.h = isTouch && window.innerHeight ? window.innerHeight : W.height(); + } + + return rez; + }, + + // Unbind the keyboard / clicking actions + unbindEvents: function () { + if (F.wrap && isQuery(F.wrap)) { + F.wrap.unbind('.fb'); + } + + D.unbind('.fb'); + W.unbind('.fb'); + }, + + bindEvents: function () { + var current = F.current, + keys; + + if (!current) { + return; + } + + // Changing document height on iOS devices triggers a 'resize' event, + // that can change document height... repeating infinitely + W.bind('orientationchange.fb' + (isTouch ? '' : ' resize.fb') + (current.autoCenter && !current.locked ? ' scroll.fb' : ''), F.update); + + keys = current.keys; + + if (keys) { + D.bind('keydown.fb', function (e) { + var code = e.which || e.keyCode, + target = e.target || e.srcElement; + + // Skip esc key if loading, because showLoading will cancel preloading + if (code === 27 && F.coming) { + return false; + } + + // Ignore key combinations and key events within form elements + if (!e.ctrlKey && !e.altKey && !e.shiftKey && !e.metaKey && !(target && (target.type || $(target).is('[contenteditable]')))) { + $.each(keys, function(i, val) { + if (current.group.length > 1 && val[ code ] !== undefined) { + F[ i ]( val[ code ] ); + + e.preventDefault(); + return false; + } + + if ($.inArray(code, val) > -1) { + F[ i ] (); + + e.preventDefault(); + return false; + } + }); + } + }); + } + + if ($.fn.mousewheel && current.mouseWheel) { + F.wrap.bind('mousewheel.fb', function (e, delta, deltaX, deltaY) { + var target = e.target || null, + parent = $(target), + canScroll = false; + + while (parent.length) { + if (canScroll || parent.is('.fancybox-skin') || parent.is('.fancybox-wrap')) { + break; + } + + canScroll = isScrollable( parent[0] ); + parent = $(parent).parent(); + } + + if (delta !== 0 && !canScroll) { + if (F.group.length > 1 && !current.canShrink) { + if (deltaY > 0 || deltaX > 0) { + F.prev( deltaY > 0 ? 'down' : 'left' ); + + } else if (deltaY < 0 || deltaX < 0) { + F.next( deltaY < 0 ? 'up' : 'right' ); + } + + e.preventDefault(); + } + } + }); + } + }, + + trigger: function (event, o) { + var ret, obj = o || F.coming || F.current; + + if (!obj) { + return; + } + + if ($.isFunction( obj[event] )) { + ret = obj[event].apply(obj, Array.prototype.slice.call(arguments, 1)); + } + + if (ret === false) { + return false; + } + + if (obj.helpers) { + $.each(obj.helpers, function (helper, opts) { + if (opts && F.helpers[helper] && $.isFunction(F.helpers[helper][event])) { + F.helpers[helper][event]($.extend(true, {}, F.helpers[helper].defaults, opts), obj); + } + }); + } + + D.trigger(event); + }, + + isImage: function (str) { + return isString(str) && str.match(/(^data:image\/.*,)|(\.(jp(e|g|eg)|gif|png|bmp|webp|svg)((\?|#).*)?$)/i); + }, + + isSWF: function (str) { + return isString(str) && str.match(/\.(swf)((\?|#).*)?$/i); + }, + + _start: function (index) { + var coming = {}, + obj, + href, + type, + margin, + padding; + + index = getScalar( index ); + obj = F.group[ index ] || null; + + if (!obj) { + return false; + } + + coming = $.extend(true, {}, F.opts, obj); + + // Convert margin and padding properties to array - top, right, bottom, left + margin = coming.margin; + padding = coming.padding; + + if ($.type(margin) === 'number') { + coming.margin = [margin, margin, margin, margin]; + } + + if ($.type(padding) === 'number') { + coming.padding = [padding, padding, padding, padding]; + } + + // 'modal' propery is just a shortcut + if (coming.modal) { + $.extend(true, coming, { + closeBtn : false, + closeClick : false, + nextClick : false, + arrows : false, + mouseWheel : false, + keys : null, + helpers: { + overlay : { + closeClick : false + } + } + }); + } + + // 'autoSize' property is a shortcut, too + if (coming.autoSize) { + coming.autoWidth = coming.autoHeight = true; + } + + if (coming.width === 'auto') { + coming.autoWidth = true; + } + + if (coming.height === 'auto') { + coming.autoHeight = true; + } + + /* + * Add reference to the group, so it`s possible to access from callbacks, example: + * afterLoad : function() { + * this.title = 'Image ' + (this.index + 1) + ' of ' + this.group.length + (this.title ? ' - ' + this.title : ''); + * } + */ + + coming.group = F.group; + coming.index = index; + + // Give a chance for callback or helpers to update coming item (type, title, etc) + F.coming = coming; + + if (false === F.trigger('beforeLoad')) { + F.coming = null; + + return; + } + + type = coming.type; + href = coming.href; + + if (!type) { + F.coming = null; + + //If we can not determine content type then drop silently or display next/prev item if looping through gallery + if (F.current && F.router && F.router !== 'jumpto') { + F.current.index = index; + + return F[ F.router ]( F.direction ); + } + + return false; + } + + F.isActive = true; + + if (type === 'image' || type === 'swf') { + coming.autoHeight = coming.autoWidth = false; + coming.scrolling = 'visible'; + } + + if (type === 'image') { + coming.aspectRatio = true; + } + + if (type === 'iframe' && isTouch) { + coming.scrolling = 'scroll'; + } + + // Build the neccessary markup + coming.wrap = $(coming.tpl.wrap).addClass('fancybox-' + (isTouch ? 'mobile' : 'desktop') + ' fancybox-type-' + type + ' fancybox-tmp ' + coming.wrapCSS).appendTo( coming.parent || 'body' ); + + $.extend(coming, { + skin : $('.fancybox-skin', coming.wrap), + outer : $('.fancybox-outer', coming.wrap), + inner : $('.fancybox-inner', coming.wrap) + }); + + $.each(["Top", "Right", "Bottom", "Left"], function(i, v) { + coming.skin.css('padding' + v, getValue(coming.padding[ i ])); + }); + + F.trigger('onReady'); + + // Check before try to load; 'inline' and 'html' types need content, others - href + if (type === 'inline' || type === 'html') { + if (!coming.content || !coming.content.length) { + return F._error( 'content' ); + } + + } else if (!href) { + return F._error( 'href' ); + } + + if (type === 'image') { + F._loadImage(); + + } else if (type === 'ajax') { + F._loadAjax(); + + } else if (type === 'iframe') { + F._loadIframe(); + + } else { + F._afterLoad(); + } + }, + + _error: function ( type ) { + $.extend(F.coming, { + type : 'html', + autoWidth : true, + autoHeight : true, + minWidth : 0, + minHeight : 0, + scrolling : 'no', + hasError : type, + content : F.coming.tpl.error + }); + + F._afterLoad(); + }, + + _loadImage: function () { + // Reset preload image so it is later possible to check "complete" property + var img = F.imgPreload = new Image(); + + img.onload = function () { + this.onload = this.onerror = null; + + F.coming.width = this.width / F.opts.pixelRatio; + F.coming.height = this.height / F.opts.pixelRatio; + + F._afterLoad(); + }; + + img.onerror = function () { + this.onload = this.onerror = null; + + F._error( 'image' ); + }; + + img.src = F.coming.href; + + if (img.complete !== true) { + F.showLoading(); + } + }, + + _loadAjax: function () { + var coming = F.coming; + + F.showLoading(); + + F.ajaxLoad = $.ajax($.extend({}, coming.ajax, { + url: coming.href, + error: function (jqXHR, textStatus) { + if (F.coming && textStatus !== 'abort') { + F._error( 'ajax', jqXHR ); + + } else { + F.hideLoading(); + } + }, + success: function (data, textStatus) { + if (textStatus === 'success') { + coming.content = data; + + F._afterLoad(); + } + } + })); + }, + + _loadIframe: function() { + var coming = F.coming, + iframe = $(coming.tpl.iframe.replace(/\{rnd\}/g, new Date().getTime())) + .attr('scrolling', isTouch ? 'auto' : coming.iframe.scrolling) + .attr('src', coming.href); + + // This helps IE + $(coming.wrap).bind('onReset', function () { + try { + $(this).find('iframe').hide().attr('src', '//about:blank').end().empty(); + } catch (e) {} + }); + + if (coming.iframe.preload) { + F.showLoading(); + + iframe.one('load', function() { + $(this).data('ready', 1); + + // iOS will lose scrolling if we resize + if (!isTouch) { + $(this).bind('load.fb', F.update); + } + + // Without this trick: + // - iframe won't scroll on iOS devices + // - IE7 sometimes displays empty iframe + $(this).parents('.fancybox-wrap').width('100%').removeClass('fancybox-tmp').show(); + + F._afterLoad(); + }); + } + + coming.content = iframe.appendTo( coming.inner ); + + if (!coming.iframe.preload) { + F._afterLoad(); + } + }, + + _preloadImages: function() { + var group = F.group, + current = F.current, + len = group.length, + cnt = current.preload ? Math.min(current.preload, len - 1) : 0, + item, + i; + + for (i = 1; i <= cnt; i += 1) { + item = group[ (current.index + i ) % len ]; + + if (item.type === 'image' && item.href) { + new Image().src = item.href; + } + } + }, + + _afterLoad: function () { + var coming = F.coming, + previous = F.current, + placeholder = 'fancybox-placeholder', + current, + content, + type, + scrolling, + href, + embed; + + F.hideLoading(); + + if (!coming || F.isActive === false) { + return; + } + + if (false === F.trigger('afterLoad', coming, previous)) { + coming.wrap.stop(true).trigger('onReset').remove(); + + F.coming = null; + + return; + } + + if (previous) { + F.trigger('beforeChange', previous); + + previous.wrap.stop(true).removeClass('fancybox-opened') + .find('.fancybox-item, .fancybox-nav') + .remove(); + } + + F.unbindEvents(); + + current = coming; + content = coming.content; + type = coming.type; + scrolling = coming.scrolling; + + $.extend(F, { + wrap : current.wrap, + skin : current.skin, + outer : current.outer, + inner : current.inner, + current : current, + previous : previous + }); + + href = current.href; + + switch (type) { + case 'inline': + case 'ajax': + case 'html': + if (current.selector) { + content = $('
    ').html(content).find(current.selector); + + } else if (isQuery(content)) { + if (!content.data(placeholder)) { + content.data(placeholder, $('
    ').insertAfter( content ).hide() ); + } + + content = content.show().detach(); + + current.wrap.bind('onReset', function () { + if ($(this).find(content).length) { + content.hide().replaceAll( content.data(placeholder) ).data(placeholder, false); + } + }); + } + break; + + case 'image': + content = current.tpl.image.replace('{href}', href); + break; + + case 'swf': + content = ''; + embed = ''; + + $.each(current.swf, function(name, val) { + content += ''; + embed += ' ' + name + '="' + val + '"'; + }); + + content += ''; + break; + } + + if (!(isQuery(content) && content.parent().is(current.inner))) { + current.inner.append( content ); + } + + // Give a chance for helpers or callbacks to update elements + F.trigger('beforeShow'); + + // Set scrolling before calculating dimensions + current.inner.css('overflow', scrolling === 'yes' ? 'scroll' : (scrolling === 'no' ? 'hidden' : scrolling)); + + // Set initial dimensions and start position + F._setDimension(); + + F.reposition(); + + F.isOpen = false; + F.coming = null; + + F.bindEvents(); + + if (!F.isOpened) { + $('.fancybox-wrap').not( current.wrap ).stop(true).trigger('onReset').remove(); + + } else if (previous.prevMethod) { + F.transitions[ previous.prevMethod ](); + } + + F.transitions[ F.isOpened ? current.nextMethod : current.openMethod ](); + + F._preloadImages(); + }, + + _setDimension: function () { + var viewport = F.getViewport(), + steps = 0, + canShrink = false, + canExpand = false, + wrap = F.wrap, + skin = F.skin, + inner = F.inner, + current = F.current, + width = current.width, + height = current.height, + minWidth = current.minWidth, + minHeight = current.minHeight, + maxWidth = current.maxWidth, + maxHeight = current.maxHeight, + scrolling = current.scrolling, + scrollOut = current.scrollOutside ? current.scrollbarWidth : 0, + margin = current.margin, + wMargin = getScalar(margin[1] + margin[3]), + hMargin = getScalar(margin[0] + margin[2]), + wPadding, + hPadding, + wSpace, + hSpace, + origWidth, + origHeight, + origMaxWidth, + origMaxHeight, + ratio, + width_, + height_, + maxWidth_, + maxHeight_, + iframe, + body; + + // Reset dimensions so we could re-check actual size + wrap.add(skin).add(inner).width('auto').height('auto').removeClass('fancybox-tmp'); + + wPadding = getScalar(skin.outerWidth(true) - skin.width()); + hPadding = getScalar(skin.outerHeight(true) - skin.height()); + + // Any space between content and viewport (margin, padding, border, title) + wSpace = wMargin + wPadding; + hSpace = hMargin + hPadding; + + origWidth = isPercentage(width) ? (viewport.w - wSpace) * getScalar(width) / 100 : width; + origHeight = isPercentage(height) ? (viewport.h - hSpace) * getScalar(height) / 100 : height; + + if (current.type === 'iframe') { + iframe = current.content; + + if (current.autoHeight && iframe.data('ready') === 1) { + try { + if (iframe[0].contentWindow.document.location) { + inner.width( origWidth ).height(9999); + + body = iframe.contents().find('body'); + + if (scrollOut) { + body.css('overflow-x', 'hidden'); + } + + origHeight = body.outerHeight(true); + } + + } catch (e) {} + } + + } else if (current.autoWidth || current.autoHeight) { + inner.addClass( 'fancybox-tmp' ); + + // Set width or height in case we need to calculate only one dimension + if (!current.autoWidth) { + inner.width( origWidth ); + } + + if (!current.autoHeight) { + inner.height( origHeight ); + } + + if (current.autoWidth) { + origWidth = inner.width(); + } + + if (current.autoHeight) { + origHeight = inner.height(); + } + + inner.removeClass( 'fancybox-tmp' ); + } + + width = getScalar( origWidth ); + height = getScalar( origHeight ); + + ratio = origWidth / origHeight; + + // Calculations for the content + minWidth = getScalar(isPercentage(minWidth) ? getScalar(minWidth, 'w') - wSpace : minWidth); + maxWidth = getScalar(isPercentage(maxWidth) ? getScalar(maxWidth, 'w') - wSpace : maxWidth); + + minHeight = getScalar(isPercentage(minHeight) ? getScalar(minHeight, 'h') - hSpace : minHeight); + maxHeight = getScalar(isPercentage(maxHeight) ? getScalar(maxHeight, 'h') - hSpace : maxHeight); + + // These will be used to determine if wrap can fit in the viewport + origMaxWidth = maxWidth; + origMaxHeight = maxHeight; + + if (current.fitToView) { + maxWidth = Math.min(viewport.w - wSpace, maxWidth); + maxHeight = Math.min(viewport.h - hSpace, maxHeight); + } + + maxWidth_ = viewport.w - wMargin; + maxHeight_ = viewport.h - hMargin; + + if (current.aspectRatio) { + if (width > maxWidth) { + width = maxWidth; + height = getScalar(width / ratio); + } + + if (height > maxHeight) { + height = maxHeight; + width = getScalar(height * ratio); + } + + if (width < minWidth) { + width = minWidth; + height = getScalar(width / ratio); + } + + if (height < minHeight) { + height = minHeight; + width = getScalar(height * ratio); + } + + } else { + width = Math.max(minWidth, Math.min(width, maxWidth)); + + if (current.autoHeight && current.type !== 'iframe') { + inner.width( width ); + + height = inner.height(); + } + + height = Math.max(minHeight, Math.min(height, maxHeight)); + } + + // Try to fit inside viewport (including the title) + if (current.fitToView) { + inner.width( width ).height( height ); + + wrap.width( width + wPadding ); + + // Real wrap dimensions + width_ = wrap.width(); + height_ = wrap.height(); + + if (current.aspectRatio) { + while ((width_ > maxWidth_ || height_ > maxHeight_) && width > minWidth && height > minHeight) { + if (steps++ > 19) { + break; + } + + height = Math.max(minHeight, Math.min(maxHeight, height - 10)); + width = getScalar(height * ratio); + + if (width < minWidth) { + width = minWidth; + height = getScalar(width / ratio); + } + + if (width > maxWidth) { + width = maxWidth; + height = getScalar(width / ratio); + } + + inner.width( width ).height( height ); + + wrap.width( width + wPadding ); + + width_ = wrap.width(); + height_ = wrap.height(); + } + + } else { + width = Math.max(minWidth, Math.min(width, width - (width_ - maxWidth_))); + height = Math.max(minHeight, Math.min(height, height - (height_ - maxHeight_))); + } + } + + if (scrollOut && scrolling === 'auto' && height < origHeight && (width + wPadding + scrollOut) < maxWidth_) { + width += scrollOut; + } + + inner.width( width ).height( height ); + + wrap.width( width + wPadding ); + + width_ = wrap.width(); + height_ = wrap.height(); + + canShrink = (width_ > maxWidth_ || height_ > maxHeight_) && width > minWidth && height > minHeight; + canExpand = current.aspectRatio ? (width < origMaxWidth && height < origMaxHeight && width < origWidth && height < origHeight) : ((width < origMaxWidth || height < origMaxHeight) && (width < origWidth || height < origHeight)); + + $.extend(current, { + dim : { + width : getValue( width_ ), + height : getValue( height_ ) + }, + origWidth : origWidth, + origHeight : origHeight, + canShrink : canShrink, + canExpand : canExpand, + wPadding : wPadding, + hPadding : hPadding, + wrapSpace : height_ - skin.outerHeight(true), + skinSpace : skin.height() - height + }); + + if (!iframe && current.autoHeight && height > minHeight && height < maxHeight && !canExpand) { + inner.height('auto'); + } + }, + + _getPosition: function (onlyAbsolute) { + var current = F.current, + viewport = F.getViewport(), + margin = current.margin, + width = F.wrap.width() + margin[1] + margin[3], + height = F.wrap.height() + margin[0] + margin[2], + rez = { + position: 'absolute', + top : margin[0], + left : margin[3] + }; + + if (current.autoCenter && current.fixed && !onlyAbsolute && height <= viewport.h && width <= viewport.w) { + rez.position = 'fixed'; + + } else if (!current.locked) { + rez.top += viewport.y; + rez.left += viewport.x; + } + + rez.top = getValue(Math.max(rez.top, rez.top + ((viewport.h - height) * current.topRatio))); + rez.left = getValue(Math.max(rez.left, rez.left + ((viewport.w - width) * current.leftRatio))); + + return rez; + }, + + _afterZoomIn: function () { + var current = F.current; + + if (!current) { + return; + } + + F.isOpen = F.isOpened = true; + + F.wrap.css('overflow', 'visible').addClass('fancybox-opened'); + + F.update(); + + // Assign a click event + if ( current.closeClick || (current.nextClick && F.group.length > 1) ) { + F.inner.css('cursor', 'pointer').bind('click.fb', function(e) { + if (!$(e.target).is('a') && !$(e.target).parent().is('a')) { + e.preventDefault(); + + F[ current.closeClick ? 'close' : 'next' ](); + } + }); + } + + // Create a close button + if (current.closeBtn) { + $(current.tpl.closeBtn).appendTo(F.skin).bind('click.fb', function(e) { + e.preventDefault(); + + F.close(); + }); + } + + // Create navigation arrows + if (current.arrows && F.group.length > 1) { + if (current.loop || current.index > 0) { + $(current.tpl.prev).appendTo(F.outer).bind('click.fb', F.prev); + } + + if (current.loop || current.index < F.group.length - 1) { + $(current.tpl.next).appendTo(F.outer).bind('click.fb', F.next); + } + } + + F.trigger('afterShow'); + + // Stop the slideshow if this is the last item + if (!current.loop && current.index === current.group.length - 1) { + F.play( false ); + + } else if (F.opts.autoPlay && !F.player.isActive) { + F.opts.autoPlay = false; + + F.play(); + } + }, + + _afterZoomOut: function ( obj ) { + obj = obj || F.current; + + $('.fancybox-wrap').trigger('onReset').remove(); + + $.extend(F, { + group : {}, + opts : {}, + router : false, + current : null, + isActive : false, + isOpened : false, + isOpen : false, + isClosing : false, + wrap : null, + skin : null, + outer : null, + inner : null + }); + + F.trigger('afterClose', obj); + } + }); + + /* + * Default transitions + */ + + F.transitions = { + getOrigPosition: function () { + var current = F.current, + element = current.element, + orig = current.orig, + pos = {}, + width = 50, + height = 50, + hPadding = current.hPadding, + wPadding = current.wPadding, + viewport = F.getViewport(); + + if (!orig && current.isDom && element.is(':visible')) { + orig = element.find('img:first'); + + if (!orig.length) { + orig = element; + } + } + + if (isQuery(orig)) { + pos = orig.offset(); + + if (orig.is('img')) { + width = orig.outerWidth(); + height = orig.outerHeight(); + } + + } else { + pos.top = viewport.y + (viewport.h - height) * current.topRatio; + pos.left = viewport.x + (viewport.w - width) * current.leftRatio; + } + + if (F.wrap.css('position') === 'fixed' || current.locked) { + pos.top -= viewport.y; + pos.left -= viewport.x; + } + + pos = { + top : getValue(pos.top - hPadding * current.topRatio), + left : getValue(pos.left - wPadding * current.leftRatio), + width : getValue(width + wPadding), + height : getValue(height + hPadding) + }; + + return pos; + }, + + step: function (now, fx) { + var ratio, + padding, + value, + prop = fx.prop, + current = F.current, + wrapSpace = current.wrapSpace, + skinSpace = current.skinSpace; + + if (prop === 'width' || prop === 'height') { + ratio = fx.end === fx.start ? 1 : (now - fx.start) / (fx.end - fx.start); + + if (F.isClosing) { + ratio = 1 - ratio; + } + + padding = prop === 'width' ? current.wPadding : current.hPadding; + value = now - padding; + + F.skin[ prop ]( getScalar( prop === 'width' ? value : value - (wrapSpace * ratio) ) ); + F.inner[ prop ]( getScalar( prop === 'width' ? value : value - (wrapSpace * ratio) - (skinSpace * ratio) ) ); + } + }, + + zoomIn: function () { + var current = F.current, + startPos = current.pos, + effect = current.openEffect, + elastic = effect === 'elastic', + endPos = $.extend({opacity : 1}, startPos); + + // Remove "position" property that breaks older IE + delete endPos.position; + + if (elastic) { + startPos = this.getOrigPosition(); + + if (current.openOpacity) { + startPos.opacity = 0.1; + } + + } else if (effect === 'fade') { + startPos.opacity = 0.1; + } + + F.wrap.css(startPos).animate(endPos, { + duration : effect === 'none' ? 0 : current.openSpeed, + easing : current.openEasing, + step : elastic ? this.step : null, + complete : F._afterZoomIn + }); + }, + + zoomOut: function () { + var current = F.current, + effect = current.closeEffect, + elastic = effect === 'elastic', + endPos = {opacity : 0.1}; + + if (elastic) { + endPos = this.getOrigPosition(); + + if (current.closeOpacity) { + endPos.opacity = 0.1; + } + } + + F.wrap.animate(endPos, { + duration : effect === 'none' ? 0 : current.closeSpeed, + easing : current.closeEasing, + step : elastic ? this.step : null, + complete : F._afterZoomOut + }); + }, + + changeIn: function () { + var current = F.current, + effect = current.nextEffect, + startPos = current.pos, + endPos = { opacity : 1 }, + direction = F.direction, + distance = 200, + field; + + startPos.opacity = 0.1; + + if (effect === 'elastic') { + field = direction === 'down' || direction === 'up' ? 'top' : 'left'; + + if (direction === 'down' || direction === 'right') { + startPos[ field ] = getValue(getScalar(startPos[ field ]) - distance); + endPos[ field ] = '+=' + distance + 'px'; + + } else { + startPos[ field ] = getValue(getScalar(startPos[ field ]) + distance); + endPos[ field ] = '-=' + distance + 'px'; + } + } + + // Workaround for http://bugs.jquery.com/ticket/12273 + if (effect === 'none') { + F._afterZoomIn(); + + } else { + F.wrap.css(startPos).animate(endPos, { + duration : current.nextSpeed, + easing : current.nextEasing, + complete : F._afterZoomIn + }); + } + }, + + changeOut: function () { + var previous = F.previous, + effect = previous.prevEffect, + endPos = { opacity : 0.1 }, + direction = F.direction, + distance = 200; + + if (effect === 'elastic') { + endPos[ direction === 'down' || direction === 'up' ? 'top' : 'left' ] = ( direction === 'up' || direction === 'left' ? '-' : '+' ) + '=' + distance + 'px'; + } + + previous.wrap.animate(endPos, { + duration : effect === 'none' ? 0 : previous.prevSpeed, + easing : previous.prevEasing, + complete : function () { + $(this).trigger('onReset').remove(); + } + }); + } + }; + + /* + * Overlay helper + */ + + F.helpers.overlay = { + defaults : { + closeClick : true, // if true, fancyBox will be closed when user clicks on the overlay + speedOut : 200, // duration of fadeOut animation + showEarly : true, // indicates if should be opened immediately or wait until the content is ready + css : {}, // custom CSS properties + locked : !isTouch, // if true, the content will be locked into overlay + fixed : true // if false, the overlay CSS position property will not be set to "fixed" + }, + + overlay : null, // current handle + fixed : false, // indicates if the overlay has position "fixed" + el : $('html'), // element that contains "the lock" + + // Public methods + create : function(opts) { + opts = $.extend({}, this.defaults, opts); + + if (this.overlay) { + this.close(); + } + + this.overlay = $('
    ').appendTo( F.coming ? F.coming.parent : opts.parent ); + this.fixed = false; + + if (opts.fixed && F.defaults.fixed) { + this.overlay.addClass('fancybox-overlay-fixed'); + + this.fixed = true; + } + }, + + open : function(opts) { + var that = this; + + opts = $.extend({}, this.defaults, opts); + + if (this.overlay) { + this.overlay.unbind('.overlay').width('auto').height('auto'); + + } else { + this.create(opts); + } + + if (!this.fixed) { + W.bind('resize.overlay', $.proxy( this.update, this) ); + + this.update(); + } + + if (opts.closeClick) { + this.overlay.bind('click.overlay', function(e) { + if ($(e.target).hasClass('fancybox-overlay')) { + if (F.isActive) { + F.close(); + } else { + that.close(); + } + + return false; + } + }); + } + + this.overlay.css( opts.css ).show(); + }, + + close : function() { + var scrollV, scrollH; + + W.unbind('resize.overlay'); + + if (this.el.hasClass('fancybox-lock')) { + $('.fancybox-margin').removeClass('fancybox-margin'); + + scrollV = W.scrollTop(); + scrollH = W.scrollLeft(); + + this.el.removeClass('fancybox-lock'); + + W.scrollTop( scrollV ).scrollLeft( scrollH ); + } + + $('.fancybox-overlay').remove().hide(); + + $.extend(this, { + overlay : null, + fixed : false + }); + }, + + // Private, callbacks + + update : function () { + var width = '100%', offsetWidth; + + // Reset width/height so it will not mess + this.overlay.width(width).height('100%'); + + // jQuery does not return reliable result for IE + if (IE) { + offsetWidth = Math.max(document.documentElement.offsetWidth, document.body.offsetWidth); + + if (D.width() > offsetWidth) { + width = D.width(); + } + + } else if (D.width() > W.width()) { + width = D.width(); + } + + this.overlay.width(width).height(D.height()); + }, + + // This is where we can manipulate DOM, because later it would cause iframes to reload + onReady : function (opts, obj) { + var overlay = this.overlay; + + $('.fancybox-overlay').stop(true, true); + + if (!overlay) { + this.create(opts); + } + + if (opts.locked && this.fixed && obj.fixed) { + if (!overlay) { + this.margin = D.height() > W.height() ? $('html').css('margin-right').replace("px", "") : false; + } + + obj.locked = this.overlay.append( obj.wrap ); + obj.fixed = false; + } + + if (opts.showEarly === true) { + this.beforeShow.apply(this, arguments); + } + }, + + beforeShow : function(opts, obj) { + var scrollV, scrollH; + + if (obj.locked) { + if (this.margin !== false) { + $('*').filter(function(){ + return ($(this).css('position') === 'fixed' && !$(this).hasClass("fancybox-overlay") && !$(this).hasClass("fancybox-wrap") ); + }).addClass('fancybox-margin'); + + this.el.addClass('fancybox-margin'); + } + + scrollV = W.scrollTop(); + scrollH = W.scrollLeft(); + + this.el.addClass('fancybox-lock'); + + W.scrollTop( scrollV ).scrollLeft( scrollH ); + } + + this.open(opts); + }, + + onUpdate : function() { + if (!this.fixed) { + this.update(); + } + }, + + afterClose: function (opts) { + // Remove overlay if exists and fancyBox is not opening + // (e.g., it is not being open using afterClose callback) + //if (this.overlay && !F.isActive) { + if (this.overlay && !F.coming) { + this.overlay.fadeOut(opts.speedOut, $.proxy( this.close, this )); + } + } + }; + + /* + * Title helper + */ + + F.helpers.title = { + defaults : { + type : 'float', // 'float', 'inside', 'outside' or 'over', + position : 'bottom' // 'top' or 'bottom' + }, + + beforeShow: function (opts) { + var current = F.current, + text = current.title, + type = opts.type, + title, + target; + + if ($.isFunction(text)) { + text = text.call(current.element, current); + } + + if (!isString(text) || $.trim(text) === '') { + return; + } + + title = $('
    ' + text + '
    '); + + switch (type) { + case 'inside': + target = F.skin; + break; + + case 'outside': + target = F.wrap; + break; + + case 'over': + target = F.inner; + break; + + default: // 'float' + target = F.skin; + + title.appendTo('body'); + + if (IE) { + title.width( title.width() ); + } + + title.wrapInner(''); + + //Increase bottom margin so this title will also fit into viewport + F.current.margin[2] += Math.abs( getScalar(title.css('margin-bottom')) ); + break; + } + + title[ (opts.position === 'top' ? 'prependTo' : 'appendTo') ](target); + } + }; + + // jQuery plugin initialization + $.fn.fancybox = function (options) { + var index, + that = $(this), + selector = this.selector || '', + run = function(e) { + var what = $(this).blur(), idx = index, relType, relVal; + + if (!(e.ctrlKey || e.altKey || e.shiftKey || e.metaKey) && !what.is('.fancybox-wrap')) { + relType = options.groupAttr || 'data-fancybox-group'; + relVal = what.attr(relType); + + if (!relVal) { + relType = 'rel'; + relVal = what.get(0)[ relType ]; + } + + if (relVal && relVal !== '' && relVal !== 'nofollow') { + what = selector.length ? $(selector) : that; + what = what.filter('[' + relType + '="' + relVal + '"]'); + idx = what.index(this); + } + + options.index = idx; + + // Stop an event from bubbling if everything is fine + if (F.open(what, options) !== false) { + e.preventDefault(); + } + } + }; + + options = options || {}; + index = options.index || 0; + + if (!selector || options.live === false) { + that.unbind('click.fb-start').bind('click.fb-start', run); + + } else { + D.undelegate(selector, 'click.fb-start').delegate(selector + ":not('.fancybox-item, .fancybox-nav')", 'click.fb-start', run); + } + + this.filter('[data-fancybox-start=1]').trigger('click'); + + return this; + }; + + // Tests that need a body at doc ready + D.ready(function() { + var w1, w2; + + if ( $.scrollbarWidth === undefined ) { + // http://benalman.com/projects/jquery-misc-plugins/#scrollbarwidth + $.scrollbarWidth = function() { + var parent = $('
    ').appendTo('body'), + child = parent.children(), + width = child.innerWidth() - child.height( 99 ).innerWidth(); + + parent.remove(); + + return width; + }; + } + + if ( $.support.fixedPosition === undefined ) { + $.support.fixedPosition = (function() { + var elem = $('
    ').appendTo('body'), + fixed = ( elem[0].offsetTop === 20 || elem[0].offsetTop === 15 ); + + elem.remove(); + + return fixed; + }()); + } + + $.extend(F.defaults, { + scrollbarWidth : $.scrollbarWidth(), + fixed : $.support.fixedPosition, + parent : $('body') + }); + + //Get real width of page scroll-bar + w1 = $(window).width(); + + H.addClass('fancybox-lock-test'); + + w2 = $(window).width(); + + H.removeClass('fancybox-lock-test'); + + $("").appendTo("head"); + }); + +}(window, document, yawdadmin.jQuery)); \ No newline at end of file diff --git a/yawdadmin/static/yawd-admin/css/fancybox/jquery.fancybox.pack.js b/yawdadmin/static/yawd-admin/css/fancybox/jquery.fancybox.pack.js new file mode 100755 index 0000000..1c15524 --- /dev/null +++ b/yawdadmin/static/yawd-admin/css/fancybox/jquery.fancybox.pack.js @@ -0,0 +1,46 @@ +/*! fancyBox v2.1.5 fancyapps.com | fancyapps.com/fancybox/#license */ +(function(r,G,f,v){var J=f("html"),n=f(r),p=f(G),b=f.fancybox=function(){b.open.apply(this,arguments)},I=navigator.userAgent.match(/msie/i),B=null,s=G.createTouch!==v,t=function(a){return a&&a.hasOwnProperty&&a instanceof f},q=function(a){return a&&"string"===f.type(a)},E=function(a){return q(a)&&0
    ',image:'',iframe:'",error:'

    The requested content cannot be loaded.
    Please try again later.

    ',closeBtn:'',next:'',prev:''},openEffect:"fade",openSpeed:250,openEasing:"swing",openOpacity:!0, +openMethod:"zoomIn",closeEffect:"fade",closeSpeed:250,closeEasing:"swing",closeOpacity:!0,closeMethod:"zoomOut",nextEffect:"elastic",nextSpeed:250,nextEasing:"swing",nextMethod:"changeIn",prevEffect:"elastic",prevSpeed:250,prevEasing:"swing",prevMethod:"changeOut",helpers:{overlay:!0,title:!0},onCancel:f.noop,beforeLoad:f.noop,afterLoad:f.noop,beforeShow:f.noop,afterShow:f.noop,beforeChange:f.noop,beforeClose:f.noop,afterClose:f.noop},group:{},opts:{},previous:null,coming:null,current:null,isActive:!1, +isOpen:!1,isOpened:!1,wrap:null,skin:null,outer:null,inner:null,player:{timer:null,isActive:!1},ajaxLoad:null,imgPreload:null,transitions:{},helpers:{},open:function(a,d){if(a&&(f.isPlainObject(d)||(d={}),!1!==b.close(!0)))return f.isArray(a)||(a=t(a)?f(a).get():[a]),f.each(a,function(e,c){var k={},g,h,j,m,l;"object"===f.type(c)&&(c.nodeType&&(c=f(c)),t(c)?(k={href:c.data("fancybox-href")||c.attr("href"),title:c.data("fancybox-title")||c.attr("title"),isDom:!0,element:c},f.metadata&&f.extend(!0,k, +c.metadata())):k=c);g=d.href||k.href||(q(c)?c:null);h=d.title!==v?d.title:k.title||"";m=(j=d.content||k.content)?"html":d.type||k.type;!m&&k.isDom&&(m=c.data("fancybox-type"),m||(m=(m=c.prop("class").match(/fancybox\.(\w+)/))?m[1]:null));q(g)&&(m||(b.isImage(g)?m="image":b.isSWF(g)?m="swf":"#"===g.charAt(0)?m="inline":q(c)&&(m="html",j=c)),"ajax"===m&&(l=g.split(/\s+/,2),g=l.shift(),l=l.shift()));j||("inline"===m?g?j=f(q(g)?g.replace(/.*(?=#[^\s]+$)/,""):g):k.isDom&&(j=c):"html"===m?j=g:!m&&(!g&& +k.isDom)&&(m="inline",j=c));f.extend(k,{href:g,type:m,content:j,title:h,selector:l});a[e]=k}),b.opts=f.extend(!0,{},b.defaults,d),d.keys!==v&&(b.opts.keys=d.keys?f.extend({},b.defaults.keys,d.keys):!1),b.group=a,b._start(b.opts.index)},cancel:function(){var a=b.coming;a&&!1!==b.trigger("onCancel")&&(b.hideLoading(),b.ajaxLoad&&b.ajaxLoad.abort(),b.ajaxLoad=null,b.imgPreload&&(b.imgPreload.onload=b.imgPreload.onerror=null),a.wrap&&a.wrap.stop(!0,!0).trigger("onReset").remove(),b.coming=null,b.current|| +b._afterZoomOut(a))},close:function(a){b.cancel();!1!==b.trigger("beforeClose")&&(b.unbindEvents(),b.isActive&&(!b.isOpen||!0===a?(f(".fancybox-wrap").stop(!0).trigger("onReset").remove(),b._afterZoomOut()):(b.isOpen=b.isOpened=!1,b.isClosing=!0,f(".fancybox-item, .fancybox-nav").remove(),b.wrap.stop(!0,!0).removeClass("fancybox-opened"),b.transitions[b.current.closeMethod]())))},play:function(a){var d=function(){clearTimeout(b.player.timer)},e=function(){d();b.current&&b.player.isActive&&(b.player.timer= +setTimeout(b.next,b.current.playSpeed))},c=function(){d();p.unbind(".player");b.player.isActive=!1;b.trigger("onPlayEnd")};if(!0===a||!b.player.isActive&&!1!==a){if(b.current&&(b.current.loop||b.current.index=c.index?"next":"prev"],b.router=e||"jumpto",c.loop&&(0>a&&(a=c.group.length+a%c.group.length),a%=c.group.length),c.group[a]!==v&&(b.cancel(),b._start(a)))},reposition:function(a,d){var e=b.current,c=e?e.wrap:null,k;c&&(k=b._getPosition(d),a&&"scroll"===a.type?(delete k.position,c.stop(!0,!0).animate(k,200)):(c.css(k),e.pos=f.extend({},e.dim,k)))},update:function(a){var d= +a&&a.type,e=!d||"orientationchange"===d;e&&(clearTimeout(B),B=null);b.isOpen&&!B&&(B=setTimeout(function(){var c=b.current;c&&!b.isClosing&&(b.wrap.removeClass("fancybox-tmp"),(e||"load"===d||"resize"===d&&c.autoResize)&&b._setDimension(),"scroll"===d&&c.canShrink||b.reposition(a),b.trigger("onUpdate"),B=null)},e&&!s?0:300))},toggle:function(a){b.isOpen&&(b.current.fitToView="boolean"===f.type(a)?a:!b.current.fitToView,s&&(b.wrap.removeAttr("style").addClass("fancybox-tmp"),b.trigger("onUpdate")), +b.update())},hideLoading:function(){p.unbind(".loading");f("#fancybox-loading").remove()},showLoading:function(){var a,d;b.hideLoading();a=f('
    ').click(b.cancel).appendTo("body");p.bind("keydown.loading",function(a){if(27===(a.which||a.keyCode))a.preventDefault(),b.cancel()});b.defaults.fixed||(d=b.getViewport(),a.css({position:"absolute",top:0.5*d.h+d.y,left:0.5*d.w+d.x}))},getViewport:function(){var a=b.current&&b.current.locked||!1,d={x:n.scrollLeft(), +y:n.scrollTop()};a?(d.w=a[0].clientWidth,d.h=a[0].clientHeight):(d.w=s&&r.innerWidth?r.innerWidth:n.width(),d.h=s&&r.innerHeight?r.innerHeight:n.height());return d},unbindEvents:function(){b.wrap&&t(b.wrap)&&b.wrap.unbind(".fb");p.unbind(".fb");n.unbind(".fb")},bindEvents:function(){var a=b.current,d;a&&(n.bind("orientationchange.fb"+(s?"":" resize.fb")+(a.autoCenter&&!a.locked?" scroll.fb":""),b.update),(d=a.keys)&&p.bind("keydown.fb",function(e){var c=e.which||e.keyCode,k=e.target||e.srcElement; +if(27===c&&b.coming)return!1;!e.ctrlKey&&(!e.altKey&&!e.shiftKey&&!e.metaKey&&(!k||!k.type&&!f(k).is("[contenteditable]")))&&f.each(d,function(d,k){if(1h[0].clientWidth||h[0].clientHeight&&h[0].scrollHeight>h[0].clientHeight),h=f(h).parent();if(0!==c&&!j&&1g||0>k)b.next(0>g?"up":"right");d.preventDefault()}}))},trigger:function(a,d){var e,c=d||b.coming||b.current;if(c){f.isFunction(c[a])&&(e=c[a].apply(c,Array.prototype.slice.call(arguments,1)));if(!1===e)return!1;c.helpers&&f.each(c.helpers,function(d,e){if(e&&b.helpers[d]&&f.isFunction(b.helpers[d][a]))b.helpers[d][a](f.extend(!0, +{},b.helpers[d].defaults,e),c)});p.trigger(a)}},isImage:function(a){return q(a)&&a.match(/(^data:image\/.*,)|(\.(jp(e|g|eg)|gif|png|bmp|webp|svg)((\?|#).*)?$)/i)},isSWF:function(a){return q(a)&&a.match(/\.(swf)((\?|#).*)?$/i)},_start:function(a){var d={},e,c;a=l(a);e=b.group[a]||null;if(!e)return!1;d=f.extend(!0,{},b.opts,e);e=d.margin;c=d.padding;"number"===f.type(e)&&(d.margin=[e,e,e,e]);"number"===f.type(c)&&(d.padding=[c,c,c,c]);d.modal&&f.extend(!0,d,{closeBtn:!1,closeClick:!1,nextClick:!1,arrows:!1, +mouseWheel:!1,keys:null,helpers:{overlay:{closeClick:!1}}});d.autoSize&&(d.autoWidth=d.autoHeight=!0);"auto"===d.width&&(d.autoWidth=!0);"auto"===d.height&&(d.autoHeight=!0);d.group=b.group;d.index=a;b.coming=d;if(!1===b.trigger("beforeLoad"))b.coming=null;else{c=d.type;e=d.href;if(!c)return b.coming=null,b.current&&b.router&&"jumpto"!==b.router?(b.current.index=a,b[b.router](b.direction)):!1;b.isActive=!0;if("image"===c||"swf"===c)d.autoHeight=d.autoWidth=!1,d.scrolling="visible";"image"===c&&(d.aspectRatio= +!0);"iframe"===c&&s&&(d.scrolling="scroll");d.wrap=f(d.tpl.wrap).addClass("fancybox-"+(s?"mobile":"desktop")+" fancybox-type-"+c+" fancybox-tmp "+d.wrapCSS).appendTo(d.parent||"body");f.extend(d,{skin:f(".fancybox-skin",d.wrap),outer:f(".fancybox-outer",d.wrap),inner:f(".fancybox-inner",d.wrap)});f.each(["Top","Right","Bottom","Left"],function(a,b){d.skin.css("padding"+b,w(d.padding[a]))});b.trigger("onReady");if("inline"===c||"html"===c){if(!d.content||!d.content.length)return b._error("content")}else if(!e)return b._error("href"); +"image"===c?b._loadImage():"ajax"===c?b._loadAjax():"iframe"===c?b._loadIframe():b._afterLoad()}},_error:function(a){f.extend(b.coming,{type:"html",autoWidth:!0,autoHeight:!0,minWidth:0,minHeight:0,scrolling:"no",hasError:a,content:b.coming.tpl.error});b._afterLoad()},_loadImage:function(){var a=b.imgPreload=new Image;a.onload=function(){this.onload=this.onerror=null;b.coming.width=this.width/b.opts.pixelRatio;b.coming.height=this.height/b.opts.pixelRatio;b._afterLoad()};a.onerror=function(){this.onload= +this.onerror=null;b._error("image")};a.src=b.coming.href;!0!==a.complete&&b.showLoading()},_loadAjax:function(){var a=b.coming;b.showLoading();b.ajaxLoad=f.ajax(f.extend({},a.ajax,{url:a.href,error:function(a,e){b.coming&&"abort"!==e?b._error("ajax",a):b.hideLoading()},success:function(d,e){"success"===e&&(a.content=d,b._afterLoad())}}))},_loadIframe:function(){var a=b.coming,d=f(a.tpl.iframe.replace(/\{rnd\}/g,(new Date).getTime())).attr("scrolling",s?"auto":a.iframe.scrolling).attr("src",a.href); +f(a.wrap).bind("onReset",function(){try{f(this).find("iframe").hide().attr("src","//about:blank").end().empty()}catch(a){}});a.iframe.preload&&(b.showLoading(),d.one("load",function(){f(this).data("ready",1);s||f(this).bind("load.fb",b.update);f(this).parents(".fancybox-wrap").width("100%").removeClass("fancybox-tmp").show();b._afterLoad()}));a.content=d.appendTo(a.inner);a.iframe.preload||b._afterLoad()},_preloadImages:function(){var a=b.group,d=b.current,e=a.length,c=d.preload?Math.min(d.preload, +e-1):0,f,g;for(g=1;g<=c;g+=1)f=a[(d.index+g)%e],"image"===f.type&&f.href&&((new Image).src=f.href)},_afterLoad:function(){var a=b.coming,d=b.current,e,c,k,g,h;b.hideLoading();if(a&&!1!==b.isActive)if(!1===b.trigger("afterLoad",a,d))a.wrap.stop(!0).trigger("onReset").remove(),b.coming=null;else{d&&(b.trigger("beforeChange",d),d.wrap.stop(!0).removeClass("fancybox-opened").find(".fancybox-item, .fancybox-nav").remove());b.unbindEvents();e=a.content;c=a.type;k=a.scrolling;f.extend(b,{wrap:a.wrap,skin:a.skin, +outer:a.outer,inner:a.inner,current:a,previous:d});g=a.href;switch(c){case "inline":case "ajax":case "html":a.selector?e=f("
    ").html(e).find(a.selector):t(e)&&(e.data("fancybox-placeholder")||e.data("fancybox-placeholder",f('
    ').insertAfter(e).hide()),e=e.show().detach(),a.wrap.bind("onReset",function(){f(this).find(e).length&&e.hide().replaceAll(e.data("fancybox-placeholder")).data("fancybox-placeholder",!1)}));break;case "image":e=a.tpl.image.replace("{href}", +g);break;case "swf":e='',h="",f.each(a.swf,function(a,b){e+='';h+=" "+a+'="'+b+'"'}),e+='"}(!t(e)||!e.parent().is(a.inner))&&a.inner.append(e);b.trigger("beforeShow");a.inner.css("overflow","yes"===k?"scroll": +"no"===k?"hidden":k);b._setDimension();b.reposition();b.isOpen=!1;b.coming=null;b.bindEvents();if(b.isOpened){if(d.prevMethod)b.transitions[d.prevMethod]()}else f(".fancybox-wrap").not(a.wrap).stop(!0).trigger("onReset").remove();b.transitions[b.isOpened?a.nextMethod:a.openMethod]();b._preloadImages()}},_setDimension:function(){var a=b.getViewport(),d=0,e=!1,c=!1,e=b.wrap,k=b.skin,g=b.inner,h=b.current,c=h.width,j=h.height,m=h.minWidth,u=h.minHeight,n=h.maxWidth,p=h.maxHeight,s=h.scrolling,q=h.scrollOutside? +h.scrollbarWidth:0,x=h.margin,y=l(x[1]+x[3]),r=l(x[0]+x[2]),v,z,t,C,A,F,B,D,H;e.add(k).add(g).width("auto").height("auto").removeClass("fancybox-tmp");x=l(k.outerWidth(!0)-k.width());v=l(k.outerHeight(!0)-k.height());z=y+x;t=r+v;C=E(c)?(a.w-z)*l(c)/100:c;A=E(j)?(a.h-t)*l(j)/100:j;if("iframe"===h.type){if(H=h.content,h.autoHeight&&1===H.data("ready"))try{H[0].contentWindow.document.location&&(g.width(C).height(9999),F=H.contents().find("body"),q&&F.css("overflow-x","hidden"),A=F.outerHeight(!0))}catch(G){}}else if(h.autoWidth|| +h.autoHeight)g.addClass("fancybox-tmp"),h.autoWidth||g.width(C),h.autoHeight||g.height(A),h.autoWidth&&(C=g.width()),h.autoHeight&&(A=g.height()),g.removeClass("fancybox-tmp");c=l(C);j=l(A);D=C/A;m=l(E(m)?l(m,"w")-z:m);n=l(E(n)?l(n,"w")-z:n);u=l(E(u)?l(u,"h")-t:u);p=l(E(p)?l(p,"h")-t:p);F=n;B=p;h.fitToView&&(n=Math.min(a.w-z,n),p=Math.min(a.h-t,p));z=a.w-y;r=a.h-r;h.aspectRatio?(c>n&&(c=n,j=l(c/D)),j>p&&(j=p,c=l(j*D)),cz||y>r)&&(c>m&&j>u)&&!(19n&&(c=n,j=l(c/D)),g.width(c).height(j),e.width(c+x),a=e.width(),y=e.height();else c=Math.max(m,Math.min(c,c-(a-z))),j=Math.max(u,Math.min(j,j-(y-r)));q&&("auto"===s&&jz||y>r)&&c>m&&j>u;c=h.aspectRatio?cu&&j
    ').appendTo(b.coming?b.coming.parent:a.parent);this.fixed=!1;a.fixed&&b.defaults.fixed&&(this.overlay.addClass("fancybox-overlay-fixed"),this.fixed=!0)},open:function(a){var d=this;a=f.extend({},this.defaults,a);this.overlay?this.overlay.unbind(".overlay").width("auto").height("auto"):this.create(a);this.fixed||(n.bind("resize.overlay",f.proxy(this.update,this)),this.update());a.closeClick&&this.overlay.bind("click.overlay",function(a){if(f(a.target).hasClass("fancybox-overlay"))return b.isActive? +b.close():d.close(),!1});this.overlay.css(a.css).show()},close:function(){var a,b;n.unbind("resize.overlay");this.el.hasClass("fancybox-lock")&&(f(".fancybox-margin").removeClass("fancybox-margin"),a=n.scrollTop(),b=n.scrollLeft(),this.el.removeClass("fancybox-lock"),n.scrollTop(a).scrollLeft(b));f(".fancybox-overlay").remove().hide();f.extend(this,{overlay:null,fixed:!1})},update:function(){var a="100%",b;this.overlay.width(a).height("100%");I?(b=Math.max(G.documentElement.offsetWidth,G.body.offsetWidth), +p.width()>b&&(a=p.width())):p.width()>n.width()&&(a=p.width());this.overlay.width(a).height(p.height())},onReady:function(a,b){var e=this.overlay;f(".fancybox-overlay").stop(!0,!0);e||this.create(a);a.locked&&(this.fixed&&b.fixed)&&(e||(this.margin=p.height()>n.height()?f("html").css("margin-right").replace("px",""):!1),b.locked=this.overlay.append(b.wrap),b.fixed=!1);!0===a.showEarly&&this.beforeShow.apply(this,arguments)},beforeShow:function(a,b){var e,c;b.locked&&(!1!==this.margin&&(f("*").filter(function(){return"fixed"=== +f(this).css("position")&&!f(this).hasClass("fancybox-overlay")&&!f(this).hasClass("fancybox-wrap")}).addClass("fancybox-margin"),this.el.addClass("fancybox-margin")),e=n.scrollTop(),c=n.scrollLeft(),this.el.addClass("fancybox-lock"),n.scrollTop(e).scrollLeft(c));this.open(a)},onUpdate:function(){this.fixed||this.update()},afterClose:function(a){this.overlay&&!b.coming&&this.overlay.fadeOut(a.speedOut,f.proxy(this.close,this))}};b.helpers.title={defaults:{type:"float",position:"bottom"},beforeShow:function(a){var d= +b.current,e=d.title,c=a.type;f.isFunction(e)&&(e=e.call(d.element,d));if(q(e)&&""!==f.trim(e)){d=f('
    '+e+"
    ");switch(c){case "inside":c=b.skin;break;case "outside":c=b.wrap;break;case "over":c=b.inner;break;default:c=b.skin,d.appendTo("body"),I&&d.width(d.width()),d.wrapInner(''),b.current.margin[2]+=Math.abs(l(d.css("margin-bottom")))}d["top"===a.position?"prependTo":"appendTo"](c)}}};f.fn.fancybox=function(a){var d, +e=f(this),c=this.selector||"",k=function(g){var h=f(this).blur(),j=d,k,l;!g.ctrlKey&&(!g.altKey&&!g.shiftKey&&!g.metaKey)&&!h.is(".fancybox-wrap")&&(k=a.groupAttr||"data-fancybox-group",l=h.attr(k),l||(k="rel",l=h.get(0)[k]),l&&(""!==l&&"nofollow"!==l)&&(h=c.length?f(c):e,h=h.filter("["+k+'="'+l+'"]'),j=h.index(this)),a.index=j,!1!==b.open(h,a)&&g.preventDefault())};a=a||{};d=a.index||0;!c||!1===a.live?e.unbind("click.fb-start").bind("click.fb-start",k):p.undelegate(c,"click.fb-start").delegate(c+ +":not('.fancybox-item, .fancybox-nav')","click.fb-start",k);this.filter("[data-fancybox-start=1]").trigger("click");return this};p.ready(function(){var a,d;f.scrollbarWidth===v&&(f.scrollbarWidth=function(){var a=f('
    ').appendTo("body"),b=a.children(),b=b.innerWidth()-b.height(99).innerWidth();a.remove();return b});if(f.support.fixedPosition===v){a=f.support;d=f('
    ').appendTo("body");var e=20=== +d[0].offsetTop||15===d[0].offsetTop;d.remove();a.fixedPosition=e}f.extend(b.defaults,{scrollbarWidth:f.scrollbarWidth(),fixed:f.support.fixedPosition,parent:f("body")});a=f(r).width();J.addClass("fancybox-lock-test");d=f(r).width();J.removeClass("fancybox-lock-test");f("").appendTo("head")})})(window,document,yawdadmin.jQuery); \ No newline at end of file From c4526f6a2b5d24abe4e0e1d787b3b2f1c99a9886 Mon Sep 17 00:00:00 2001 From: mwolff44 Date: Thu, 26 May 2016 18:47:00 +0200 Subject: [PATCH 10/34] django 1.7 compatibility --- setup.py | 2 +- yawdadmin/__init__.py | 2 +- yawdadmin/admin.py | 4 ++-- yawdadmin/sites.py | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/setup.py b/setup.py index 13eb108..31e5286 100644 --- a/setup.py +++ b/setup.py @@ -4,7 +4,7 @@ setup( name='yawd-admin', url='http://yawd.eu/open-source-projects/yawd-admin/', - version = '0.7.1-rc1', + version = '0.7.1', description='An administration website for Django', long_description=open('README.rst', 'rt').read(), author='yawd', diff --git a/yawdadmin/__init__.py b/yawdadmin/__init__.py index c35946a..f89bed2 100644 --- a/yawdadmin/__init__.py +++ b/yawdadmin/__init__.py @@ -1,4 +1,4 @@ -__version__ = '0.7.1-rc1' +__version__ = '0.7.1' from django.conf import settings from django.core.exceptions import ImproperlyConfigured diff --git a/yawdadmin/admin.py b/yawdadmin/admin.py index 56cf429..6ff8862 100644 --- a/yawdadmin/admin.py +++ b/yawdadmin/admin.py @@ -103,7 +103,7 @@ def get_urls(self): """ urls = super(PopupModelAdmin, self).get_urls() - info = self.model._meta.app_label, self.model._meta.module_name + info = self.model._meta.app_label, self.model._meta.model_name my_urls = patterns('', url(r'^(.+)/ajax/delete/$', self.admin_site.admin_view(self.ajaxdelete_view), @@ -172,7 +172,7 @@ def get_urls(self): """ urls = super(SortableModelAdmin, self).get_urls() - info = self.model._meta.app_label, self.model._meta.module_name + info = self.model._meta.app_label, self.model._meta.model_name my_urls = patterns('', url(r'^sortables/$', self.admin_site.admin_view(self.sortables), diff --git a/yawdadmin/sites.py b/yawdadmin/sites.py index 15fb121..ddcdd4a 100644 --- a/yawdadmin/sites.py +++ b/yawdadmin/sites.py @@ -274,7 +274,7 @@ def top_menu(self, request): # Check whether user has any perm for this module. # If so, add the module to the model_list. if True in perms.values(): - info = (app_label, model._meta.module_name) + info = (app_label, model._meta.model_name) model_dict = { 'name': capfirst(model._meta.verbose_name_plural), 'show': perms['change'], From 7f9719d0262e7b7c588644eee7bdb9918cd8c1ff Mon Sep 17 00:00:00 2001 From: mwolff44 Date: Thu, 26 May 2016 18:52:05 +0200 Subject: [PATCH 11/34] prepare v0.7.2 with django 1.7 compatibility --- CHANGES.rst | 6 +++++- README.rst | 4 ++++ setup.py | 4 ++-- yawdadmin/__init__.py | 2 +- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/CHANGES.rst b/CHANGES.rst index dcbc750..20a61f9 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -3,6 +3,10 @@ Changelog +++++++++ +v.0.7.1, 2016.05.24 +=================== +Django 1.6 compatibility + v.0.7.0, 2013.10.23 =================== @@ -39,4 +43,4 @@ v.0.6.0, 2013.02.28 v.0.5.0, 2012.11.01 ==================== -* Initial Release \ No newline at end of file +* Initial Release diff --git a/README.rst b/README.rst index 26162d6..6854ba2 100644 --- a/README.rst +++ b/README.rst @@ -23,6 +23,10 @@ History master (dev) ++++++++++++ +is developped under django 1.7.x and does NOT work with older Django releases. + +v0.7.1 +++++++++++++ is developped under django 1.6.x and does NOT work with older Django releases. v0.7.0 diff --git a/setup.py b/setup.py index 31e5286..ba9bb8c 100644 --- a/setup.py +++ b/setup.py @@ -4,7 +4,7 @@ setup( name='yawd-admin', url='http://yawd.eu/open-source-projects/yawd-admin/', - version = '0.7.1', + version = '0.7.2-rc', description='An administration website for Django', long_description=open('README.rst', 'rt').read(), author='yawd', @@ -24,7 +24,7 @@ include_package_data = True, install_requires = [ "httplib2", - "django >=1.6, <1.7", + "django >=1.6, <1.8", "oauth2client" ], zip_safe=False diff --git a/yawdadmin/__init__.py b/yawdadmin/__init__.py index f89bed2..732e01f 100644 --- a/yawdadmin/__init__.py +++ b/yawdadmin/__init__.py @@ -1,4 +1,4 @@ -__version__ = '0.7.1' +__version__ = '0.7.2-rc' from django.conf import settings from django.core.exceptions import ImproperlyConfigured From 722a9b548f265669cdfef8638ef5b61598f1678a Mon Sep 17 00:00:00 2001 From: mwolff44 Date: Fri, 27 May 2016 12:08:27 +0200 Subject: [PATCH 12/34] update gitignore sublime text project file --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index d1a7c01..74e9a1c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ +/yawd-admin.sublime-workspace /.pydevproject /.project /dist From 6f0eda8b9f0376e7a43a87a27a0d0ed50fafa053 Mon Sep 17 00:00:00 2001 From: mwolff44 Date: Fri, 27 May 2016 12:12:52 +0200 Subject: [PATCH 13/34] RemovedInDjango18Warning: Options.module_name has been deprecated in favor of model_name [sites.py:120] --- yawdadmin/sites.py | 2 +- yawdadmin/templatetags/yawdadmin_tags.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/yawdadmin/sites.py b/yawdadmin/sites.py index ddcdd4a..9fa5bbc 100644 --- a/yawdadmin/sites.py +++ b/yawdadmin/sites.py @@ -117,7 +117,7 @@ def get_app_list(self, request, registry, label=''): # Check whether user has any perm for this module. # If so, add the module to the model_list. if True in perms.values(): - info = (app_label, model._meta.module_name) + info = (app_label, model._meta.model_name) model_dict = { 'classname': model.__name__, 'name': capfirst(model._meta.verbose_name_plural), diff --git a/yawdadmin/templatetags/yawdadmin_tags.py b/yawdadmin/templatetags/yawdadmin_tags.py index cf4cdc9..683cae5 100644 --- a/yawdadmin/templatetags/yawdadmin_tags.py +++ b/yawdadmin/templatetags/yawdadmin_tags.py @@ -124,7 +124,7 @@ def inline_items_for_result(inline, result): return ret -#TODO: Remove this in future version +# TODO: Remove this in future version @register.simple_tag def related_lookup_popup_var(): """ @@ -132,7 +132,7 @@ def related_lookup_popup_var(): work for Django 1.6 and older versions. It should be removed once support for Django 1.5 is dropped. """ - try: #Django 1.6+ + try: # Django 1.6+ from django.contrib.admin.options import IS_POPUP_VAR #@UnresolvedImport except: IS_POPUP_VAR = 'pop' From 4ca71c477af778ec72b7cec64b84c790ebd650be Mon Sep 17 00:00:00 2001 From: mwolff44 Date: Fri, 27 May 2016 16:57:49 +0200 Subject: [PATCH 14/34] 1.7 compatibility templates - django-revision django-mptpp --- yawdadmin/__init__.py | 6 +- yawdadmin/admin.py | 32 +++--- yawdadmin/admin_options.py | 102 +++++++++--------- yawdadmin/sites.py | 6 +- .../admin/django_mptt_admin/change_list.html | 34 ++++++ .../templates/reversion/recover_form.html | 15 ++- .../templates/reversion/recover_list.html | 4 +- .../templates/reversion/revision_form.html | 20 ++-- yawdadmin/templatetags/yawdadmin_filters.py | 6 +- yawdadmin/templatetags/yawdadmin_tags.py | 30 +++--- yawdadmin/views.py | 71 ++++++------ 11 files changed, 189 insertions(+), 137 deletions(-) create mode 100644 yawdadmin/templates/admin/django_mptt_admin/change_list.html diff --git a/yawdadmin/__init__.py b/yawdadmin/__init__.py index 732e01f..b68176c 100644 --- a/yawdadmin/__init__.py +++ b/yawdadmin/__init__.py @@ -1,10 +1,10 @@ -__version__ = '0.7.2-rc' - from django.conf import settings from django.core.exceptions import ImproperlyConfigured from django.utils.importlib import import_module from yawdadmin.sites import YawdAdminSite +__version__ = '0.7.2-rc' + def _get_site(): yawdadmin_site = getattr(settings, 'ADMIN_SITE', YawdAdminSite) @@ -19,5 +19,5 @@ def _get_site(): if not isinstance(admin_site, YawdAdminSite): - raise ImproperlyConfigured('The specified admin site is not a subclass of '\ + raise ImproperlyConfigured('The specified admin site is not a subclass of'\ 'yawdadmin.sites.YawdAdminSite') diff --git a/yawdadmin/admin.py b/yawdadmin/admin.py index 6ff8862..6e6e44a 100644 --- a/yawdadmin/admin.py +++ b/yawdadmin/admin.py @@ -1,8 +1,13 @@ -import json +from __future__ import unicode_literals + +from . import json from django.conf.urls import patterns, url from django.contrib import admin -from django.contrib.admin.options import InlineModelAdmin -from django.contrib.admin.util import unquote, get_deleted_objects +from django.contrib.admin.options import InlineModelAdmin +try: + from django.contrib.admin.utils import unquote, get_deleted_objects +except ImportError: # Django < 1.7 + from django.contrib.admin.util import unquote, get_deleted_objects from django.core.exceptions import PermissionDenied from django.db import router from django.http import Http404 @@ -15,8 +20,8 @@ from forms import PopupInlineFormSet -try: #django 1.6 and above - from django.contrib.admin.options import IS_POPUP_VAR #@UnresolvedImport +try: # django 1.6 and above + from django.contrib.admin.options import IS_POPUP_VAR # @UnresolvedImport except: IS_POPUP_VAR = '_popup' @@ -33,12 +38,13 @@ class PopupInline(InlineModelAdmin): class PopupModelAdmin(admin.ModelAdmin): linked_inline = None popup_only = False - + def add_view(self, request, form_url='', extra_context=None): if self.popup_only and not IS_POPUP_VAR in request.REQUEST: raise Http404 - - return super(PopupModelAdmin, self).add_view(request, form_url, extra_context) + + return super(PopupModelAdmin, self).add_view(request, + form_url, extra_context) def ajaxdelete_view(self, request, object_id): "The 'delete' admin view for this model." @@ -71,11 +77,11 @@ def ajaxdelete_view(self, request, object_id): self.delete_model(request, obj) return HttpResponse('OK') - + def change_view(self, request, object_id, form_url='', extra_context=None): if self.popup_only and not IS_POPUP_VAR in request.REQUEST: raise Http404 - + return super(PopupModelAdmin, self).change_view(request, object_id, form_url, extra_context) @@ -84,7 +90,7 @@ def formfield_for_dbfield(self, db_field, **kwargs): Override foreignkey widget if popup and field matches fk_name """ formfield = super(PopupModelAdmin, self).formfield_for_dbfield(db_field, - **kwargs) + **kwargs) request = kwargs.pop("request", None) fk_name = request.GET.get('fk_name') @@ -188,7 +194,7 @@ def get_urls(self): def _reorder(self, data, request): data = dict([(str(d['pk']), d) for d in data]) - + data_objects = self.model.objects.filter(pk__in=data.keys()) for item in data_objects: data[str(item.pk)]['object'] = item @@ -218,7 +224,7 @@ def sortables(self, request): else 'admin/sortables/list.html', {'mptt': self.sortable_mptt, 'objects': self.sortables_ordered(self.queryset(request))}) - + def reorder(self, request): if not request.POST.get('data', None): return HttpResponse(json.dumps({'message': _('No data sent with the request')})) diff --git a/yawdadmin/admin_options.py b/yawdadmin/admin_options.py index 34e5115..ed856aa 100644 --- a/yawdadmin/admin_options.py +++ b/yawdadmin/admin_options.py @@ -1,51 +1,56 @@ -import re, copy, json +from . import re +from . import copy +from . import json from django import forms from django.core.cache import cache from django.utils.encoding import force_text from .utils import get_options, get_option_cache_key from .models import AppOption -#decouple yawd-admin and yawd-translations applications +# decouple yawd-admin and yawd-translations applications try: - from translations.utils import get_supported_languages #@UnresolvedImport + from translations.utils import get_supported_languages # @UnresolvedImport except: - #mimic the yawd-translations get_supported languages() behavior - #for the languages defined in settings.LANGUAGES + # mimic the yawd-translations get_supported languages() behavior + # for the languages defined in settings.LANGUAGES from django.conf import settings + def get_supported_languages(): return [x[0] for x in settings.LANGUAGES] - + _optionsetadmin_classes = {} + class SiteOption(object): order_counter = 0 - + def __init__(self, field=None, lang_dependant=False): - + if not isinstance(field, forms.Field): raise Exception('The field must be a valid field instance') - + self.field = field self.lang_dependant = lang_dependant - #remember the order in which fields were initialized + # remember the order in which fields were initialized self.order_counter = SiteOption.order_counter SiteOption.order_counter += 1 + class OptionSetBase(type): """ metaclass for all OptionSets - """ + """ def __new__(self, name, bases, attrs): super_new = super(OptionSetBase, self).__new__ parents = [b for b in bases if isinstance(b, OptionSetBase)] if not parents: # If this isn't a subclass of Model, don't do anything special. return super_new(self, name, bases, attrs) - + # Create the class. # Add the options and form fields module = attrs.pop('__module__') - + try: optionset_label = attrs.pop('optionset_label') except KeyError: @@ -57,58 +62,59 @@ def __new__(self, name, bases, attrs): if not optionset_label or not re.match(r'[a-zA-z-]+', optionset_label): raise TypeError("optionset_label must be set and contain only letters and underscores") - + # Because of the way imports happen (recursively), it may or may not be - # the first time this model tries to register with the framework. + # the first time this model tries to register with the framework. # There should only be one class for each OptionSetAdmin. global _optionsetadmin_classes if '%s.%s' % (optionset_label, name) in _optionsetadmin_classes: return _optionsetadmin_classes['%s.%s' % (optionset_label, name)] - try: + try: verbose_name = attrs.pop('verbose_name') except KeyError: - verbose_name = optionset_label.title().replace ('-', ' ') + verbose_name = optionset_label.title().replace('-', ' ') - #gather parent attributes + # gather parent attributes field_attrs = [] options = {} lang_options = {} for parent in parents: if hasattr(parent, 'option_fields'): - field_attrs += parent.option_fields + field_attrs += parent.option_fields if hasattr(parent, 'options'): options.update(parent.options) if hasattr(parent, 'lang_options'): lang_options.update(parent.lang_options) new_class = super_new(self, name, bases, { - '__module__': module, - 'options' : options, - 'lang_options' : lang_options, + '__module__': module, + 'options': options, + 'lang_options': lang_options, 'option_fields': field_attrs, - 'optionset_label' : optionset_label, - 'verbose_name' : verbose_name, + 'optionset_label': optionset_label, + 'verbose_name': verbose_name, }) - + for attr, value in attrs.items(): if not isinstance(value, SiteOption): raise TypeError('Invalid attribute %s - should be a SiteOption instance' % attr) - + if not hasattr(value.field, 'label') or not value.field.label: value.field.label = attr.title().replace('_', ' ') new_class.option_fields.append((attr, value)) - new_class.options[attr] = value.field - + new_class.options[attr] = value.field + new_class.option_fields.sort(lambda (attr1, value1), (attr2, value2): cmp(value1.order_counter, value2.order_counter)) - + _optionsetadmin_classes['%s.%s' % (optionset_label, name)] = new_class return new_class + def _init_option(optionset_label, name, siteoption): db_option, created = AppOption.objects.get_or_create(name = name, optionset_label = optionset_label) - + if siteoption.lang_dependant: ret = {} for l in get_supported_languages(): @@ -133,8 +139,8 @@ class OptionSetAdmin(object): def __init__(self, **kwargs): self.form = forms.Form(**kwargs) - #load option values from the database - self.value_dict = get_options(optionset_label = self.optionset_label, current_only=False) + # load option values from the database + self.value_dict = get_options(optionset_label=self.optionset_label, current_only=False) self.formfields = [] self.langformfields = {} @@ -145,21 +151,21 @@ def __init__(self, **kwargs): if value.lang_dependant: for lang in get_supported_languages(): - #generate the form field + # generate the form field field_name = '%s_%s' % (attr, lang) lang_field = copy.deepcopy(value.field) lang_field.label = '%s (%s)' % (force_text(lang_field.label), lang.upper()) - + self.form.fields[field_name] = lang_field try: self.form.fields[field_name].initial = self.value_dict[attr][lang] except KeyError: self.form.fields[field_name].initial = '' - - #add to land dependant options + + # add to land dependant options self.lang_options[field_name] = (attr, lang) - - #langformfields fieldset + + # langformfields fieldset if not lang in self.langformfields: self.langformfields[lang] = [] self.langformfields[lang].append(self.form[field_name]) @@ -167,34 +173,34 @@ def __init__(self, **kwargs): self.form.fields[attr] = value.field self.form.fields[attr].initial = self.value_dict[attr] self.formfields.append(self.form[attr]) - + def save(self): - #clear cache + # clear cache cache.delete(get_option_cache_key(self.optionset_label)) - #this dictionary is used to collect lang-dependant field values + # this dictionary is used to collect lang-dependant field values lang_dependant_value_dict = {} for field, value in self.form.cleaned_data.iteritems(): - #prepare value for save + # prepare value for save prep_value = self.form.fields[field].prepare_value(value) - + if field in self.lang_options: original_field = self.lang_options[field][0] lang = self.lang_options[field][1] - + if not original_field in lang_dependant_value_dict: lang_dependant_value_dict[original_field] = {} - + lang_dependant_value_dict[original_field].update({ - lang : prep_value + lang: prep_value }) else: if self.value_dict[field] != prep_value: AppOption.objects.filter(optionset_label=self.optionset_label, name=field).update(value = prep_value) - - #save lang-dependant options + + # save lang-dependant options for key, value in lang_dependant_value_dict.iteritems(): if self.value_dict[key] != value: AppOption.objects.filter(optionset_label=self.optionset_label, diff --git a/yawdadmin/sites.py b/yawdadmin/sites.py index 9fa5bbc..9ba53a7 100644 --- a/yawdadmin/sites.py +++ b/yawdadmin/sites.py @@ -1,4 +1,4 @@ -import httplib2 +from . import httplib2 from functools import update_wrapper from oauth2client.file import Storage from django import VERSION as DJANGO_VERSION @@ -91,7 +91,7 @@ def _find_model(self, label, app_label): for extra in self.app_dict[app_label]['extras']: if 'label' in extra and extra['label'] == label: return extra - + @classmethod def app_sorter(self, x): return x['name'] @@ -190,7 +190,7 @@ def get_index_template(self): def get_urls(self): global _optionset_labels - + def wrap(view, cacheable=False): def wrapper(*args, **kwargs): return self.admin_view(view, cacheable)(*args, **kwargs) diff --git a/yawdadmin/templates/admin/django_mptt_admin/change_list.html b/yawdadmin/templates/admin/django_mptt_admin/change_list.html new file mode 100644 index 0000000..ed0286b --- /dev/null +++ b/yawdadmin/templates/admin/django_mptt_admin/change_list.html @@ -0,0 +1,34 @@ +{% extends 'admin/change_list.html' %} +{% load i18n %} + +{% block extrastyle %} + {{ block.super }} + +{% endblock %} + +{% block search %}{% endblock %} + +{% block result_list %} +
    +{% endblock %} + +{% block pagination %}{% endblock %} + +{% block object-tools-items %} + {{ block.super }} +
  • + {% trans "Grid view" %} +
    • +{% endblock %} \ No newline at end of file diff --git a/yawdadmin/templates/reversion/recover_form.html b/yawdadmin/templates/reversion/recover_form.html index 4b779ef..1774939 100644 --- a/yawdadmin/templates/reversion/recover_form.html +++ b/yawdadmin/templates/reversion/recover_form.html @@ -1,18 +1,23 @@ {% extends "reversion/revision_form.html" %} {% load url from future %} -{% load i18n %} +{% load i18n admin_urls %} {% block breadcrumbs %} {% endblock %} + +{% endblock %} +{% block object-tools %}{% endblock %} {% block form_top %} -

    {% blocktrans %}Press the save button below to recover this version of the object.{% endblocktrans %}

    +
    {% blocktrans %}Press the save button below to recover this version of the object.{% endblocktrans %}
    {% endblock %} + +{% block submit_buttons_top %}{% with is_popup=1 %}{{block.super}}{% endwith %}{% endblock %} +{% block submit_buttons_bottom %}{% with is_popup=1 %}{{block.super}}{% endwith %}{% endblock %} \ No newline at end of file diff --git a/yawdadmin/templates/reversion/recover_list.html b/yawdadmin/templates/reversion/recover_list.html index 100e71a..2688773 100644 --- a/yawdadmin/templates/reversion/recover_list.html +++ b/yawdadmin/templates/reversion/recover_list.html @@ -1,6 +1,6 @@ {% extends "admin/base_site.html" %} {% load url from future %} -{% load i18n %} +{% load i18n admin_url %} {% block breadcrumbs %} @@ -8,7 +8,7 @@
  • /
  • {% trans 'Home' %} /
    • {% if not ADMIN_DISABLE_APP_INDEX %}
  • {{app_label|capfirst|escape}} /
    • {% endif %} -
  • {{opts.verbose_name_plural|capfirst}} /
    • +
  • {{opts.verbose_name_plural|capfirst}} /
  • {% blocktrans with opts.verbose_name_plural|escape as name %}Recover deleted {{name}}{% endblocktrans %}
    • {% endblock %} diff --git a/yawdadmin/templates/reversion/revision_form.html b/yawdadmin/templates/reversion/revision_form.html index edbe1b2..19b1e43 100644 --- a/yawdadmin/templates/reversion/revision_form.html +++ b/yawdadmin/templates/reversion/revision_form.html @@ -1,15 +1,15 @@ {% extends "admin/change_form.html" %} {% load url from future %} -{% load i18n %} +{% load i18n admin_urls %} {% block breadcrumbs %} {% endblock %} @@ -24,14 +24,14 @@ {% endif %} {% endblock %} -{% block content %} - {% with 1 as is_popup %} - {{block.super}} - {% endwith %} -{% endblock %} +{% block object-tools %}{% endblock %} {% block form_top %} -

    {% blocktrans %}Press the save button below to revert to this version of the object.{% endblocktrans %}

    +
    {% blocktrans %}Press the save button below to revert to this version of the object.{% endblocktrans %} +
    {% endblock %} +{% block submit_buttons_top %}{% with is_popup=1 %}{{block.super}}{% endwith %}{% endblock %} + {% block submit_buttons_bottom %}{% with is_popup=1 %}{{block.super}}{% endwith %}{% endblock %} + diff --git a/yawdadmin/templatetags/yawdadmin_filters.py b/yawdadmin/templatetags/yawdadmin_filters.py index 104a78e..0cd18cf 100644 --- a/yawdadmin/templatetags/yawdadmin_filters.py +++ b/yawdadmin/templatetags/yawdadmin_filters.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -import itertools +from . import itertools from django import template from ..admin import PopupInline from ..forms import PopupInlineFormSet @@ -28,7 +28,7 @@ def utfupper(value): @register.filter def filter_show(app_list): - return list(itertools.ifilter(lambda x: x['show'], app_list)) + return list(itertools.ifilter(lambda x: x['show'], app_list)) @register.filter @@ -45,7 +45,7 @@ def istranslationinline(value): This filter is used if yawd-translations is installed. """ try: - from translations.admin import TranslationInline #@UnresolvedImport + from translations.admin import TranslationInline # @UnresolvedImport except: return False diff --git a/yawdadmin/templatetags/yawdadmin_tags.py b/yawdadmin/templatetags/yawdadmin_tags.py index 683cae5..e39b36d 100644 --- a/yawdadmin/templatetags/yawdadmin_tags.py +++ b/yawdadmin/templatetags/yawdadmin_tags.py @@ -22,16 +22,16 @@ @register.inclusion_tag('admin/includes/topmenu.html', takes_context=True) def admin_top_menu(context): return { - 'perms' : context['perms'], - 'top_menu' : admin_site.top_menu(context['request']), - 'homeurl' : urlresolvers.reverse('admin:index'), - 'user' : context['user'], - 'langs' : context['langs'] if 'langs' in context else [], + 'perms': context['perms'], + 'top_menu': admin_site.top_menu(context['request']), + 'homeurl': urlresolvers.reverse('admin:index'), + 'user': context['user'], + 'langs': context['langs'] if 'langs' in context else [], 'default_lang': context['default_lang'] if 'default_lang' in context else None, - 'clean_url' : context['clean_url'] if 'clean_url' in context else '', - 'LANGUAGE_CODE' : get_language(), - 'optionset_labels' : admin_site.get_option_admin_urls(), - 'analytics' : context['user'].is_superuser and ls.ADMIN_GOOGLE_ANALYTICS_FLOW, + 'clean_url': context['clean_url'] if 'clean_url' in context else '', + 'LANGUAGE_CODE': get_language(), + 'optionset_labels': admin_site.get_option_admin_urls(), + 'analytics': context['user'].is_superuser and ls.ADMIN_GOOGLE_ANALYTICS_FLOW, 'request': context['request'] } @@ -45,7 +45,7 @@ def clean_media(media): @register.simple_tag -def yawdadmin_paginator_number(cl,i): +def yawdadmin_paginator_number(cl, i): """ Generates an individual page index link in a paginated list. """ @@ -92,7 +92,7 @@ def inline_items_for_result(inline, result): list_display = inline.list_display if inline.list_display else ('__unicode__',) ret = '' for field_name in list_display: - row_class = mark_safe(' class="column"') + row_class = mark_safe(' class="column"') try: f, attr, value = lookup_field(field_name, result, inline) except ObjectDoesNotExist: @@ -130,10 +130,10 @@ def related_lookup_popup_var(): """ This templatetag is here to ensure fancybox related lookups work for Django 1.6 and older versions. It should be removed - once support for Django 1.5 is dropped. + once support for Django 1.5 is dropped. """ - try: # Django 1.6+ - from django.contrib.admin.options import IS_POPUP_VAR #@UnresolvedImport + try: # Django 1.6+ + from django.contrib.admin.options import IS_POPUP_VAR # @UnresolvedImport except: IS_POPUP_VAR = 'pop' return '' % IS_POPUP_VAR @@ -151,5 +151,5 @@ def explicit_submit_row(context, **kwargs): explicit_context[option] = kwargs[option] original_context = submit_row(context) - original_context.update(explicit_context) + original_context.update(explicit_context) return original_context diff --git a/yawdadmin/views.py b/yawdadmin/views.py index af7d364..88f4617 100644 --- a/yawdadmin/views.py +++ b/yawdadmin/views.py @@ -1,4 +1,4 @@ -import json +from . import json try: from oauth2client import xsrfutil except ImportError: @@ -16,22 +16,22 @@ class AppOptionView(TemplateView): template_name = 'admin/options.html' - + def dispatch(self, request, *args, **kwargs): if not request.user.has_perm('yawdadmin.change_appoption'): raise PermissionDenied return super(AppOptionView, self).dispatch(request, *args, **kwargs) - + def get_form_kwargs(self): """ - Returns the keyword arguments for instantiating the + Returns the keyword arguments for instantiating the form. Copied form the generic FormView class-based view """ kwargs = {} if self.request.method in ('POST', 'PUT'): kwargs.update({ - 'data':self.request.POST, - 'files':self.request.FILES, + 'data':self.request.POST, + 'files':self.request.FILES, }) return kwargs @@ -41,7 +41,7 @@ def get_context_data(self, **kwargs): context['optionset_admin'] = admin_site.get_optionset_admin(self.kwargs['optionset_label'])(**self.get_form_kwargs()) context['title'] = '%s' % (unicode(context['optionset_admin'].verbose_name)) return context - + def post(self, request, *args, **kwargs): """ Validate the form and save the options upon success @@ -51,7 +51,7 @@ def post(self, request, *args, **kwargs): context['optionset_admin'].save() messages.add_message(self.request, messages.SUCCESS, _('The options were succesfully saved.')) return self.render_to_response(context) - + def put(self, request, *args, **kwargs): return self.post(request, *args, **kwargs) @@ -60,52 +60,52 @@ class AnalyticsAuthView(View): """ This view implements the oauth2 authentication callback. It stores the user credential to a file and redirects the user - to the admin index page on success. + to the admin index page on success. """ permanent = False - + def get(self, request, *args, **kwargs): - #check view + # check view valid_analytics_view(request) - + if not ('state' in request.REQUEST and xsrfutil.validate_token(settings.SECRET_KEY, request.REQUEST['state'], request.user)): return HttpResponseBadRequest() - - credential = ls.ADMIN_GOOGLE_ANALYTICS_FLOW.step2_exchange(request.REQUEST) #@UndefinedVariable + + credential = ls.ADMIN_GOOGLE_ANALYTICS_FLOW.step2_exchange(request.REQUEST) # @UndefinedVariable storage = Storage(ls.ADMIN_GOOGLE_ANALYTICS['token_file_name']) storage.put(credential) - + messages.add_message(self.request, messages.SUCCESS, _('The user was successfully connected.')) return HttpResponseRedirect(reverse('admin:analytics')) class AnalyticsConfigView(TemplateView): """ - Admin view for the google analytics functionality. The view is + Admin view for the google analytics functionality. The view is accessible through the top bar navigation. """ template_name = 'admin/analytics.html' - + def get_context_data(self, **kwargs): - - #check view + + # check view valid_analytics_view(self.request) - #get original context data + # get original context data context = super(AnalyticsConfigView, self).get_context_data(**kwargs) - #load the token file + # load the token file try: dat_file = open(ls.ADMIN_GOOGLE_ANALYTICS['token_file_name'], 'r') analytics = json.loads(dat_file.read()) dat_file.close() except (IOError, ValueError): analytics = {} - + context['analytics_info'] = { 'profile' : ls.ADMIN_GOOGLE_ANALYTICS['profile_id'], 'interval' : ls.ADMIN_GOOGLE_ANALYTICS['interval'], 'data' : analytics } - + return context @@ -114,30 +114,31 @@ class AnalyticsConnectView(View): Connect a new user to the Google Analytics API """ def get(self, request, *args, **kwargs): - - #check view + + # check view valid_analytics_view(request) - try: - #Empty the token file + try: + # Empty the token file dat_file = open(ls.ADMIN_GOOGLE_ANALYTICS['token_file_name'], 'w+') dat_file.write('') dat_file.close() except: - messages.add_message(self.request, messages.ERROR, _('The server does not have permissions to write to the token file. Please contact your system administrator.')) + messages.add_message(self.request, + messages.ERROR, _('The server does not have permissions to write to the token file. Please contact your system administrator.')) return HttpResponseRedirect(reverse('admin:analytics')) - #Initialize flow + # Initialize flow ls.ADMIN_GOOGLE_ANALYTICS_FLOW.params['state'] = xsrfutil.generate_token(settings.SECRET_KEY, request.user) #@UndefinedVariable return HttpResponseRedirect(ls.ADMIN_GOOGLE_ANALYTICS_FLOW.step1_get_authorize_url()) #@UndefinedVariable def valid_analytics_view(request): """ - Check if the user is superuser and analytics functionality is enabled. + Check if the user is superuser and analytics functionality is enabled. """ if not request.user.is_superuser: raise PermissionDenied - + if not ls.ADMIN_GOOGLE_ANALYTICS_FLOW: raise Http404 @@ -145,19 +146,19 @@ def valid_analytics_view(request): class MyAccountView(UpdateView): template_name = 'registration/my_account.html' form_class = ls.ADMIN_USER_MODELFORM - + def __init__(self, *args, **kwargs): super(MyAccountView, self).__init__(*args, **kwargs) self.success_url = reverse('admin:my-account') - + def form_valid(self, form): messages.add_message(self.request, messages.SUCCESS, _('Your account has been updated successfuly.')) return super(MyAccountView, self).form_valid(form) - + def get_object(self): return self.request.user - + def get_context_data(self, **kwargs): context = super(MyAccountView, self).get_context_data(**kwargs) context['title'] = _('My account') From 9d21f8a566975bcb44e60ee59f63da5d47d8f070 Mon Sep 17 00:00:00 2001 From: mwolff44 Date: Fri, 27 May 2016 17:01:38 +0200 Subject: [PATCH 15/34] add # -*- coding: utf-8 -*- --- yawdadmin/admin.py | 3 ++- yawdadmin/admin_forms.py | 1 + yawdadmin/admin_options.py | 7 ++++--- yawdadmin/fields.py | 1 + yawdadmin/forms.py | 1 + yawdadmin/middleware.py | 1 + yawdadmin/models.py | 1 + yawdadmin/sites.py | 3 ++- yawdadmin/templatetags/yawdadmin_filters.py | 2 +- yawdadmin/utils.py | 1 + yawdadmin/views.py | 3 ++- yawdadmin/widgets.py | 1 + 12 files changed, 18 insertions(+), 7 deletions(-) diff --git a/yawdadmin/admin.py b/yawdadmin/admin.py index 6e6e44a..a361ab7 100644 --- a/yawdadmin/admin.py +++ b/yawdadmin/admin.py @@ -1,6 +1,7 @@ +# -*- coding: utf-8 -*- from __future__ import unicode_literals -from . import json +import json from django.conf.urls import patterns, url from django.contrib import admin from django.contrib.admin.options import InlineModelAdmin diff --git a/yawdadmin/admin_forms.py b/yawdadmin/admin_forms.py index 86092ca..937040d 100644 --- a/yawdadmin/admin_forms.py +++ b/yawdadmin/admin_forms.py @@ -1,3 +1,4 @@ +# -*- coding: utf-8 -*- from django import forms from django.contrib.auth.models import User diff --git a/yawdadmin/admin_options.py b/yawdadmin/admin_options.py index ed856aa..395e2f2 100644 --- a/yawdadmin/admin_options.py +++ b/yawdadmin/admin_options.py @@ -1,6 +1,7 @@ -from . import re -from . import copy -from . import json +# -*- coding: utf-8 -*- +import re +import copy +import json from django import forms from django.core.cache import cache from django.utils.encoding import force_text diff --git a/yawdadmin/fields.py b/yawdadmin/fields.py index b44d100..0327341 100644 --- a/yawdadmin/fields.py +++ b/yawdadmin/fields.py @@ -1,3 +1,4 @@ +# -*- coding: utf-8 -*- import re from django.db import models from django.core.exceptions import ValidationError diff --git a/yawdadmin/forms.py b/yawdadmin/forms.py index 30becaf..6032ad2 100644 --- a/yawdadmin/forms.py +++ b/yawdadmin/forms.py @@ -1,3 +1,4 @@ +# -*- coding: utf-8 -*- from django.core.exceptions import ValidationError from django.core.urlresolvers import reverse from django.forms.formsets import TOTAL_FORM_COUNT diff --git a/yawdadmin/middleware.py b/yawdadmin/middleware.py index 66d492e..16190ed 100644 --- a/yawdadmin/middleware.py +++ b/yawdadmin/middleware.py @@ -1,3 +1,4 @@ +# -*- coding: utf-8 -*- class PopupMiddleware(object): """ This middleware must always be enabled when using yawd-admin WITH diff --git a/yawdadmin/models.py b/yawdadmin/models.py index e3ced6b..d4694e8 100644 --- a/yawdadmin/models.py +++ b/yawdadmin/models.py @@ -1,3 +1,4 @@ +# -*- coding: utf-8 -*- from django.db import models from .fields import OptionNameField diff --git a/yawdadmin/sites.py b/yawdadmin/sites.py index 9ba53a7..af6ad5c 100644 --- a/yawdadmin/sites.py +++ b/yawdadmin/sites.py @@ -1,4 +1,5 @@ -from . import httplib2 +# -*- coding: utf-8 -*- +import httplib2 from functools import update_wrapper from oauth2client.file import Storage from django import VERSION as DJANGO_VERSION diff --git a/yawdadmin/templatetags/yawdadmin_filters.py b/yawdadmin/templatetags/yawdadmin_filters.py index 0cd18cf..586482d 100644 --- a/yawdadmin/templatetags/yawdadmin_filters.py +++ b/yawdadmin/templatetags/yawdadmin_filters.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -from . import itertools +import itertools from django import template from ..admin import PopupInline from ..forms import PopupInlineFormSet diff --git a/yawdadmin/utils.py b/yawdadmin/utils.py index 240b3b2..a8a02aa 100644 --- a/yawdadmin/utils.py +++ b/yawdadmin/utils.py @@ -1,3 +1,4 @@ +# -*- coding: utf-8 -*- import datetime import json import time diff --git a/yawdadmin/views.py b/yawdadmin/views.py index 88f4617..3fad70b 100644 --- a/yawdadmin/views.py +++ b/yawdadmin/views.py @@ -1,4 +1,5 @@ -from . import json +# -*- coding: utf-8 -*- +import json try: from oauth2client import xsrfutil except ImportError: diff --git a/yawdadmin/widgets.py b/yawdadmin/widgets.py index 302a518..88dd353 100644 --- a/yawdadmin/widgets.py +++ b/yawdadmin/widgets.py @@ -1,3 +1,4 @@ +# -*- coding: utf-8 -*- import re from itertools import chain from django import forms From 8c1c8acee79608bffda21fbc332166ada10a4e18 Mon Sep 17 00:00:00 2001 From: mwolff44 Date: Fri, 27 May 2016 17:26:31 +0200 Subject: [PATCH 16/34] 1.7 updates --- .../templates/admin/auth/user/add_form.html | 17 +++++++++++++---- .../admin/auth/user/change_password.html | 12 ++++++++---- yawdadmin/templates/reversion/change_list.html | 4 ++-- .../templates/reversion/object_history.html | 4 ++-- yawdadmin/templates/reversion/recover_list.html | 7 ++++--- .../templates/reversion/revision_form.html | 6 +++--- 6 files changed, 32 insertions(+), 18 deletions(-) diff --git a/yawdadmin/templates/admin/auth/user/add_form.html b/yawdadmin/templates/admin/auth/user/add_form.html index f18ba2f..afdcfc1 100644 --- a/yawdadmin/templates/admin/auth/user/add_form.html +++ b/yawdadmin/templates/admin/auth/user/add_form.html @@ -1,5 +1,14 @@ -{% extends "admin/change_form.html" %}{% load i18n %} +{% extends "admin/change_form.html" %} +{% load i18n %} -{% block form_top %}{% if not is_popup %} -

    {% trans "First, enter a username and password. Then, you'll be able to edit more user options." %}

    {% else %} -

    {% trans "Enter a username and password." %}

    {% endif %}{% endblock %} \ No newline at end of file +{% block form_top %} + {% if not is_popup %} +

    {% trans "First, enter a username and password. Then, you'll be able to edit more user options." %}

    + {% else %} +

    {% trans "Enter a username and password." %}

    + {% endif %} +{% endblock %} + +{% block after_field_sets %} + +{% endblock %} \ No newline at end of file diff --git a/yawdadmin/templates/admin/auth/user/change_password.html b/yawdadmin/templates/admin/auth/user/change_password.html index 4ec554b..5b7947b 100644 --- a/yawdadmin/templates/admin/auth/user/change_password.html +++ b/yawdadmin/templates/admin/auth/user/change_password.html @@ -1,8 +1,12 @@ -{% extends "admin/base_site.html" %}{% load i18n admin_static admin_urls %} +{% extends "admin/base_site.html" %} +{% load i18n admin_static admin_urls %} + +{% block extrahead %}{{ block.super }} + {% url 'admin:jsi18n' as jsi18nurl %} + {% url 'admin:jsi18n' as jsi18nurl %} + +{% endblock %} -{% block extrahead %}{{ block.super }}{% url 'admin:jsi18n' as jsi18nurl %} - - {% endblock %} {% block bodyclass %}{{ opts.app_label }}-{{ opts.object_name.lower }} change-form{% endblock %} {% block breadcrumbs %}{% if not is_popup %} diff --git a/yawdadmin/templates/reversion/change_list.html b/yawdadmin/templates/reversion/change_list.html index 1303c66..d2d7e0d 100644 --- a/yawdadmin/templates/reversion/change_list.html +++ b/yawdadmin/templates/reversion/change_list.html @@ -1,5 +1,5 @@ {% extends "admin/change_list.html" %} -{% load i18n %} +{% load i18n admin_urls %} {% block object-tools-items %} @@ -11,7 +11,7 @@
    {% if not is_popup %}
    - + {% blocktrans with cl.opts.verbose_name_plural|escape as name %}Recover deleted {{name}}{% endblocktrans %}
    diff --git a/yawdadmin/templates/reversion/object_history.html b/yawdadmin/templates/reversion/object_history.html index 717023d..b82fc05 100644 --- a/yawdadmin/templates/reversion/object_history.html +++ b/yawdadmin/templates/reversion/object_history.html @@ -3,7 +3,7 @@ {% block content %}
    -

    {% blocktrans %}Choose a date from the list below to revert to a previous version of this object.{% endblocktrans %}

    +
    {% blocktrans %}Choose a date from the list below to revert to a previous version of this object.{% endblocktrans %}
    {% if action_list %} @@ -27,7 +27,7 @@ {% endfor %}
    {% else %} -
    {% trans "This object doesn't have a change history. It probably wasn't added via this admin site." %}
    {% endif %} +
    {% trans "This object doesn't have a change history. It probably wasn't added via this admin site." %}
    {% endif %}
    {% endblock %} diff --git a/yawdadmin/templates/reversion/recover_list.html b/yawdadmin/templates/reversion/recover_list.html index 2688773..23a1f61 100644 --- a/yawdadmin/templates/reversion/recover_list.html +++ b/yawdadmin/templates/reversion/recover_list.html @@ -1,6 +1,6 @@ {% extends "admin/base_site.html" %} {% load url from future %} -{% load i18n admin_url %} +{% load i18n admin_urls %} {% block breadcrumbs %} @@ -15,7 +15,8 @@ {% block content %}
    -

    {% blocktrans %}Choose a date from the list below to recover a deleted version of an object.{% endblocktrans %}

    +
    {% blocktrans %}Choose a date from the list below to recover a deleted version of an object.{% endblocktrans %}
    +
    {% if deleted %} @@ -35,7 +36,7 @@
    {% else %} -

    {% trans "There are no deleted objects to recover." %}

    +
    {% trans "There are no deleted objects to recover." %}
    {% endif %}
    diff --git a/yawdadmin/templates/reversion/revision_form.html b/yawdadmin/templates/reversion/revision_form.html index 19b1e43..1c5d221 100644 --- a/yawdadmin/templates/reversion/revision_form.html +++ b/yawdadmin/templates/reversion/revision_form.html @@ -28,10 +28,10 @@ {% block form_top %} -
    {% blocktrans %}Press the save button below to revert to this version of the object.{% endblocktrans %} -
    +
    {% blocktrans %}Press the save button below to revert to this version of the object.{% endblocktrans %}
    + {% endblock %} {% block submit_buttons_top %}{% with is_popup=1 %}{{block.super}}{% endwith %}{% endblock %} - {% block submit_buttons_bottom %}{% with is_popup=1 %}{{block.super}}{% endwith %}{% endblock %} +{% block submit_buttons_bottom %}{% with is_popup=1 %}{{block.super}}{% endwith %}{% endblock %} From ad6c91ca9e8e88490b5d07191d328383d086e8ad Mon Sep 17 00:00:00 2001 From: mwolff44 Date: Fri, 27 May 2016 17:31:38 +0200 Subject: [PATCH 17/34] template change --- yawdadmin/templates/admin/change_form.html | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/yawdadmin/templates/admin/change_form.html b/yawdadmin/templates/admin/change_form.html index 7dac8c3..6718378 100644 --- a/yawdadmin/templates/admin/change_form.html +++ b/yawdadmin/templates/admin/change_form.html @@ -1,4 +1,5 @@ -{% extends "admin/base_site.html" %}{% load i18n admin_modify admin_static yawdadmin_tags yawdadmin_filters admin_urls %} +{% extends "admin/base_site.html" %} +{% load i18n admin_modify admin_static yawdadmin_tags yawdadmin_filters admin_urls %} {% block bodyspy %}{% if adminform.model_admin.affix and not is_popup %} data-spy="scroll" data-target=".affix-sidebar"{% endif %}{% endblock %} @@ -31,7 +32,7 @@

    {% if adminform.model_admin.title_icon %}{% block object-tools-items %}
    - + {% trans "History" %}
    {% if has_absolute_url %} From a69006a67544cb8d86ecb3767fcb6ebb61b1cf64 Mon Sep 17 00:00:00 2001 From: mwolff44 Date: Fri, 27 May 2016 18:00:03 +0200 Subject: [PATCH 18/34] history url for revison --- yawdadmin/templates/admin/change_form.html | 28 ++++++++++++++-------- yawdadmin/templates/admin/change_list.html | 3 ++- 2 files changed, 20 insertions(+), 11 deletions(-) diff --git a/yawdadmin/templates/admin/change_form.html b/yawdadmin/templates/admin/change_form.html index 6718378..e8a4944 100644 --- a/yawdadmin/templates/admin/change_form.html +++ b/yawdadmin/templates/admin/change_form.html @@ -29,19 +29,27 @@

    {% if adminform.model_admin.title_icon %}{% if add %}{% trans "Add" %}{% else %}{{ original|truncatewords:"18" }}{% endif %} {% endif %}{% endblock %} -{% block object-tools %}{% if change and not is_popup %} -
    {% block object-tools-items %} +{% block object-tools %} + {% if change and not is_popup %} +
    + {% block object-tools-items %}
    - + {% url opts|admin_urlname:'history' original.pk|admin_urlquote as history_url %} + {% trans "History" %} -
    {% if has_absolute_url %} -
    - - {% trans "View on site" %} - -
    {% endif %}{% endblock %} -
    {% endif %}{% endblock %} +
    + {% if has_absolute_url %} +
    + + {% trans "View on site" %} + +
    + {% endif %} + {% endblock %} +

    + {% endif %} +{% endblock %} {% block content %}
    {% if adminform.model_admin.affix and not is_popup %} diff --git a/yawdadmin/templates/admin/change_list.html b/yawdadmin/templates/admin/change_list.html index 59729c9..4974aa0 100644 --- a/yawdadmin/templates/admin/change_list.html +++ b/yawdadmin/templates/admin/change_list.html @@ -1,4 +1,5 @@ -{% extends "admin/base_site.html" %}{% load admin_list i18n admin_static yawdadmin_tags yawdadmin_filters admin_urls %} +{% extends "admin/base_site.html" %} +{% load admin_list i18n admin_static yawdadmin_tags yawdadmin_filters admin_urls %} {% block extrastyle %}{{ block.super }}{% if cl.has_filters %} {% endif %}{% if not actions_on_top and not actions_on_bottom %} From faa1c9d58cdfda715cbfbcd96f3f3f0b0f37f020 Mon Sep 17 00:00:00 2001 From: mwolff44 Date: Fri, 27 May 2016 18:56:34 +0200 Subject: [PATCH 19/34] ... --- yawdadmin/migrations/__init__.py | 0 yawdadmin/templates/admin/change_form.html | 3 +-- 2 files changed, 1 insertion(+), 2 deletions(-) create mode 100644 yawdadmin/migrations/__init__.py diff --git a/yawdadmin/migrations/__init__.py b/yawdadmin/migrations/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/yawdadmin/templates/admin/change_form.html b/yawdadmin/templates/admin/change_form.html index e8a4944..e400148 100644 --- a/yawdadmin/templates/admin/change_form.html +++ b/yawdadmin/templates/admin/change_form.html @@ -34,8 +34,7 @@

    {% if adminform.model_admin.title_icon %} {% block object-tools-items %}
    - {% url opts|admin_urlname:'history' original.pk|admin_urlquote as history_url %} - + {% trans "History" %}
    From 723a757db156fa31be7ac9f48c32d378049e4c6e Mon Sep 17 00:00:00 2001 From: mwolff44 Date: Fri, 27 May 2016 19:04:09 +0200 Subject: [PATCH 20/34] 0.7.2 --- setup.py | 52 +++++++++++++++++++++---------------------- yawdadmin/__init__.py | 2 +- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/setup.py b/setup.py index ba9bb8c..c791cd4 100644 --- a/setup.py +++ b/setup.py @@ -2,30 +2,30 @@ from setuptools import setup, find_packages setup( - name='yawd-admin', - url='http://yawd.eu/open-source-projects/yawd-admin/', - version = '0.7.2-rc', - description='An administration website for Django', - long_description=open('README.rst', 'rt').read(), - author='yawd', - author_email='info@yawd.eu', - packages=find_packages(), - license='BSD', - classifiers = [ - 'Development Status :: 4 - Beta', - 'Environment :: Web Environment', - 'Framework :: Django', - 'Intended Audience :: Developers', - 'License :: OSI Approved :: BSD License', - 'Operating System :: OS Independent', - 'Programming Language :: Python', - 'Topic :: Software Development :: Libraries' - ], - include_package_data = True, - install_requires = [ - "httplib2", - "django >=1.6, <1.8", - "oauth2client" - ], - zip_safe=False + name='yawd-admin', + url='http://yawd.eu/open-source-projects/yawd-admin/', + version='0.7.2', + description='An administration website for Django', + long_description=open('README.rst', 'rt').read(), + author='yawd', + author_email='info@yawd.eu', + packages=find_packages(), + license='BSD', + classifiers=[ + 'Development Status :: 4 - Beta', + 'Environment :: Web Environment', + 'Framework :: Django', + 'Intended Audience :: Developers', + 'License :: OSI Approved :: BSD License', + 'Operating System :: OS Independent', + 'Programming Language :: Python', + 'Topic :: Software Development :: Libraries' + ], + include_package_data=True, + install_requires=[ + "httplib2", + "django >=1.6, <1.8", + "oauth2client" + ], + zip_safe=False ) diff --git a/yawdadmin/__init__.py b/yawdadmin/__init__.py index b68176c..b2f0373 100644 --- a/yawdadmin/__init__.py +++ b/yawdadmin/__init__.py @@ -3,7 +3,7 @@ from django.utils.importlib import import_module from yawdadmin.sites import YawdAdminSite -__version__ = '0.7.2-rc' +__version__ = '0.7.2' def _get_site(): From d5b6c3b67e2eede8e9b3b771490e7993a24f7ce9 Mon Sep 17 00:00:00 2001 From: Mathias WOLFF Date: Fri, 27 May 2016 19:04:59 +0200 Subject: [PATCH 21/34] Update README.rst --- README.rst | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.rst b/README.rst index 6854ba2..8051f2b 100644 --- a/README.rst +++ b/README.rst @@ -23,6 +23,10 @@ History master (dev) ++++++++++++ +is developped under django 1.8.x and does NOT work with older Django releases. + +v0.7.2 +++++++++++++ is developped under django 1.7.x and does NOT work with older Django releases. v0.7.1 From cd8df63d53075d41307451429214a69cc65507c1 Mon Sep 17 00:00:00 2001 From: Mathias WOLFF Date: Fri, 27 May 2016 19:07:28 +0200 Subject: [PATCH 22/34] Update CHANGES.rst --- CHANGES.rst | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGES.rst b/CHANGES.rst index 20a61f9..f314255 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -3,6 +3,10 @@ Changelog +++++++++ +v.0.7.2, 2016.05.27 +=================== +Django 1.7 compatibility + v.0.7.1, 2016.05.24 =================== Django 1.6 compatibility From f13b6f608e864b30d4d016d5576c72b7899ad616 Mon Sep 17 00:00:00 2001 From: Mathias WOLFF Date: Mon, 30 May 2016 10:15:59 +0200 Subject: [PATCH 23/34] Update settings.py --- example_project/example_project/settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/example_project/example_project/settings.py b/example_project/example_project/settings.py index c3d025a..839f921 100644 --- a/example_project/example_project/settings.py +++ b/example_project/example_project/settings.py @@ -31,7 +31,7 @@ 'django.contrib.staticfiles.finders.AppDirectoriesFinder', ) -SECRET_KEY = '6()e7x_%6*@(_nm$ke)g!ellg)pffm*=288trl)@3u=@l$@5qn' +SECRET_KEY = '6()e7x_%6*@(_nm$ke)g!ellg)pffm*=288trl)@3u=@l$@5qnm' MIDDLEWARE_CLASSES = ( 'django.middleware.common.CommonMiddleware', From fb2a1438a8324995c4e17de33d5889bb3045834e Mon Sep 17 00:00:00 2001 From: Mathias WOLFF Date: Mon, 30 May 2016 10:17:20 +0200 Subject: [PATCH 24/34] Update changelog.rst --- docs/changelog.rst | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/docs/changelog.rst b/docs/changelog.rst index 209bf7c..abe9d9e 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -3,6 +3,16 @@ Changelog +++++++++ +v.0.7.2, 2016.05.27 +--------------------- + +* Django 1.7 compatibility + +v.0.7.1, 2016.05.24 +--------------------- + +* Django 1.6 compatibility + v.0.7.0, 2013.10.23 --------------------- From e77f98be8d27d878cfd5a12ef32cd8e445e6be15 Mon Sep 17 00:00:00 2001 From: mwolff44 Date: Tue, 31 May 2016 12:14:25 +0200 Subject: [PATCH 25/34] django 1.9 warning - appl_label not empty --- yawdadmin/models.py | 1 + 1 file changed, 1 insertion(+) diff --git a/yawdadmin/models.py b/yawdadmin/models.py index d4694e8..1cc2780 100644 --- a/yawdadmin/models.py +++ b/yawdadmin/models.py @@ -12,6 +12,7 @@ class AppOption(models.Model): class Meta: unique_together = ('optionset_label', 'name') ordering = ['optionset_label', 'lang_dependant'] + app_label = 'AppOption' def __unicode__(self): return u'%s.%s' % (self.optionset_label, self.name) From fe120a8755c374e9c21762d952505d404808df1e Mon Sep 17 00:00:00 2001 From: mwolff44 Date: Tue, 31 May 2016 12:19:09 +0200 Subject: [PATCH 26/34] RemovedInDjango19Warning: django.utils.importlib will be removed in Django 1.9. from django.utils.importlib import import_module --- yawdadmin/__init__.py | 2 +- yawdadmin/models.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/yawdadmin/__init__.py b/yawdadmin/__init__.py index b2f0373..82b3617 100644 --- a/yawdadmin/__init__.py +++ b/yawdadmin/__init__.py @@ -1,6 +1,6 @@ from django.conf import settings from django.core.exceptions import ImproperlyConfigured -from django.utils.importlib import import_module +from importlib import import_module from yawdadmin.sites import YawdAdminSite __version__ = '0.7.2' diff --git a/yawdadmin/models.py b/yawdadmin/models.py index 1cc2780..0a50d22 100644 --- a/yawdadmin/models.py +++ b/yawdadmin/models.py @@ -12,7 +12,7 @@ class AppOption(models.Model): class Meta: unique_together = ('optionset_label', 'name') ordering = ['optionset_label', 'lang_dependant'] - app_label = 'AppOption' + app_label = 'yawdadmin' def __unicode__(self): return u'%s.%s' % (self.optionset_label, self.name) From 8325c00903c7f63dd796cbbafea24d23d5947a9e Mon Sep 17 00:00:00 2001 From: mwolff44 Date: Tue, 31 May 2016 12:21:26 +0200 Subject: [PATCH 27/34] add django 1.8 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index c791cd4..c31c8a5 100644 --- a/setup.py +++ b/setup.py @@ -24,7 +24,7 @@ include_package_data=True, install_requires=[ "httplib2", - "django >=1.6, <1.8", + "django >=1.6, <1.9", "oauth2client" ], zip_safe=False From b831ac0d0e75e4cfd5db328e9feb11dd095d4f1b Mon Sep 17 00:00:00 2001 From: mwolff44 Date: Tue, 31 May 2016 12:23:45 +0200 Subject: [PATCH 28/34] RemovedInDjango19Warning: django.utils.importlib will be removed in Django 1.9. --- yawdadmin/conf/settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yawdadmin/conf/settings.py b/yawdadmin/conf/settings.py index f581e1c..618a181 100644 --- a/yawdadmin/conf/settings.py +++ b/yawdadmin/conf/settings.py @@ -33,7 +33,7 @@ #load the modelform if it's a string if isinstance(ADMIN_USER_MODELFORM, str): - from django.utils.importlib import import_module + from importlib import import_module _user_modelform_split = ADMIN_USER_MODELFORM.split('.') _user_modelform_module = import_module('.'.join(_user_modelform_split[:-1])) ADMIN_USER_MODELFORM = getattr(_user_modelform_module, _user_modelform_split[-1]) From 3ee6632fc48e3cd1ae588da80ca19aaa71203bbc Mon Sep 17 00:00:00 2001 From: mwolff44 Date: Tue, 31 May 2016 14:25:20 +0200 Subject: [PATCH 29/34] migrations update --- yawdadmin/migrations/0001_initial.py | 31 ++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 yawdadmin/migrations/0001_initial.py diff --git a/yawdadmin/migrations/0001_initial.py b/yawdadmin/migrations/0001_initial.py new file mode 100644 index 0000000..ba73fed --- /dev/null +++ b/yawdadmin/migrations/0001_initial.py @@ -0,0 +1,31 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.db import migrations, models +import yawdadmin.fields + + +class Migration(migrations.Migration): + + dependencies = [ + ] + + operations = [ + migrations.CreateModel( + name='AppOption', + fields=[ + ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), + ('optionset_label', models.CharField(max_length=50)), + ('name', yawdadmin.fields.OptionNameField(max_length=50)), + ('value', models.TextField(null=True)), + ('lang_dependant', models.BooleanField(default=False)), + ], + options={ + 'ordering': ['optionset_label', 'lang_dependant'], + }, + ), + migrations.AlterUniqueTogether( + name='appoption', + unique_together=set([('optionset_label', 'name')]), + ), + ] From d91f4a3e978714d4aa9676f4861b0ff3eaa46649 Mon Sep 17 00:00:00 2001 From: mwolff44 Date: Tue, 31 May 2016 14:59:40 +0200 Subject: [PATCH 30/34] RemovedInDjango19Warning: The django.contrib.admin.util module has been renamed. Use django.contrib.admin.utils instead. --- yawdadmin/templatetags/yawdadmin_tags.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/yawdadmin/templatetags/yawdadmin_tags.py b/yawdadmin/templatetags/yawdadmin_tags.py index e39b36d..2a498ba 100644 --- a/yawdadmin/templatetags/yawdadmin_tags.py +++ b/yawdadmin/templatetags/yawdadmin_tags.py @@ -4,7 +4,10 @@ from django.conf import settings from django.contrib.admin.templatetags.admin_modify import submit_row from django.contrib.admin.views.main import PAGE_VAR -from django.contrib.admin.util import lookup_field, display_for_field, display_for_value +try: + from django.contrib.admin.utils import lookup_field, display_for_field, display_for_value +except ImportError: # Django < 1.7 + from django.contrib.admin.util import lookup_field, display_for_field, display_for_value from django.core import urlresolvers from django.core.exceptions import ObjectDoesNotExist from django.db import models From a464b41becdf7c9c46b05b0a4637a89cd68ba7c2 Mon Sep 17 00:00:00 2001 From: mwolff44 Date: Tue, 31 May 2016 18:05:09 +0200 Subject: [PATCH 31/34] tabular template cleanup --- .../templates/admin/edit_inline/stacked.html | 3 +- .../templates/admin/edit_inline/tabular.html | 185 ++++++++++++------ 2 files changed, 131 insertions(+), 57 deletions(-) diff --git a/yawdadmin/templates/admin/edit_inline/stacked.html b/yawdadmin/templates/admin/edit_inline/stacked.html index f8587b4..98facf9 100755 --- a/yawdadmin/templates/admin/edit_inline/stacked.html +++ b/yawdadmin/templates/admin/edit_inline/stacked.html @@ -1,4 +1,5 @@ -{% load i18n admin_static %}
    +{% load i18n admin_static %} +
    {{ inline_admin_formset.opts.verbose_name_plural|title }}{% if inline_admin_formset.opts.collapse %} {% endif %}

    {% if inline_admin_formset.opts.description %}
    {{inline_admin_formset.opts.description|safe}}
    {% endif %} diff --git a/yawdadmin/templates/admin/edit_inline/tabular.html b/yawdadmin/templates/admin/edit_inline/tabular.html index 513fed8..90748c4 100755 --- a/yawdadmin/templates/admin/edit_inline/tabular.html +++ b/yawdadmin/templates/admin/edit_inline/tabular.html @@ -1,56 +1,129 @@ -{% load i18n admin_static admin_modify yawdadmin_filters %}
    -
    - {{ inline_admin_formset.opts.verbose_name_plural|capfirst }}{% if inline_admin_formset.opts.collapse %} {% endif %}{% if inline_admin_formset.opts.description %} -
    {{inline_admin_formset.opts.description|safe}}
    {% endif %} -
    {% if inline_admin_formset.formset.non_form_errors %} -
    - {{ inline_admin_formset.formset.non_form_errors }} -
    {% endif %} -
    - {{ inline_admin_formset.formset.management_form }} -
    - - - {% with non_hidden_field=inline_admin_formset.fields|indexof_non_hidden %}{% for field in inline_admin_formset.fields %}{% if not field.widget.is_hidden %} - {{ field.label|capfirst }}{% if field.required %} *{% endif %}{% endif %}{% endfor %}{% if inline_admin_formset.formset.can_delete %}{% endif %} - - {% endwith %} - {% for inline_admin_form in inline_admin_formset %}{% if inline_admin_form.form.non_field_errors %} - - - {% endif %} - - {% for fieldset in inline_admin_form %}{% for line in fieldset %}{% for field in line %}{% if not field.field.is_hidden %} - {% endif %}{% endfor %}{% endfor %}{% endfor %}{% if inline_admin_formset.formset.can_delete %} - {% endif %}{% endfor %} - -
    {% trans "Delete?" %}
    {{ inline_admin_form.form.non_field_errors }}
    {% if inline_admin_form.original or inline_admin_form.show_url %} -

    {% if inline_admin_form.original %} - {{ inline_admin_form.original }}{% endif %}{% if inline_admin_form.show_url %} - {% trans "View on site" %}{% endif %} -

    {% endif %}{% if inline_admin_form.has_auto_field or inline_admin_form.needs_explicit_pk_field %} - {{ inline_admin_form.pk_field.field }}{% endif %} - {{ inline_admin_form.fk_field.field }}{% spaceless %}{% for fieldset in inline_admin_form %}{% for line in fieldset %}{% for field in line %}{% if field.field.is_hidden %} - {{ field.field }}{% endif %}{% endfor %}{% endfor %}{% endfor %}{% endspaceless %} -     		{% if field.is_readonly %} -

    {{ field.contents }}

    {% else %} - {{ field.field }}{% if field.field.errors %} - {{ field.field.errors }}{% endif %}{% endif %} -     		{% if inline_admin_form.original %} - {{ inline_admin_form.deletion_field.field }}{% endif %} -
    -
    -
    -
    -
    -
    - \ No newline at end of file +{% load i18n admin_static admin_modify yawdadmin_filters admin_urls %} + +
    +
    + + {{ inline_admin_formset.opts.verbose_name_plural|capfirst }} + {% if inline_admin_formset.opts.collapse %} + + {% endif %} + + {% if inline_admin_formset.opts.description %} +
    + {{inline_admin_formset.opts.description|safe}} +
    + {% endif %} +
    + {% if inline_admin_formset.formset.non_form_errors %} +
    + {{ inline_admin_formset.formset.non_form_errors }} +
    + {% endif %} +
    + {{ inline_admin_formset.formset.management_form }} +
    + + + + + {% for field in inline_admin_formset.fields %} + {% if not field.widget.is_hidden %} + + {{ field.label|capfirst }} + {% if field.help_text %} + + {% endif %} + {% if field.required %} *{% endif %} + + {% endif %} + {% endfor %} + {% if inline_admin_formset.formset.can_delete %} + + {% endif %} + + + + + {% for inline_admin_form in inline_admin_formset %} + {% if inline_admin_form.form.non_field_errors %} + + + + {% endif %} + + + {% for fieldset in inline_admin_form %} + {% for line in fieldset %} + {% for field in line %} + {% if not field.field.is_hidden %} + + {% endif %} + {% endfor %} + {% endfor %} + {% endfor %} + {% if inline_admin_formset.formset.can_delete %} + + {% endif %} + + {% endfor %} + +
    {% trans "Delete?" %}
    +
    + {{ inline_admin_form.form.non_field_errors }} +
    +
    + {% if inline_admin_form.original or inline_admin_form.show_url %} +

    + {% if inline_admin_form.original %} + {{ inline_admin_form.original }} + {% endif %} + {% if inline_admin_form.show_url %} + {% trans "View on site" %} + {% endif %} +

    + {% endif %} + {% if inline_admin_form.has_auto_field or inline_admin_form.needs_explicit_pk_field %} + {{ inline_admin_form.pk_field.field }} + {% endif %} + {{ inline_admin_form.fk_field.field }} + {% spaceless %} + {% for fieldset in inline_admin_form %} + {% for line in fieldset %} + {% for field in line %} + {% if field.field.is_hidden %} + {{ field.field }} + {% endif %} + {% endfor %} + {% endfor %} + {% endfor %} + {% endspaceless %} +     		+ {% if field.is_readonly %} +

    {{ field.contents }}

    + {% else %} + {{ field.field }} + {% if field.field.errors %} + {{ field.field.errors|striptags }} + {% endif %} + {% endif %} +     		+ {% if inline_admin_form.original %} + {{ inline_admin_form.deletion_field.field }} + {% endif %} +
    +
    +
    +
    +
    +
    + \ No newline at end of file From 65adb71e6ba31a4877efbe84550c1ffc497d64a6 Mon Sep 17 00:00:00 2001 From: mwolff44 Date: Wed, 1 Jun 2016 11:31:31 +0200 Subject: [PATCH 32/34] js updates --- yawdadmin/static/admin/js/SelectBox.js | 135 +++++++++ yawdadmin/static/admin/js/actions_min.js | 6 + .../admin/js/admin/RelatedObjectLookups.js | 189 +++++++++++++ yawdadmin/static/admin/js/calendar.js | 178 ++++++++++++ yawdadmin/static/admin/js/collapse.js | 26 ++ yawdadmin/static/admin/js/collapse_min.js | 3 + yawdadmin/static/admin/js/core.js | 266 ++++++++++++++++++ yawdadmin/static/admin/js/jquery.init.js | 8 + yawdadmin/static/admin/js/timeparse.js | 106 +++++++ yawdadmin/static/admin/js/urlify.js | 171 +++++++++++ 10 files changed, 1088 insertions(+) create mode 100644 yawdadmin/static/admin/js/SelectBox.js create mode 100644 yawdadmin/static/admin/js/actions_min.js create mode 100644 yawdadmin/static/admin/js/admin/RelatedObjectLookups.js create mode 100644 yawdadmin/static/admin/js/calendar.js create mode 100644 yawdadmin/static/admin/js/collapse.js create mode 100644 yawdadmin/static/admin/js/collapse_min.js create mode 100644 yawdadmin/static/admin/js/core.js create mode 100644 yawdadmin/static/admin/js/jquery.init.js create mode 100644 yawdadmin/static/admin/js/timeparse.js create mode 100644 yawdadmin/static/admin/js/urlify.js diff --git a/yawdadmin/static/admin/js/SelectBox.js b/yawdadmin/static/admin/js/SelectBox.js new file mode 100644 index 0000000..a0e99cc --- /dev/null +++ b/yawdadmin/static/admin/js/SelectBox.js @@ -0,0 +1,135 @@ +(function() { + 'use strict'; + var SelectBox = { + cache: {}, + init: function(id) { + var box = document.getElementById(id); + var node; + SelectBox.cache[id] = []; + var cache = SelectBox.cache[id]; + for (var i = 0, j = box.options.length; i < j; i++) { + node = box.options[i]; + cache.push({value: node.value, text: node.text, displayed: 1}); + } + }, + redisplay: function(id) { + // Repopulate HTML select box from cache + var box = document.getElementById(id); + var node; + box.options.length = 0; // clear all options + var cache = SelectBox.cache[id]; + for (var i = 0, j = cache.length; i < j; i++) { + node = cache[i]; + if (node.displayed) { + var new_option = new Option(node.text, node.value, false, false); + // Shows a tooltip when hovering over the option + new_option.setAttribute("title", node.text); + box.options[box.options.length] = new_option; + } + } + }, + filter: function(id, text) { + // Redisplay the HTML select box, displaying only the choices containing ALL + // the words in text. (It's an AND search.) + var tokens = text.toLowerCase().split(/\s+/); + var node, token; + var cache = SelectBox.cache[id]; + for (var i = 0, j = cache.length; i < j; i++) { + node = cache[i]; + node.displayed = 1; + var numTokens = tokens.length; + for (var k = 0; k < numTokens; k++) { + token = tokens[k]; + if (node.text.toLowerCase().indexOf(token) === -1) { + node.displayed = 0; + } + } + } + SelectBox.redisplay(id); + }, + delete_from_cache: function(id, value) { + var node, delete_index = null; + var cache = SelectBox.cache[id]; + for (var i = 0, j = cache.length; i < j; i++) { + node = cache[i]; + if (node.value === value) { + delete_index = i; + break; + } + } + var k = cache.length - 1; + for (i = delete_index; i < k; i++) { + cache[i] = cache[i + 1]; + } + cache.length--; + }, + add_to_cache: function(id, option) { + SelectBox.cache[id].push({value: option.value, text: option.text, displayed: 1}); + }, + cache_contains: function(id, value) { + // Check if an item is contained in the cache + var node; + var cache = SelectBox.cache[id]; + for (var i = 0, j = cache.length; i < j; i++) { + node = cache[i]; + if (node.value === value) { + return true; + } + } + return false; + }, + move: function(from, to) { + var from_box = document.getElementById(from); + var option; + var boxOptions = from_box.options; + for (var i = 0, j = boxOptions.length; i < j; i++) { + option = boxOptions[i]; + if (option.selected && SelectBox.cache_contains(from, option.value)) { + SelectBox.add_to_cache(to, {value: option.value, text: option.text, displayed: 1}); + SelectBox.delete_from_cache(from, option.value); + } + } + SelectBox.redisplay(from); + SelectBox.redisplay(to); + }, + move_all: function(from, to) { + var from_box = document.getElementById(from); + var option; + var boxOptions = from_box.options; + for (var i = 0, j = boxOptions.length; i < j; i++) { + option = boxOptions[i]; + if (SelectBox.cache_contains(from, option.value)) { + SelectBox.add_to_cache(to, {value: option.value, text: option.text, displayed: 1}); + SelectBox.delete_from_cache(from, option.value); + } + } + SelectBox.redisplay(from); + SelectBox.redisplay(to); + }, + sort: function(id) { + SelectBox.cache[id].sort(function(a, b) { + a = a.text.toLowerCase(); + b = b.text.toLowerCase(); + try { + if (a > b) { + return 1; + } + if (a < b) { + return -1; + } + } + catch (e) { + // silently fail on IE 'unknown' exception + } + return 0; + } ); + }, + select_all: function(id) { + var box = document.getElementById(id); + for (var i = 0; i < box.options.length; i++) { + box.options[i].selected = 'selected'; + } + } + }; + window.SelectBox = SelectBox; +})(); \ No newline at end of file diff --git a/yawdadmin/static/admin/js/actions_min.js b/yawdadmin/static/admin/js/actions_min.js new file mode 100644 index 0000000..ff2d79f --- /dev/null +++ b/yawdadmin/static/admin/js/actions_min.js @@ -0,0 +1,6 @@ +(function(a){var f;a.fn.actions=function(q){var b=a.extend({},a.fn.actions.defaults,q),g=a(this),e=!1,k=function(){a(b.acrossClears).hide();a(b.acrossQuestions).show();a(b.allContainer).hide()},l=function(){a(b.acrossClears).show();a(b.acrossQuestions).hide();a(b.actionContainer).toggleClass(b.selectedClass);a(b.allContainer).show();a(b.counterContainer).hide()},m=function(){a(b.acrossClears).hide();a(b.acrossQuestions).hide();a(b.allContainer).hide();a(b.counterContainer).show()},n=function(){m(); +a(b.acrossInput).val(0);a(b.actionContainer).removeClass(b.selectedClass)},p=function(c){c?k():m();a(g).prop("checked",c).parent().parent().toggleClass(b.selectedClass,c)},h=function(){var c=a(g).filter(":checked").length;a(b.counterContainer).html(interpolate(ngettext("%(sel)s of %(cnt)s selected","%(sel)s of %(cnt)s selected",c),{sel:c,cnt:_actions_icnt},!0));a(b.allToggle).prop("checked",function(){var a;c===g.length?(a=!0,k()):(a=!1,n());return a})};a(b.counterContainer).show();a(this).filter(":checked").each(function(c){a(this).parent().parent().toggleClass(b.selectedClass); +h();1===a(b.acrossInput).val()&&l()});a(b.allToggle).show().click(function(){p(a(this).prop("checked"));h()});a("a",b.acrossQuestions).click(function(c){c.preventDefault();a(b.acrossInput).val(1);l()});a("a",b.acrossClears).click(function(c){c.preventDefault();a(b.allToggle).prop("checked",!1);n();p(0);h()});f=null;a(g).click(function(c){c||(c=window.event);var d=c.target?c.target:c.srcElement;if(f&&a.data(f)!==a.data(d)&&!0===c.shiftKey){var e=!1;a(f).prop("checked",d.checked).parent().parent().toggleClass(b.selectedClass, +d.checked);a(g).each(function(){if(a.data(this)===a.data(f)||a.data(this)===a.data(d))e=e?!1:!0;e&&a(this).prop("checked",d.checked).parent().parent().toggleClass(b.selectedClass,d.checked)})}a(d).parent().parent().toggleClass(b.selectedClass,d.checked);f=d;h()});a("form#changelist-form table#result_list tr").find("td:gt(0) :input").change(function(){e=!0});a('form#changelist-form button[name="index"]').click(function(a){if(e)return confirm(gettext("You have unsaved changes on individual editable fields. If you run an action, your unsaved changes will be lost."))}); +a('form#changelist-form input[name="_save"]').click(function(c){var d=!1;a("select option:selected",b.actionContainer).each(function(){a(this).val()&&(d=!0)});if(d)return e?confirm(gettext("You have selected an action, but you haven't saved your changes to individual fields yet. Please click OK to save. You'll need to re-run the action.")):confirm(gettext("You have selected an action, and you haven't made any changes on individual fields. You're probably looking for the Go button rather than the Save button."))})}; +a.fn.actions.defaults={actionContainer:"div.actions",counterContainer:"span.action-counter",allContainer:"div.actions span.all",acrossInput:"div.actions input.select-across",acrossQuestions:"div.actions span.question",acrossClears:"div.actions span.clear",allToggle:"#action-toggle",selectedClass:"selected"}})(yawdadmin.jQuery); \ No newline at end of file diff --git a/yawdadmin/static/admin/js/admin/RelatedObjectLookups.js b/yawdadmin/static/admin/js/admin/RelatedObjectLookups.js new file mode 100644 index 0000000..2b25236 --- /dev/null +++ b/yawdadmin/static/admin/js/admin/RelatedObjectLookups.js @@ -0,0 +1,189 @@ +/*global SelectBox, interpolate*/ +// Handles related-objects functionality: lookup link for raw_id_fields +// and Add Another links. + +(function($) { + 'use strict'; + + function html_unescape(text) { + // Unescape a string that was escaped using django.utils.html.escape. + text = text.replace(/</g, '<'); + text = text.replace(/>/g, '>'); + text = text.replace(/"/g, '"'); + text = text.replace(/'/g, "'"); + text = text.replace(/&/g, '&'); + return text; + } + + // IE doesn't accept periods or dashes in the window name, but the element IDs + // we use to generate popup window names may contain them, therefore we map them + // to allowed characters in a reversible way so that we can locate the correct + // element when the popup window is dismissed. + function id_to_windowname(text) { + text = text.replace(/\./g, '__dot__'); + text = text.replace(/\-/g, '__dash__'); + return text; + } + + function windowname_to_id(text) { + text = text.replace(/__dot__/g, '.'); + text = text.replace(/__dash__/g, '-'); + return text; + } + + function showAdminPopup(triggeringLink, name_regexp, add_popup) { + var name = triggeringLink.id.replace(name_regexp, ''); + name = id_to_windowname(name); + var href = triggeringLink.href; + if (add_popup) { + if (href.indexOf('?') === -1) { + href += '?_popup=1'; + } else { + href += '&_popup=1'; + } + } + var win = window.open(href, name, 'height=500,width=800,resizable=yes,scrollbars=yes'); + win.focus(); + return false; + } + + function showRelatedObjectLookupPopup(triggeringLink) { + return showAdminPopup(triggeringLink, /^lookup_/, true); + } + + function dismissRelatedLookupPopup(win, chosenId) { + var name = windowname_to_id(win.name); + var elem = document.getElementById(name); + if (elem.className.indexOf('vManyToManyRawIdAdminField') !== -1 && elem.value) { + elem.value += ',' + chosenId; + } else { + document.getElementById(name).value = chosenId; + } + win.close(); + } + + function showRelatedObjectPopup(triggeringLink) { + return showAdminPopup(triggeringLink, /^(change|add|delete)_/, false); + } + + function updateRelatedObjectLinks(triggeringLink) { + var $this = django.jQuery(triggeringLink); + var siblings = $this.nextAll('.change-related, .delete-related'); + if (!siblings.length) { + return; + } + var value = $this.val(); + if (value) { + siblings.each(function() { + var elm = django.jQuery(this); + elm.attr('href', elm.attr('data-href-template').replace('__fk__', value)); + }); + } else { + siblings.removeAttr('href'); + } + } + + function dismissAddRelatedObjectPopup(win, newId, newRepr) { + // newId and newRepr are expected to have previously been escaped by + // django.utils.html.escape. + newId = html_unescape(newId); + newRepr = html_unescape(newRepr); + var name = windowname_to_id(win.name); + var elem = document.getElementById(name); + if (elem) { + var elemName = elem.nodeName.toUpperCase(); + if (elemName === 'SELECT') { + elem.options[elem.options.length] = new Option(newRepr, newId, true, true); + } else if (elemName === 'INPUT') { + if (elem.className.indexOf('vManyToManyRawIdAdminField') !== -1 && elem.value) { + elem.value += ',' + newId; + } else { + elem.value = newId; + } + } + // Trigger a change event to update related links if required. + django.jQuery(elem).trigger('change'); + } else { + var toId = name + "_to"; + var o = new Option(newRepr, newId); + SelectBox.add_to_cache(toId, o); + SelectBox.redisplay(toId); + } + win.close(); + } + + function dismissChangeRelatedObjectPopup(win, objId, newRepr, newId) { + objId = html_unescape(objId); + newRepr = html_unescape(newRepr); + var id = windowname_to_id(win.name).replace(/^edit_/, ''); + var selectsSelector = interpolate('#%s, #%s_from, #%s_to', [id, id, id]); + var selects = django.jQuery(selectsSelector); + selects.find('option').each(function() { + if (this.value === objId) { + this.innerHTML = newRepr; + this.value = newId; + } + }); + win.close(); + } + + function dismissDeleteRelatedObjectPopup(win, objId) { + objId = html_unescape(objId); + var id = windowname_to_id(win.name).replace(/^delete_/, ''); + var selectsSelector = interpolate('#%s, #%s_from, #%s_to', [id, id, id]); + var selects = django.jQuery(selectsSelector); + selects.find('option').each(function() { + if (this.value === objId) { + django.jQuery(this).remove(); + } + }).trigger('change'); + win.close(); + } + + // Global for testing purposes + window.html_unescape = html_unescape; + window.id_to_windowname = id_to_windowname; + window.windowname_to_id = windowname_to_id; + + window.showRelatedObjectLookupPopup = showRelatedObjectLookupPopup; + window.dismissRelatedLookupPopup = dismissRelatedLookupPopup; + window.showRelatedObjectPopup = showRelatedObjectPopup; + window.updateRelatedObjectLinks = updateRelatedObjectLinks; + window.dismissAddRelatedObjectPopup = dismissAddRelatedObjectPopup; + window.dismissChangeRelatedObjectPopup = dismissChangeRelatedObjectPopup; + window.dismissDeleteRelatedObjectPopup = dismissDeleteRelatedObjectPopup; + + // Kept for backward compatibility + window.showAddAnotherPopup = showRelatedObjectPopup; + window.dismissAddAnotherPopup = dismissAddRelatedObjectPopup; + + $(document).ready(function() { + $('body').on('click', '.related-widget-wrapper-link', function(e) { + e.preventDefault(); + if (this.href) { + var event = $.Event('django:show-related', {href: this.href}); + $(this).trigger(event); + if (!event.isDefaultPrevented()) { + showRelatedObjectPopup(this); + } + } + }); + $('body').on('change', '.related-widget-wrapper select', function(e) { + var event = $.Event('django:update-related'); + $(this).trigger(event); + if (!event.isDefaultPrevented()) { + updateRelatedObjectLinks(this); + } + }); + $('.related-widget-wrapper select').trigger('change'); + $('.related-lookup').click(function(e) { + e.preventDefault(); + var event = $.Event('django:lookup-related'); + $(this).trigger(event); + if (!event.isDefaultPrevented()) { + showRelatedObjectLookupPopup(this); + } + }); + }); + +})(yawdadmin.jQuery); \ No newline at end of file diff --git a/yawdadmin/static/admin/js/calendar.js b/yawdadmin/static/admin/js/calendar.js new file mode 100644 index 0000000..6adf2a2 --- /dev/null +++ b/yawdadmin/static/admin/js/calendar.js @@ -0,0 +1,178 @@ +/*global gettext, get_format, quickElement, removeChildren*/ +/* +calendar.js - Calendar functions by Adrian Holovaty +depends on core.js for utility functions like removeChildren or quickElement +*/ + +(function() { + 'use strict'; + // CalendarNamespace -- Provides a collection of HTML calendar-related helper functions + var CalendarNamespace = { + monthsOfYear: gettext('January February March April May June July August September October November December').split(' '), + daysOfWeek: gettext('S M T W T F S').split(' '), + firstDayOfWeek: parseInt(get_format('FIRST_DAY_OF_WEEK')), + isLeapYear: function(year) { + return (((year % 4) === 0) && ((year % 100) !== 0 ) || ((year % 400) === 0)); + }, + getDaysInMonth: function(month, year) { + var days; + if (month === 1 || month === 3 || month === 5 || month === 7 || month === 8 || month === 10 || month === 12) { + days = 31; + } + else if (month === 4 || month === 6 || month === 9 || month === 11) { + days = 30; + } + else if (month === 2 && CalendarNamespace.isLeapYear(year)) { + days = 29; + } + else { + days = 28; + } + return days; + }, + draw: function(month, year, div_id, callback, selected) { // month = 1-12, year = 1-9999 + var today = new Date(); + var todayDay = today.getDate(); + var todayMonth = today.getMonth() + 1; + var todayYear = today.getFullYear(); + var todayClass = ''; + + // Use UTC functions here because the date field does not contain time + // and using the UTC function variants prevent the local time offset + // from altering the date, specifically the day field. For example: + // + // ``` + // var x = new Date('2013-10-02'); + // var day = x.getDate(); + // ``` + // + // The day variable above will be 1 instead of 2 in, say, US Pacific time + // zone. + var isSelectedMonth = false; + if (typeof selected !== 'undefined') { + isSelectedMonth = (selected.getUTCFullYear() === year && (selected.getUTCMonth() + 1) === month); + } + + month = parseInt(month); + year = parseInt(year); + var calDiv = document.getElementById(div_id); + removeChildren(calDiv); + var calTable = document.createElement('table'); + quickElement('caption', calTable, CalendarNamespace.monthsOfYear[month - 1] + ' ' + year); + var tableBody = quickElement('tbody', calTable); + + // Draw days-of-week header + var tableRow = quickElement('tr', tableBody); + for (var i = 0; i < 7; i++) { + quickElement('th', tableRow, CalendarNamespace.daysOfWeek[(i + CalendarNamespace.firstDayOfWeek) % 7]); + } + + var startingPos = new Date(year, month - 1, 1 - CalendarNamespace.firstDayOfWeek).getDay(); + var days = CalendarNamespace.getDaysInMonth(month, year); + + var nonDayCell; + + // Draw blanks before first of month + tableRow = quickElement('tr', tableBody); + for (i = 0; i < startingPos; i++) { + nonDayCell = quickElement('td', tableRow, ' '); + nonDayCell.className = "nonday"; + } + + // Draw days of month + var currentDay = 1; + for (i = startingPos; currentDay <= days; i++) { + if (i % 7 === 0 && currentDay !== 1) { + tableRow = quickElement('tr', tableBody); + } + if ((currentDay === todayDay) && (month === todayMonth) && (year === todayYear)) { + todayClass = 'today'; + } else { + todayClass = ''; + } + + // use UTC function; see above for explanation. + if (isSelectedMonth && currentDay === selected.getUTCDate()) { + if (todayClass !== '') { + todayClass += " "; + } + todayClass += "selected"; + } + + var cell = quickElement('td', tableRow, '', 'class', todayClass); + + quickElement('a', cell, currentDay, 'href', 'javascript:void(' + callback + '(' + year + ',' + month + ',' + currentDay + '));'); + currentDay++; + } + + // Draw blanks after end of month (optional, but makes for valid code) + while (tableRow.childNodes.length < 7) { + nonDayCell = quickElement('td', tableRow, ' '); + nonDayCell.className = "nonday"; + } + + calDiv.appendChild(calTable); + } + }; + + // Calendar -- A calendar instance + function Calendar(div_id, callback, selected) { + // div_id (string) is the ID of the element in which the calendar will + // be displayed + // callback (string) is the name of a JavaScript function that will be + // called with the parameters (year, month, day) when a day in the + // calendar is clicked + this.div_id = div_id; + this.callback = callback; + this.today = new Date(); + this.currentMonth = this.today.getMonth() + 1; + this.currentYear = this.today.getFullYear(); + if (typeof selected !== 'undefined') { + this.selected = selected; + } + } + Calendar.prototype = { + drawCurrent: function() { + CalendarNamespace.draw(this.currentMonth, this.currentYear, this.div_id, this.callback, this.selected); + }, + drawDate: function(month, year, selected) { + this.currentMonth = month; + this.currentYear = year; + + if(selected) { + this.selected = selected; + } + + this.drawCurrent(); + }, + drawPreviousMonth: function() { + if (this.currentMonth === 1) { + this.currentMonth = 12; + this.currentYear--; + } + else { + this.currentMonth--; + } + this.drawCurrent(); + }, + drawNextMonth: function() { + if (this.currentMonth === 12) { + this.currentMonth = 1; + this.currentYear++; + } + else { + this.currentMonth++; + } + this.drawCurrent(); + }, + drawPreviousYear: function() { + this.currentYear--; + this.drawCurrent(); + }, + drawNextYear: function() { + this.currentYear++; + this.drawCurrent(); + } + }; + window.Calendar = Calendar; +})(); \ No newline at end of file diff --git a/yawdadmin/static/admin/js/collapse.js b/yawdadmin/static/admin/js/collapse.js new file mode 100644 index 0000000..14e9d42 --- /dev/null +++ b/yawdadmin/static/admin/js/collapse.js @@ -0,0 +1,26 @@ +/*global gettext*/ +(function($) { + 'use strict'; + $(document).ready(function() { + // Add anchor tag for Show/Hide link + $("fieldset.collapse").each(function(i, elem) { + // Don't hide if fields in this fieldset have errors + if ($(elem).find("div.errors").length === 0) { + $(elem).addClass("collapsed").find("h2").first().append(' (' + gettext("Show") + + ')'); + } + }); + // Add toggle to anchor tag + $("fieldset.collapse a.collapse-toggle").click(function(ev) { + if ($(this).closest("fieldset").hasClass("collapsed")) { + // Show + $(this).text(gettext("Hide")).closest("fieldset").removeClass("collapsed").trigger("show.fieldset", [$(this).attr("id")]); + } else { + // Hide + $(this).text(gettext("Show")).closest("fieldset").addClass("collapsed").trigger("hide.fieldset", [$(this).attr("id")]); + } + return false; + }); + }); +})(yawdadmin.jQuery); \ No newline at end of file diff --git a/yawdadmin/static/admin/js/collapse_min.js b/yawdadmin/static/admin/js/collapse_min.js new file mode 100644 index 0000000..a45e7a7 --- /dev/null +++ b/yawdadmin/static/admin/js/collapse_min.js @@ -0,0 +1,3 @@ + +(function(a){a(document).ready(function(){a("fieldset.collapse").each(function(b,c){0===a(c).find("div.errors").length&&a(c).addClass("collapsed").find("h2").first().append(' ('+gettext("Show")+")")});a("fieldset.collapse a.collapse-toggle").click(function(b){a(this).closest("fieldset").hasClass("collapsed")?a(this).text(gettext("Hide")).closest("fieldset").removeClass("collapsed").trigger("show.fieldset",[a(this).attr("id")]):a(this).text(gettext("Show")).closest("fieldset").addClass("collapsed").trigger("hide.fieldset", +[a(this).attr("id")]);return!1})})})(yawdadmin.jQuery); \ No newline at end of file diff --git a/yawdadmin/static/admin/js/core.js b/yawdadmin/static/admin/js/core.js new file mode 100644 index 0000000..48fb435 --- /dev/null +++ b/yawdadmin/static/admin/js/core.js @@ -0,0 +1,266 @@ +// Core javascript helper functions + +// basic browser identification & version +var isOpera = (navigator.userAgent.indexOf("Opera") >= 0) && parseFloat(navigator.appVersion); +var isIE = ((document.all) && (!isOpera)) && parseFloat(navigator.appVersion.split("MSIE ")[1].split(";")[0]); + +// Cross-browser event handlers. +function addEvent(obj, evType, fn) { + 'use strict'; + if (obj.addEventListener) { + obj.addEventListener(evType, fn, false); + return true; + } else if (obj.attachEvent) { + var r = obj.attachEvent("on" + evType, fn); + return r; + } else { + return false; + } +} + +function removeEvent(obj, evType, fn) { + 'use strict'; + if (obj.removeEventListener) { + obj.removeEventListener(evType, fn, false); + return true; + } else if (obj.detachEvent) { + obj.detachEvent("on" + evType, fn); + return true; + } else { + return false; + } +} + +function cancelEventPropagation(e) { + 'use strict'; + if (!e) { + e = window.event; + } + e.cancelBubble = true; + if (e.stopPropagation) { + e.stopPropagation(); + } +} + +// quickElement(tagType, parentReference [, textInChildNode, attribute, attributeValue ...]); +function quickElement() { + 'use strict'; + var obj = document.createElement(arguments[0]); + if (arguments[2]) { + var textNode = document.createTextNode(arguments[2]); + obj.appendChild(textNode); + } + var len = arguments.length; + for (var i = 3; i < len; i += 2) { + obj.setAttribute(arguments[i], arguments[i + 1]); + } + arguments[1].appendChild(obj); + return obj; +} + +// "a" is reference to an object +function removeChildren(a) { + 'use strict'; + while (a.hasChildNodes()) { + a.removeChild(a.lastChild); + } +} + +// ---------------------------------------------------------------------------- +// Cross-browser xmlhttp object +// from http://jibbering.com/2002/4/httprequest.html +// ---------------------------------------------------------------------------- +var xmlhttp; +/*@cc_on @*/ +/*@if (@_jscript_version >= 5) + try { + xmlhttp = new ActiveXObject("Msxml2.XMLHTTP"); + } catch (e) { + try { + xmlhttp = new ActiveXObject("Microsoft.XMLHTTP"); + } catch (E) { + xmlhttp = false; + } + } +@else + xmlhttp = false; +@end @*/ +if (!xmlhttp && typeof XMLHttpRequest !== 'undefined') { + xmlhttp = new XMLHttpRequest(); +} + +// ---------------------------------------------------------------------------- +// Find-position functions by PPK +// See http://www.quirksmode.org/js/findpos.html +// ---------------------------------------------------------------------------- +function findPosX(obj) { + 'use strict'; + var curleft = 0; + if (obj.offsetParent) { + while (obj.offsetParent) { + curleft += obj.offsetLeft - ((isOpera) ? 0 : obj.scrollLeft); + obj = obj.offsetParent; + } + // IE offsetParent does not include the top-level + if (isIE && obj.parentElement) { + curleft += obj.offsetLeft - obj.scrollLeft; + } + } else if (obj.x) { + curleft += obj.x; + } + return curleft; +} + +function findPosY(obj) { + 'use strict'; + var curtop = 0; + if (obj.offsetParent) { + while (obj.offsetParent) { + curtop += obj.offsetTop - ((isOpera) ? 0 : obj.scrollTop); + obj = obj.offsetParent; + } + // IE offsetParent does not include the top-level + if (isIE && obj.parentElement) { + curtop += obj.offsetTop - obj.scrollTop; + } + } else if (obj.y) { + curtop += obj.y; + } + return curtop; +} + +//----------------------------------------------------------------------------- +// Date object extensions +// ---------------------------------------------------------------------------- +(function() { + 'use strict'; + Date.prototype.getTwelveHours = function() { + var hours = this.getHours(); + if (hours === 0) { + return 12; + } + else { + return hours <= 12 ? hours : hours - 12; + } + }; + + Date.prototype.getTwoDigitMonth = function() { + return (this.getMonth() < 9) ? '0' + (this.getMonth() + 1) : (this.getMonth() + 1); + }; + + Date.prototype.getTwoDigitDate = function() { + return (this.getDate() < 10) ? '0' + this.getDate() : this.getDate(); + }; + + Date.prototype.getTwoDigitTwelveHour = function() { + return (this.getTwelveHours() < 10) ? '0' + this.getTwelveHours() : this.getTwelveHours(); + }; + + Date.prototype.getTwoDigitHour = function() { + return (this.getHours() < 10) ? '0' + this.getHours() : this.getHours(); + }; + + Date.prototype.getTwoDigitMinute = function() { + return (this.getMinutes() < 10) ? '0' + this.getMinutes() : this.getMinutes(); + }; + + Date.prototype.getTwoDigitSecond = function() { + return (this.getSeconds() < 10) ? '0' + this.getSeconds() : this.getSeconds(); + }; + + Date.prototype.getHourMinute = function() { + return this.getTwoDigitHour() + ':' + this.getTwoDigitMinute(); + }; + + Date.prototype.getHourMinuteSecond = function() { + return this.getTwoDigitHour() + ':' + this.getTwoDigitMinute() + ':' + this.getTwoDigitSecond(); + }; + + Date.prototype.strftime = function(format) { + var fields = { + c: this.toString(), + d: this.getTwoDigitDate(), + H: this.getTwoDigitHour(), + I: this.getTwoDigitTwelveHour(), + m: this.getTwoDigitMonth(), + M: this.getTwoDigitMinute(), + p: (this.getHours() >= 12) ? 'PM' : 'AM', + S: this.getTwoDigitSecond(), + w: '0' + this.getDay(), + x: this.toLocaleDateString(), + X: this.toLocaleTimeString(), + y: ('' + this.getFullYear()).substr(2, 4), + Y: '' + this.getFullYear(), + '%': '%' + }; + var result = '', i = 0; + while (i < format.length) { + if (format.charAt(i) === '%') { + result = result + fields[format.charAt(i + 1)]; + ++i; + } + else { + result = result + format.charAt(i); + } + ++i; + } + return result; + }; + +// ---------------------------------------------------------------------------- +// String object extensions +// ---------------------------------------------------------------------------- + String.prototype.pad_left = function(pad_length, pad_string) { + var new_string = this; + for (var i = 0; new_string.length < pad_length; i++) { + new_string = pad_string + new_string; + } + return new_string; + }; + + String.prototype.strptime = function(format) { + var split_format = format.split(/[.\-/]/); + var date = this.split(/[.\-/]/); + var i = 0; + var day, month, year; + while (i < split_format.length) { + switch (split_format[i]) { + case "%d": + day = date[i]; + break; + case "%m": + month = date[i] - 1; + break; + case "%Y": + year = date[i]; + break; + case "%y": + year = date[i]; + break; + } + ++i; + } + // Create Date object from UTC since the parsed value is supposed to be + // in UTC, not local time. Also, the calendar uses UTC functions for + // date extraction. + return new Date(Date.UTC(year, month, day)); + }; + +})(); +// ---------------------------------------------------------------------------- +// Get the computed style for and element +// ---------------------------------------------------------------------------- +function getStyle(oElm, strCssRule) { + 'use strict'; + var strValue = ""; + if(document.defaultView && document.defaultView.getComputedStyle) { + strValue = document.defaultView.getComputedStyle(oElm, "").getPropertyValue(strCssRule); + } + else if(oElm.currentStyle) { + strCssRule = strCssRule.replace(/\-(\w)/g, function(strMatch, p1) { + return p1.toUpperCase(); + }); + strValue = oElm.currentStyle[strCssRule]; + } + return strValue; +} \ No newline at end of file diff --git a/yawdadmin/static/admin/js/jquery.init.js b/yawdadmin/static/admin/js/jquery.init.js new file mode 100644 index 0000000..aeac009 --- /dev/null +++ b/yawdadmin/static/admin/js/jquery.init.js @@ -0,0 +1,8 @@ +/*global django:true, jQuery:false*/ +/* Puts the included jQuery into our own namespace using noConflict and passing + * it 'true'. This ensures that the included jQuery doesn't pollute the global + * namespace (i.e. this preserves pre-existing values for both window.$ and + * window.jQuery). + */ +var yawdadmin = yawdadmin || {}; +yawdadmin.jQuery = jQuery.noConflict(true); \ No newline at end of file diff --git a/yawdadmin/static/admin/js/timeparse.js b/yawdadmin/static/admin/js/timeparse.js new file mode 100644 index 0000000..e41fa64 --- /dev/null +++ b/yawdadmin/static/admin/js/timeparse.js @@ -0,0 +1,106 @@ +(function() { + 'use strict'; + var timeParsePatterns = [ + // 9 + { + re: /^\d{1,2}$/i, + handler: function(bits) { + if (bits[0].length === 1) { + return '0' + bits[0] + ':00'; + } else { + return bits[0] + ':00'; + } + } + }, + // 13:00 + { + re: /^\d{2}[:.]\d{2}$/i, + handler: function(bits) { + return bits[0].replace('.', ':'); + } + }, + // 9:00 + { + re: /^\d[:.]\d{2}$/i, + handler: function(bits) { + return '0' + bits[0].replace('.', ':'); + } + }, + // 3 am / 3 a.m. / 3am + { + re: /^(\d+)\s*([ap])(?:.?m.?)?$/i, + handler: function(bits) { + var hour = parseInt(bits[1]); + if (hour === 12) { + hour = 0; + } + if (bits[2].toLowerCase() === 'p') { + if (hour === 12) { + hour = 0; + } + return (hour + 12) + ':00'; + } else { + if (hour < 10) { + return '0' + hour + ':00'; + } else { + return hour + ':00'; + } + } + } + }, + // 3.30 am / 3:15 a.m. / 3.00am + { + re: /^(\d+)[.:](\d{2})\s*([ap]).?m.?$/i, + handler: function(bits) { + var hour = parseInt(bits[1]); + var mins = parseInt(bits[2]); + if (mins < 10) { + mins = '0' + mins; + } + if (hour === 12) { + hour = 0; + } + if (bits[3].toLowerCase() === 'p') { + if (hour === 12) { + hour = 0; + } + return (hour + 12) + ':' + mins; + } else { + if (hour < 10) { + return '0' + hour + ':' + mins; + } else { + return hour + ':' + mins; + } + } + } + }, + // noon + { + re: /^no/i, + handler: function(bits) { + return '12:00'; + } + }, + // midnight + { + re: /^mid/i, + handler: function(bits) { + return '00:00'; + } + } + ]; + + function parseTimeString(s) { + for (var i = 0; i < timeParsePatterns.length; i++) { + var re = timeParsePatterns[i].re; + var handler = timeParsePatterns[i].handler; + var bits = re.exec(s); + if (bits) { + return handler(bits); + } + } + return s; + } + + window.parseTimeString = parseTimeString; +})(); \ No newline at end of file diff --git a/yawdadmin/static/admin/js/urlify.js b/yawdadmin/static/admin/js/urlify.js new file mode 100644 index 0000000..649b00c --- /dev/null +++ b/yawdadmin/static/admin/js/urlify.js @@ -0,0 +1,171 @@ +/*global XRegExp*/ +(function() { + 'use strict'; + + var LATIN_MAP = { + 'À': 'A', 'Á': 'A', 'Â': 'A', 'Ã': 'A', 'Ä': 'A', 'Å': 'A', 'Æ': 'AE', + 'Ç': 'C', 'È': 'E', 'É': 'E', 'Ê': 'E', 'Ë': 'E', 'Ì': 'I', 'Í': 'I', + 'Î': 'I', 'Ï': 'I', 'Ð': 'D', 'Ñ': 'N', 'Ò': 'O', 'Ó': 'O', 'Ô': 'O', + 'Õ': 'O', 'Ö': 'O', 'Ő': 'O', 'Ø': 'O', 'Ù': 'U', 'Ú': 'U', 'Û': 'U', + 'Ü': 'U', 'Ű': 'U', 'Ý': 'Y', 'Þ': 'TH', 'Ÿ': 'Y', 'ß': 'ss', 'à': 'a', + 'á': 'a', 'â': 'a', 'ã': 'a', 'ä': 'a', 'å': 'a', 'æ': 'ae', 'ç': 'c', + 'è': 'e', 'é': 'e', 'ê': 'e', 'ë': 'e', 'ì': 'i', 'í': 'i', 'î': 'i', + 'ï': 'i', 'ð': 'd', 'ñ': 'n', 'ò': 'o', 'ó': 'o', 'ô': 'o', 'õ': 'o', + 'ö': 'o', 'ő': 'o', 'ø': 'o', 'ù': 'u', 'ú': 'u', 'û': 'u', 'ü': 'u', + 'ű': 'u', 'ý': 'y', 'þ': 'th', 'ÿ': 'y' + }; + var LATIN_SYMBOLS_MAP = { + '©': '(c)' + }; + var GREEK_MAP = { + 'α': 'a', 'β': 'b', 'γ': 'g', 'δ': 'd', 'ε': 'e', 'ζ': 'z', 'η': 'h', + 'θ': '8', 'ι': 'i', 'κ': 'k', 'λ': 'l', 'μ': 'm', 'ν': 'n', 'ξ': '3', + 'ο': 'o', 'π': 'p', 'ρ': 'r', 'σ': 's', 'τ': 't', 'υ': 'y', 'φ': 'f', + 'χ': 'x', 'ψ': 'ps', 'ω': 'w', 'ά': 'a', 'έ': 'e', 'ί': 'i', 'ό': 'o', + 'ύ': 'y', 'ή': 'h', 'ώ': 'w', 'ς': 's', 'ϊ': 'i', 'ΰ': 'y', 'ϋ': 'y', + 'ΐ': 'i', 'Α': 'A', 'Β': 'B', 'Γ': 'G', 'Δ': 'D', 'Ε': 'E', 'Ζ': 'Z', + 'Η': 'H', 'Θ': '8', 'Ι': 'I', 'Κ': 'K', 'Λ': 'L', 'Μ': 'M', 'Ν': 'N', + 'Ξ': '3', 'Ο': 'O', 'Π': 'P', 'Ρ': 'R', 'Σ': 'S', 'Τ': 'T', 'Υ': 'Y', + 'Φ': 'F', 'Χ': 'X', 'Ψ': 'PS', 'Ω': 'W', 'Ά': 'A', 'Έ': 'E', 'Ί': 'I', + 'Ό': 'O', 'Ύ': 'Y', 'Ή': 'H', 'Ώ': 'W', 'Ϊ': 'I', 'Ϋ': 'Y' + }; + var TURKISH_MAP = { + 'ş': 's', 'Ş': 'S', 'ı': 'i', 'İ': 'I', 'ç': 'c', 'Ç': 'C', 'ü': 'u', + 'Ü': 'U', 'ö': 'o', 'Ö': 'O', 'ğ': 'g', 'Ğ': 'G' + }; + var ROMANIAN_MAP = { + 'ă': 'a', 'î': 'i', 'ș': 's', 'ț': 't', 'â': 'a', + 'Ă': 'A', 'Î': 'I', 'Ș': 'S', 'Ț': 'T', 'Â': 'A' + }; + var RUSSIAN_MAP = { + 'а': 'a', 'б': 'b', 'в': 'v', 'г': 'g', 'д': 'd', 'е': 'e', 'ё': 'yo', + 'ж': 'zh', 'з': 'z', 'и': 'i', 'й': 'j', 'к': 'k', 'л': 'l', 'м': 'm', + 'н': 'n', 'о': 'o', 'п': 'p', 'р': 'r', 'с': 's', 'т': 't', 'у': 'u', + 'ф': 'f', 'х': 'h', 'ц': 'c', 'ч': 'ch', 'ш': 'sh', 'щ': 'sh', 'ъ': '', + 'ы': 'y', 'ь': '', 'э': 'e', 'ю': 'yu', 'я': 'ya', + 'А': 'A', 'Б': 'B', 'В': 'V', 'Г': 'G', 'Д': 'D', 'Е': 'E', 'Ё': 'Yo', + 'Ж': 'Zh', 'З': 'Z', 'И': 'I', 'Й': 'J', 'К': 'K', 'Л': 'L', 'М': 'M', + 'Н': 'N', 'О': 'O', 'П': 'P', 'Р': 'R', 'С': 'S', 'Т': 'T', 'У': 'U', + 'Ф': 'F', 'Х': 'H', 'Ц': 'C', 'Ч': 'Ch', 'Ш': 'Sh', 'Щ': 'Sh', 'Ъ': '', + 'Ы': 'Y', 'Ь': '', 'Э': 'E', 'Ю': 'Yu', 'Я': 'Ya' + }; + var UKRAINIAN_MAP = { + 'Є': 'Ye', 'І': 'I', 'Ї': 'Yi', 'Ґ': 'G', 'є': 'ye', 'і': 'i', + 'ї': 'yi', 'ґ': 'g' + }; + var CZECH_MAP = { + 'č': 'c', 'ď': 'd', 'ě': 'e', 'ň': 'n', 'ř': 'r', 'š': 's', 'ť': 't', + 'ů': 'u', 'ž': 'z', 'Č': 'C', 'Ď': 'D', 'Ě': 'E', 'Ň': 'N', 'Ř': 'R', + 'Š': 'S', 'Ť': 'T', 'Ů': 'U', 'Ž': 'Z' + }; + var POLISH_MAP = { + 'ą': 'a', 'ć': 'c', 'ę': 'e', 'ł': 'l', 'ń': 'n', 'ó': 'o', 'ś': 's', + 'ź': 'z', 'ż': 'z', + 'Ą': 'A', 'Ć': 'C', 'Ę': 'E', 'Ł': 'L', 'Ń': 'N', 'Ó': 'O', 'Ś': 'S', + 'Ź': 'Z', 'Ż': 'Z' + }; + var LATVIAN_MAP = { + 'ā': 'a', 'č': 'c', 'ē': 'e', 'ģ': 'g', 'ī': 'i', 'ķ': 'k', 'ļ': 'l', + 'ņ': 'n', 'š': 's', 'ū': 'u', 'ž': 'z', + 'Ā': 'A', 'Č': 'C', 'Ē': 'E', 'Ģ': 'G', 'Ī': 'I', 'Ķ': 'K', 'Ļ': 'L', + 'Ņ': 'N', 'Š': 'S', 'Ū': 'U', 'Ž': 'Z' + }; + var ARABIC_MAP = { + 'أ': 'a', 'ب': 'b', 'ت': 't', 'ث': 'th', 'ج': 'g', 'ح': 'h', 'خ': 'kh', 'د': 'd', + 'ذ': 'th', 'ر': 'r', 'ز': 'z', 'س': 's', 'ش': 'sh', 'ص': 's', 'ض': 'd', 'ط': 't', + 'ظ': 'th', 'ع': 'aa', 'غ': 'gh', 'ف': 'f', 'ق': 'k', 'ك': 'k', 'ل': 'l', 'م': 'm', + 'ن': 'n', 'ه': 'h', 'و': 'o', 'ي': 'y' + }; + var LITHUANIAN_MAP = { + 'ą': 'a', 'č': 'c', 'ę': 'e', 'ė': 'e', 'į': 'i', 'š': 's', 'ų': 'u', + 'ū': 'u', 'ž': 'z', + 'Ą': 'A', 'Č': 'C', 'Ę': 'E', 'Ė': 'E', 'Į': 'I', 'Š': 'S', 'Ų': 'U', + 'Ū': 'U', 'Ž': 'Z' + }; + var SERBIAN_MAP = { + 'ђ': 'dj', 'ј': 'j', 'љ': 'lj', 'њ': 'nj', 'ћ': 'c', 'џ': 'dz', + 'đ': 'dj', 'Ђ': 'Dj', 'Ј': 'j', 'Љ': 'Lj', 'Њ': 'Nj', 'Ћ': 'C', + 'Џ': 'Dz', 'Đ': 'Dj' + }; + var AZERBAIJANI_MAP = { + 'ç': 'c', 'ə': 'e', 'ğ': 'g', 'ı': 'i', 'ö': 'o', 'ş': 's', 'ü': 'u', + 'Ç': 'C', 'Ə': 'E', 'Ğ': 'G', 'İ': 'I', 'Ö': 'O', 'Ş': 'S', 'Ü': 'U' + }; + + var ALL_DOWNCODE_MAPS = [ + LATIN_MAP, + LATIN_SYMBOLS_MAP, + GREEK_MAP, + TURKISH_MAP, + ROMANIAN_MAP, + RUSSIAN_MAP, + UKRAINIAN_MAP, + CZECH_MAP, + POLISH_MAP, + LATVIAN_MAP, + ARABIC_MAP, + LITHUANIAN_MAP, + SERBIAN_MAP, + AZERBAIJANI_MAP + ]; + + var Downcoder = { + 'Initialize': function() { + if (Downcoder.map) { // already made + return; + } + Downcoder.map = {}; + Downcoder.chars = []; + for (var i = 0; i < ALL_DOWNCODE_MAPS.length; i++) { + var lookup = ALL_DOWNCODE_MAPS[i]; + for (var c in lookup) { + if (lookup.hasOwnProperty(c)) { + Downcoder.map[c] = lookup[c]; + } + } + } + for (var k in Downcoder.map) { + if (Downcoder.map.hasOwnProperty(k)) { + Downcoder.chars.push(k); + } + } + Downcoder.regex = new RegExp(Downcoder.chars.join('|'), 'g'); + } + }; + + function downcode(slug) { + Downcoder.Initialize(); + return slug.replace(Downcoder.regex, function(m) { + return Downcoder.map[m]; + }); + } + + + function URLify(s, num_chars, allowUnicode) { + // changes, e.g., "Petty theft" to "petty-theft" + // remove all these words from the string before urlifying + if (!allowUnicode) { + s = downcode(s); + } + var removelist = [ + "a", "an", "as", "at", "before", "but", "by", "for", "from", "is", + "in", "into", "like", "of", "off", "on", "onto", "per", "since", + "than", "the", "this", "that", "to", "up", "via", "with" + ]; + var r = new RegExp('\\b(' + removelist.join('|') + ')\\b', 'gi'); + s = s.replace(r, ''); + // if downcode doesn't hit, the char will be stripped here + if (allowUnicode) { + // Keep Unicode letters including both lowercase and uppercase + // characters, whitespace, and dash; remove other characters. + s = XRegExp.replace(s, XRegExp('[^-_\\p{L}\\p{N}\\s]', 'g'), ''); + } else { + s = s.replace(/[^-\w\s]/g, ''); // remove unneeded chars + } + s = s.replace(/^\s+|\s+$/g, ''); // trim leading/trailing spaces + s = s.replace(/[-\s]+/g, '-'); // convert spaces to hyphens + s = s.toLowerCase(); // convert to lowercase + return s.substring(0, num_chars); // trim to first num_chars chars + } + window.URLify = URLify; +})(); \ No newline at end of file From 447c48ace173e1df8f1f08ae6cdda68a2c9e99df Mon Sep 17 00:00:00 2001 From: mwolff44 Date: Wed, 1 Jun 2016 11:31:45 +0200 Subject: [PATCH 33/34] js update --- yawdadmin/static/admin/js/SelectFilter2.js | 339 +++++----- yawdadmin/static/admin/js/actions.js | 274 ++++---- yawdadmin/static/admin/js/actions.min.js | 1 - .../admin/js/admin/DateTimeShortcuts.js | 608 ++++++++++-------- yawdadmin/static/admin/js/inlines.js | 509 +++++++-------- yawdadmin/static/admin/js/inlines.min.js | 10 +- yawdadmin/static/admin/js/prepopulate.js | 46 +- yawdadmin/static/admin/js/prepopulate.min.js | 2 +- 8 files changed, 938 insertions(+), 851 deletions(-) delete mode 100644 yawdadmin/static/admin/js/actions.min.js diff --git a/yawdadmin/static/admin/js/SelectFilter2.js b/yawdadmin/static/admin/js/SelectFilter2.js index 507e180..5d013e3 100644 --- a/yawdadmin/static/admin/js/SelectFilter2.js +++ b/yawdadmin/static/admin/js/SelectFilter2.js @@ -1,168 +1,197 @@ +/*global SelectBox, addEvent, gettext, interpolate, quickElement, SelectFilter*/ /* SelectFilter2 - Turns a multiple-select box into a filter interface. - Requires core.js, SelectBox.js and addevent.js. */ (function($) { -function findForm(node) { - // returns the node of the form containing the given node - if (node.tagName.toLowerCase() != 'form') { - return findForm(node.parentNode); - } - return node; -} - -window.SelectFilter = { - init: function(field_id, field_name, is_stacked, admin_static_prefix) { - if (field_id.match(/__prefix__/)){ - // Don't intialize on empty forms. - return; - } - var from_box = document.getElementById(field_id); - from_box.id += '_from'; // change its ID - from_box.className = 'filtered'; - - var ps = from_box.parentNode.getElementsByTagName('p'); - for (var i=0; i, because it just gets in the way. - from_box.parentNode.removeChild(ps[i]); - } else if (ps[i].className.indexOf("help") != -1) { - // Move help text up to the top so it isn't below the select - // boxes or wrapped off on the side to the right of the add - // button: - from_box.parentNode.insertBefore(ps[i], from_box.parentNode.firstChild); - } + 'use strict'; + function findForm(node) { + // returns the node of the form containing the given node + if (node.tagName.toLowerCase() !== 'form') { + return findForm(node.parentNode); } + return node; + } - //
    or
    - var selector_div = quickElement('div', from_box.parentNode); - selector_div.className = is_stacked ? 'selector stacked' : 'selector'; - - //
    - var selector_available = quickElement('div', selector_div, ''); - selector_available.className = 'selector-available'; - var title_available = quickElement('h2', selector_available, interpolate(gettext('Available %s') + ' ', [field_name])); - - var ic = quickElement('i', title_available, '', 'class', 'help help-tooltip icon-question-sign icon-white', 'data-placement', 'bottom', 'data-original-title', interpolate(gettext('Help text')), 'data-content', interpolate(gettext('This is the list of available %s. You may choose some by selecting them in the box below and then clicking the "Choose" arrow between the two boxes.'), [field_name])); - $(ic).popover({trigger : 'click'}); - - var filter_p = quickElement('p', selector_available, '', 'id', field_id + '_filter'); - filter_p.className = 'selector-filter'; - - var search_filter_label = quickElement('label', filter_p, '', 'for', field_id + "_input"); - - var search_selector_img = quickElement('img', search_filter_label, '', 'src', admin_static_prefix + 'img/selector-search.gif', 'class', 'help-tooltip', 'alt', '', 'title', interpolate(gettext("Type into this box to filter down the list of available %s."), [field_name])); - - filter_p.appendChild(document.createTextNode(' ')); - - var filter_input = quickElement('input', filter_p, '', 'type', 'text', 'placeholder', gettext("Filter")); - filter_input.id = field_id + '_input'; - - selector_available.appendChild(from_box); - var choose_all = quickElement('a', selector_available, gettext('Choose all'), 'title', interpolate(gettext('Click to choose all %s at once.'), [field_name]), 'href', 'javascript: (function(){ SelectBox.move_all("' + field_id + '_from", "' + field_id + '_to"); SelectFilter.refresh_icons("' + field_id + '");})()', 'id', field_id + '_add_all_link'); - choose_all.className = 'selector-chooseall'; - - //
      - var selector_chooser = quickElement('ul', selector_div, ''); - selector_chooser.className = 'selector-chooser'; - var add_link = quickElement('a', quickElement('li', selector_chooser, ''), '', 'title', gettext('Choose'), 'href', 'javascript: (function(){ SelectBox.move("' + field_id + '_from","' + field_id + '_to"); SelectFilter.refresh_icons("' + field_id + '");})()', 'id', field_id + '_add_link'); - add_link.className = 'selector-add'; - $(add_link).append(''); - - var remove_link = quickElement('a', quickElement('li', selector_chooser, ''), '', 'title', gettext('Remove'), 'href', 'javascript: (function(){ SelectBox.move("' + field_id + '_to","' + field_id + '_from"); SelectFilter.refresh_icons("' + field_id + '");})()', 'id', field_id + '_remove_link'); - remove_link.className = 'selector-remove'; - $(remove_link).append(''); - - //
      - var selector_chosen = quickElement('div', selector_div, ''); - selector_chosen.className = 'selector-chosen'; - var title_chosen = quickElement('h2', selector_chosen, interpolate(gettext('Chosen %s') + ' ', [field_name])); - - var ic2 = quickElement('i', title_chosen, '', 'class', 'help help-tooltip icon-question-sign icon-white', 'data-placement', 'bottom', 'data-original-title', interpolate(gettext('Help text')), 'data-content', interpolate(gettext('This is the list of chosen %s. You may remove some by selecting them in the box below and then clicking the "Remove" arrow between the two boxes.'), [field_name])); - $(ic2).popover({trigger : 'click'}); - - var to_box = quickElement('select', selector_chosen, '', 'id', field_id + '_to', 'multiple', 'multiple', 'size', from_box.size, 'name', from_box.getAttribute('name')); - to_box.className = 'filtered'; - var clear_all = quickElement('a', selector_chosen, gettext('Remove all'), 'title', interpolate(gettext('Click to remove all chosen %s at once.'), [field_name]), 'href', 'javascript: (function() { SelectBox.move_all("' + field_id + '_to", "' + field_id + '_from"); SelectFilter.refresh_icons("' + field_id + '");})()', 'id', field_id + '_remove_all_link'); - clear_all.className = 'selector-clearall'; - - from_box.setAttribute('name', from_box.getAttribute('name') + '_old'); - - // Set up the JavaScript event handlers for the select box filter interface - addEvent(filter_input, 'keyup', function(e) { SelectFilter.filter_key_up(e, field_id); }); - addEvent(filter_input, 'keydown', function(e) { SelectFilter.filter_key_down(e, field_id); }); - addEvent(from_box, 'change', function(e) { SelectFilter.refresh_icons(field_id) }); - addEvent(to_box, 'change', function(e) { SelectFilter.refresh_icons(field_id) }); - addEvent(from_box, 'dblclick', function() { SelectBox.move(field_id + '_from', field_id + '_to'); SelectFilter.refresh_icons(field_id); }); - addEvent(to_box, 'dblclick', function() { SelectBox.move(field_id + '_to', field_id + '_from'); SelectFilter.refresh_icons(field_id); }); - addEvent(findForm(from_box), 'submit', function() { SelectBox.select_all(field_id + '_to'); }); - SelectBox.init(field_id + '_from'); - SelectBox.init(field_id + '_to'); - // Move selected from_box options to to_box - SelectBox.move(field_id + '_from', field_id + '_to'); - - if (!is_stacked) { - // In horizontal mode, give the same height to the two boxes. - var j_from_box = $(from_box); - var j_to_box = $(to_box); - var resize_filters = function() { j_to_box.height($(filter_p).outerHeight() + j_from_box.outerHeight()); } - if (j_from_box.outerHeight() > 0) { - resize_filters(); // This fieldset is already open. Resize now. - } else { - // This fieldset is probably collapsed. Wait for its 'show' event. - j_to_box.closest('fieldset').one('show.fieldset', resize_filters); + window.SelectFilter = { + init: function(field_id, field_name, is_stacked) { + if (field_id.match(/__prefix__/)) { + // Don't initialize on empty forms. + return; + } + var from_box = document.getElementById(field_id); + from_box.id += '_from'; // change its ID + from_box.className = 'filtered'; + + var ps = from_box.parentNode.getElementsByTagName('p'); + for (var i = 0; i < ps.length; i++) { + if (ps[i].className.indexOf("info") !== -1) { + // Remove

      , because it just gets in the way. + from_box.parentNode.removeChild(ps[i]); + } else if (ps[i].className.indexOf("help") !== -1) { + // Move help text up to the top so it isn't below the select + // boxes or wrapped off on the side to the right of the add + // button: + from_box.parentNode.insertBefore(ps[i], from_box.parentNode.firstChild); + } } - } - // Initial icon refresh - SelectFilter.refresh_icons(field_id); - }, - refresh_icons: function(field_id) { - var from = $('#' + field_id + '_from'); - var to = $('#' + field_id + '_to'); - var is_from_selected = from.find('option:selected').length > 0; - var is_to_selected = to.find('option:selected').length > 0; - // Active if at least one item is selected - $('#' + field_id + '_add_link').toggleClass('active', is_from_selected); - $('#' + field_id + '_remove_link').toggleClass('active', is_to_selected); - // Active if the corresponding box isn't empty - $('#' + field_id + '_add_all_link').toggleClass('active', from.find('option').length > 0); - $('#' + field_id + '_remove_all_link').toggleClass('active', to.find('option').length > 0); - }, - filter_key_up: function(event, field_id) { - var from = document.getElementById(field_id + '_from'); - // don't submit form if user pressed Enter - if ((event.which && event.which == 13) || (event.keyCode && event.keyCode == 13)) { - from.selectedIndex = 0; + //

      or
      + var selector_div = quickElement('div', from_box.parentNode); + selector_div.className = is_stacked ? 'selector stacked' : 'selector'; + + //
      + var selector_available = quickElement('div', selector_div); + selector_available.className = 'selector-available'; + var title_available = quickElement('h2', selector_available, interpolate(gettext('Available %s') + ' ', [field_name])); + quickElement( + 'span', title_available, '', + 'class', 'help help-tooltip help-icon', + 'title', interpolate( + gettext( + 'This is the list of available %s. You may choose some by ' + + 'selecting them in the box below and then clicking the ' + + '"Choose" arrow between the two boxes.' + ), + [field_name] + ) + ); + + var filter_p = quickElement('p', selector_available, '', 'id', field_id + '_filter'); + filter_p.className = 'selector-filter'; + + var search_filter_label = quickElement('label', filter_p, '', 'for', field_id + '_input'); + + quickElement( + 'span', search_filter_label, '', + 'class', 'help-tooltip search-label-icon', + 'title', interpolate(gettext("Type into this box to filter down the list of available %s."), [field_name]) + ); + + filter_p.appendChild(document.createTextNode(' ')); + + var filter_input = quickElement('input', filter_p, '', 'type', 'text', 'placeholder', gettext("Filter")); + filter_input.id = field_id + '_input'; + + selector_available.appendChild(from_box); + var choose_all = quickElement('a', selector_available, gettext('Choose all'), 'title', interpolate(gettext('Click to choose all %s at once.'), [field_name]), 'href', 'javascript:void(0);', 'id', field_id + '_add_all_link'); + choose_all.className = 'selector-chooseall'; + + //
        + var selector_chooser = quickElement('ul', selector_div); + selector_chooser.className = 'selector-chooser'; + var add_link = quickElement('a', quickElement('li', selector_chooser), gettext('Choose'), 'title', gettext('Choose'), 'href', 'javascript:void(0);', 'id', field_id + '_add_link'); + add_link.className = 'selector-add'; + var remove_link = quickElement('a', quickElement('li', selector_chooser), gettext('Remove'), 'title', gettext('Remove'), 'href', 'javascript:void(0);', 'id', field_id + '_remove_link'); + remove_link.className = 'selector-remove'; + + //
        + var selector_chosen = quickElement('div', selector_div); + selector_chosen.className = 'selector-chosen'; + var title_chosen = quickElement('h2', selector_chosen, interpolate(gettext('Chosen %s') + ' ', [field_name])); + quickElement( + 'span', title_chosen, '', + 'class', 'help help-tooltip help-icon', + 'title', interpolate( + gettext( + 'This is the list of chosen %s. You may remove some by ' + + 'selecting them in the box below and then clicking the ' + + '"Remove" arrow between the two boxes.' + ), + [field_name] + ) + ); + + var to_box = quickElement('select', selector_chosen, '', 'id', field_id + '_to', 'multiple', 'multiple', 'size', from_box.size, 'name', from_box.getAttribute('name')); + to_box.className = 'filtered'; + var clear_all = quickElement('a', selector_chosen, gettext('Remove all'), 'title', interpolate(gettext('Click to remove all chosen %s at once.'), [field_name]), 'href', 'javascript:void(0);', 'id', field_id + '_remove_all_link'); + clear_all.className = 'selector-clearall'; + + from_box.setAttribute('name', from_box.getAttribute('name') + '_old'); + + // Set up the JavaScript event handlers for the select box filter interface + addEvent(choose_all, 'click', function() { SelectBox.move_all(field_id + '_from', field_id + '_to'); SelectFilter.refresh_icons(field_id); }); + addEvent(add_link, 'click', function() { SelectBox.move(field_id + '_from', field_id + '_to'); SelectFilter.refresh_icons(field_id); }); + addEvent(remove_link, 'click', function() { SelectBox.move(field_id + '_to', field_id + '_from'); SelectFilter.refresh_icons(field_id); }); + addEvent(clear_all, 'click', function() { SelectBox.move_all(field_id + '_to', field_id + '_from'); SelectFilter.refresh_icons(field_id); }); + addEvent(filter_input, 'keypress', function(e) { SelectFilter.filter_key_press(e, field_id); }); + addEvent(filter_input, 'keyup', function(e) { SelectFilter.filter_key_up(e, field_id); }); + addEvent(filter_input, 'keydown', function(e) { SelectFilter.filter_key_down(e, field_id); }); + addEvent(from_box, 'change', function(e) { SelectFilter.refresh_icons(field_id); }); + addEvent(to_box, 'change', function(e) { SelectFilter.refresh_icons(field_id); }); + addEvent(from_box, 'dblclick', function() { SelectBox.move(field_id + '_from', field_id + '_to'); SelectFilter.refresh_icons(field_id); }); + addEvent(to_box, 'dblclick', function() { SelectBox.move(field_id + '_to', field_id + '_from'); SelectFilter.refresh_icons(field_id); }); + addEvent(findForm(from_box), 'submit', function() { SelectBox.select_all(field_id + '_to'); }); + SelectBox.init(field_id + '_from'); + SelectBox.init(field_id + '_to'); + // Move selected from_box options to to_box SelectBox.move(field_id + '_from', field_id + '_to'); - from.selectedIndex = 0; - return false; - } - var temp = from.selectedIndex; - SelectBox.filter(field_id + '_from', document.getElementById(field_id + '_input').value); - from.selectedIndex = temp; - return true; - }, - filter_key_down: function(event, field_id) { - var from = document.getElementById(field_id + '_from'); - // right arrow -- move across - if ((event.which && event.which == 39) || (event.keyCode && event.keyCode == 39)) { - var old_index = from.selectedIndex; - SelectBox.move(field_id + '_from', field_id + '_to'); - from.selectedIndex = (old_index == from.length) ? from.length - 1 : old_index; - return false; - } - // down arrow -- wrap around - if ((event.which && event.which == 40) || (event.keyCode && event.keyCode == 40)) { - from.selectedIndex = (from.length == from.selectedIndex + 1) ? 0 : from.selectedIndex + 1; - } - // up arrow -- wrap around - if ((event.which && event.which == 38) || (event.keyCode && event.keyCode == 38)) { - from.selectedIndex = (from.selectedIndex == 0) ? from.length - 1 : from.selectedIndex - 1; + + if (!is_stacked) { + // In horizontal mode, give the same height to the two boxes. + var j_from_box = $(from_box); + var j_to_box = $(to_box); + var resize_filters = function() { j_to_box.height($(filter_p).outerHeight() + j_from_box.outerHeight()); }; + if (j_from_box.outerHeight() > 0) { + resize_filters(); // This fieldset is already open. Resize now. + } else { + // This fieldset is probably collapsed. Wait for its 'show' event. + j_to_box.closest('fieldset').one('show.fieldset', resize_filters); + } + } + + // Initial icon refresh + SelectFilter.refresh_icons(field_id); + }, + refresh_icons: function(field_id) { + var from = $('#' + field_id + '_from'); + var to = $('#' + field_id + '_to'); + var is_from_selected = from.find('option:selected').length > 0; + var is_to_selected = to.find('option:selected').length > 0; + // Active if at least one item is selected + $('#' + field_id + '_add_link').toggleClass('active', is_from_selected); + $('#' + field_id + '_remove_link').toggleClass('active', is_to_selected); + // Active if the corresponding box isn't empty + $('#' + field_id + '_add_all_link').toggleClass('active', from.find('option').length > 0); + $('#' + field_id + '_remove_all_link').toggleClass('active', to.find('option').length > 0); + }, + filter_key_press: function(event, field_id) { + var from = document.getElementById(field_id + '_from'); + // don't submit form if user pressed Enter + if ((event.which && event.which === 13) || (event.keyCode && event.keyCode === 13)) { + from.selectedIndex = 0; + SelectBox.move(field_id + '_from', field_id + '_to'); + from.selectedIndex = 0; + event.preventDefault(); + return false; + } + }, + filter_key_up: function(event, field_id) { + var from = document.getElementById(field_id + '_from'); + var temp = from.selectedIndex; + SelectBox.filter(field_id + '_from', document.getElementById(field_id + '_input').value); + from.selectedIndex = temp; + return true; + }, + filter_key_down: function(event, field_id) { + var from = document.getElementById(field_id + '_from'); + // right arrow -- move across + if ((event.which && event.which === 39) || (event.keyCode && event.keyCode === 39)) { + var old_index = from.selectedIndex; + SelectBox.move(field_id + '_from', field_id + '_to'); + from.selectedIndex = (old_index === from.length) ? from.length - 1 : old_index; + return false; + } + // down arrow -- wrap around + if ((event.which && event.which === 40) || (event.keyCode && event.keyCode === 40)) { + from.selectedIndex = (from.length === from.selectedIndex + 1) ? 0 : from.selectedIndex + 1; + } + // up arrow -- wrap around + if ((event.which && event.which === 38) || (event.keyCode && event.keyCode === 38)) { + from.selectedIndex = (from.selectedIndex === 0) ? from.length - 1 : from.selectedIndex - 1; + } + return true; } - return true; - } -} + }; })(yawdadmin.jQuery); \ No newline at end of file diff --git a/yawdadmin/static/admin/js/actions.js b/yawdadmin/static/admin/js/actions.js index 329b7a2..34b574b 100644 --- a/yawdadmin/static/admin/js/actions.js +++ b/yawdadmin/static/admin/js/actions.js @@ -1,132 +1,146 @@ +/*global _actions_icnt, gettext, interpolate, ngettext*/ (function($) { - $.fn.actions = function(opts) { - var options = $.extend({}, $.fn.actions.defaults, opts); - var actionCheckboxes = $(this); - var list_editable_changed = false; - var checker = function(checked) { - if (checked) { - showQuestion(); - } else { - reset(); - } - $(actionCheckboxes).attr("checked", checked) - .parent().parent().toggleClass(options.selectedClass, checked); - }, - updateCounter = function() { - var sel = $(actionCheckboxes).filter(":checked").length; - $(options.counterContainer).html(interpolate( - ngettext('%(sel)s of %(cnt)s selected', '%(sel)s of %(cnt)s selected', sel), { - sel: sel, - cnt: _actions_icnt - }, true)); - $(options.allToggle).attr("checked", function() { - if (sel == actionCheckboxes.length) { - value = true; - showQuestion(); - } else { - value = false; - clearAcross(); - } - return value; - }); - }, - showQuestion = function() { - $(options.acrossClears).hide(); - $(options.acrossQuestions).show(); - $(options.allContainer).hide(); - }, - showClear = function() { - $(options.acrossClears).show(); - $(options.acrossQuestions).hide(); - $(options.actionContainer).toggleClass(options.selectedClass); - $(options.allContainer).show(); - $(options.counterContainer).hide(); - }, - reset = function() { - $(options.acrossClears).hide(); - $(options.acrossQuestions).hide(); - $(options.allContainer).hide(); - $(options.counterContainer).show(); - }, - clearAcross = function() { - reset(); - $(options.acrossInput).val(0); - $(options.actionContainer).removeClass(options.selectedClass); - }; - // Show counter by default - $(options.counterContainer).show(); - // Check state of checkboxes and reinit state if needed - $(this).filter(":checked").each(function(i) { - $(this).parent().parent().toggleClass(options.selectedClass); - updateCounter(); - if ($(options.acrossInput).val() == 1) { - showClear(); - } - }); - $(options.allToggle).show().click(function() { - checker($(this).is(':checked')); - updateCounter(); - }); - $("div.actions span.question a").click(function(event) { - event.preventDefault(); - $(options.acrossInput).val(1); - showClear(); - }); - $("div.actions span.clear a").click(function(event) { - event.preventDefault(); - $(options.allToggle).attr("checked", false); - clearAcross(); - checker(0); - updateCounter(); - }); - lastChecked = null; - $(actionCheckboxes).click(function(event) { - if (!event) { event = window.event; } - var target = event.target ? event.target : event.srcElement; - if (lastChecked && $.data(lastChecked) != $.data(target) && event.shiftKey === true) { - var inrange = false; - $(lastChecked).attr("checked", target.checked) - .parent().parent().toggleClass(options.selectedClass, target.checked); - $(actionCheckboxes).each(function() { - if ($.data(this) == $.data(lastChecked) || $.data(this) == $.data(target)) { - inrange = (inrange) ? false : true; - } - if (inrange) { - $(this).attr("checked", target.checked) - .parent().parent().toggleClass(options.selectedClass, target.checked); - } - }); - } - $(target).parent().parent().toggleClass(options.selectedClass, target.checked); - lastChecked = target; - updateCounter(); - }); - $('form#changelist-form table#result_list tr').find('td:gt(0) :input').change(function() { - list_editable_changed = true; - }); - $(options.actionContainer + ' .action-option a').click(function(event) { - if (list_editable_changed) { - confirm(gettext("You have unsaved changes on individual editable fields. If you run an action, your unsaved changes will be lost.")); - } else { - $(options.actionContainer + ' select[name="action"]').val($(this).attr('href').replace('#','')); - $(options.actionContainer + ' .action-wrapper').removeClass('open'); - $(options.actionContainer + ' input[name="index"]').prop('checked', true); - $(options.actionLoader).removeClass('hidden'); - $('form#changelist-form').submit(); - } - return false; - }); - }; - /* Setup plugin defaults */ - $.fn.actions.defaults = { - actionContainer: "div.actions", - counterContainer: "span.action-counter", - allContainer: "div.actions span.all", - acrossInput: "div.actions input.select-across", - acrossQuestions: "div.actions span.question", - acrossClears: "div.actions span.clear", - allToggle: "#action-toggle", - selectedClass: "selected", - actionLoader: ".actions-loader" - }; + 'use strict'; + var lastChecked; + + $.fn.actions = function(opts) { + var options = $.extend({}, $.fn.actions.defaults, opts); + var actionCheckboxes = $(this); + var list_editable_changed = false; + var showQuestion = function() { + $(options.acrossClears).hide(); + $(options.acrossQuestions).show(); + $(options.allContainer).hide(); + }, + showClear = function() { + $(options.acrossClears).show(); + $(options.acrossQuestions).hide(); + $(options.actionContainer).toggleClass(options.selectedClass); + $(options.allContainer).show(); + $(options.counterContainer).hide(); + }, + reset = function() { + $(options.acrossClears).hide(); + $(options.acrossQuestions).hide(); + $(options.allContainer).hide(); + $(options.counterContainer).show(); + }, + clearAcross = function() { + reset(); + $(options.acrossInput).val(0); + $(options.actionContainer).removeClass(options.selectedClass); + }, + checker = function(checked) { + if (checked) { + showQuestion(); + } else { + reset(); + } + $(actionCheckboxes).prop("checked", checked) + .parent().parent().toggleClass(options.selectedClass, checked); + }, + updateCounter = function() { + var sel = $(actionCheckboxes).filter(":checked").length; + // _actions_icnt is defined in the generated HTML + // and contains the total amount of objects in the queryset + $(options.counterContainer).html(interpolate( + ngettext('%(sel)s of %(cnt)s selected', '%(sel)s of %(cnt)s selected', sel), { + sel: sel, + cnt: _actions_icnt + }, true)); + $(options.allToggle).prop("checked", function() { + var value; + if (sel === actionCheckboxes.length) { + value = true; + showQuestion(); + } else { + value = false; + clearAcross(); + } + return value; + }); + }; + // Show counter by default + $(options.counterContainer).show(); + // Check state of checkboxes and reinit state if needed + $(this).filter(":checked").each(function(i) { + $(this).parent().parent().toggleClass(options.selectedClass); + updateCounter(); + if ($(options.acrossInput).val() === 1) { + showClear(); + } + }); + $(options.allToggle).show().click(function() { + checker($(this).prop("checked")); + updateCounter(); + }); + $("a", options.acrossQuestions).click(function(event) { + event.preventDefault(); + $(options.acrossInput).val(1); + showClear(); + }); + $("a", options.acrossClears).click(function(event) { + event.preventDefault(); + $(options.allToggle).prop("checked", false); + clearAcross(); + checker(0); + updateCounter(); + }); + lastChecked = null; + $(actionCheckboxes).click(function(event) { + if (!event) { event = window.event; } + var target = event.target ? event.target : event.srcElement; + if (lastChecked && $.data(lastChecked) !== $.data(target) && event.shiftKey === true) { + var inrange = false; + $(lastChecked).prop("checked", target.checked) + .parent().parent().toggleClass(options.selectedClass, target.checked); + $(actionCheckboxes).each(function() { + if ($.data(this) === $.data(lastChecked) || $.data(this) === $.data(target)) { + inrange = (inrange) ? false : true; + } + if (inrange) { + $(this).prop("checked", target.checked) + .parent().parent().toggleClass(options.selectedClass, target.checked); + } + }); + } + $(target).parent().parent().toggleClass(options.selectedClass, target.checked); + lastChecked = target; + updateCounter(); + }); + $('form#changelist-form table#result_list tr').find('td:gt(0) :input').change(function() { + list_editable_changed = true; + }); + $('form#changelist-form button[name="index"]').click(function(event) { + if (list_editable_changed) { + return confirm(gettext("You have unsaved changes on individual editable fields. If you run an action, your unsaved changes will be lost.")); + } + }); + $('form#changelist-form input[name="_save"]').click(function(event) { + var action_changed = false; + $('select option:selected', options.actionContainer).each(function() { + if ($(this).val()) { + action_changed = true; + } + }); + if (action_changed) { + if (list_editable_changed) { + return confirm(gettext("You have selected an action, but you haven't saved your changes to individual fields yet. Please click OK to save. You'll need to re-run the action.")); + } else { + return confirm(gettext("You have selected an action, and you haven't made any changes on individual fields. You're probably looking for the Go button rather than the Save button.")); + } + } + }); + }; + /* Setup plugin defaults */ + $.fn.actions.defaults = { + actionContainer: "div.actions", + counterContainer: "span.action-counter", + allContainer: "div.actions span.all", + acrossInput: "div.actions input.select-across", + acrossQuestions: "div.actions span.question", + acrossClears: "div.actions span.clear", + allToggle: "#action-toggle", + selectedClass: "selected" + }; })(yawdadmin.jQuery); \ No newline at end of file diff --git a/yawdadmin/static/admin/js/actions.min.js b/yawdadmin/static/admin/js/actions.min.js deleted file mode 100644 index 688b702..0000000 --- a/yawdadmin/static/admin/js/actions.min.js +++ /dev/null @@ -1 +0,0 @@ -(function(a){a.fn.actions=function(b){var k=a.extend({},a.fn.actions.defaults,b);var c=a(this);var f=false;var e=function(l){if(l){j()}else{i()}a(c).attr("checked",l).parent().parent().toggleClass(k.selectedClass,l)},g=function(){var l=a(c).filter(":checked").length;a(k.counterContainer).html(interpolate(ngettext("%(sel)s of %(cnt)s selected","%(sel)s of %(cnt)s selected",l),{sel:l,cnt:_actions_icnt},true));a(k.allToggle).attr("checked",function(){if(l==c.length){value=true;j()}else{value=false;h()}return value})},j=function(){a(k.acrossClears).hide();a(k.acrossQuestions).show();a(k.allContainer).hide()},d=function(){a(k.acrossClears).show();a(k.acrossQuestions).hide();a(k.actionContainer).toggleClass(k.selectedClass);a(k.allContainer).show();a(k.counterContainer).hide()},i=function(){a(k.acrossClears).hide();a(k.acrossQuestions).hide();a(k.allContainer).hide();a(k.counterContainer).show()},h=function(){i();a(k.acrossInput).val(0);a(k.actionContainer).removeClass(k.selectedClass)};a(k.counterContainer).show();a(this).filter(":checked").each(function(l){a(this).parent().parent().toggleClass(k.selectedClass);g();if(a(k.acrossInput).val()==1){d()}});a(k.allToggle).show().click(function(){e(a(this).is(":checked"));g()});a("div.actions span.question a").click(function(l){l.preventDefault();a(k.acrossInput).val(1);d()});a("div.actions span.clear a").click(function(l){l.preventDefault();a(k.allToggle).attr("checked",false);h();e(0);g()});lastChecked=null;a(c).click(function(m){if(!m){m=window.event}var n=m.target?m.target:m.srcElement;if(lastChecked&&a.data(lastChecked)!=a.data(n)&&m.shiftKey===true){var l=false;a(lastChecked).attr("checked",n.checked).parent().parent().toggleClass(k.selectedClass,n.checked);a(c).each(function(){if(a.data(this)==a.data(lastChecked)||a.data(this)==a.data(n)){l=(l)?false:true}if(l){a(this).attr("checked",n.checked).parent().parent().toggleClass(k.selectedClass,n.checked)}})}a(n).parent().parent().toggleClass(k.selectedClass,n.checked);lastChecked=n;g()});a("form#changelist-form table#result_list tr").find("td:gt(0) :input").change(function(){f=true});a(k.actionContainer+" .action-option a").click(function(l){if(f){confirm(gettext("You have unsaved changes on individual editable fields. If you run an action, your unsaved changes will be lost."))}else{a(k.actionContainer+' select[name="action"]').val(a(this).attr("href").replace("#",""));a(k.actionContainer+" .action-wrapper").removeClass("open");a(k.actionContainer+' input[name="index"]').prop("checked",true);a(k.actionLoader).removeClass("hidden");a("form#changelist-form").submit()}return false})};a.fn.actions.defaults={actionContainer:"div.actions",counterContainer:"span.action-counter",allContainer:"div.actions span.all",acrossInput:"div.actions input.select-across",acrossQuestions:"div.actions span.question",acrossClears:"div.actions span.clear",allToggle:"#action-toggle",selectedClass:"selected",actionLoader:".actions-loader"}})(yawdadmin.jQuery); \ No newline at end of file diff --git a/yawdadmin/static/admin/js/admin/DateTimeShortcuts.js b/yawdadmin/static/admin/js/admin/DateTimeShortcuts.js index 7660537..5ea29fb 100644 --- a/yawdadmin/static/admin/js/admin/DateTimeShortcuts.js +++ b/yawdadmin/static/admin/js/admin/DateTimeShortcuts.js @@ -1,302 +1,364 @@ +/*global addEvent, Calendar, cancelEventPropagation, findPosX, findPosY, getStyle, get_format, gettext, interpolate, ngettext, quickElement, removeEvent*/ // Inserts shortcut buttons after all of the following: // // +(function() { + 'use strict'; + var DateTimeShortcuts = { + calendars: [], + calendarInputs: [], + clockInputs: [], + dismissClockFunc: [], + dismissCalendarFunc: [], + calendarDivName1: 'calendarbox', // name of calendar
        that gets toggled + calendarDivName2: 'calendarin', // name of
        that contains calendar + calendarLinkName: 'calendarlink',// name of the link that is used to toggle + clockDivName: 'clockbox', // name of clock
        that gets toggled + clockLinkName: 'clocklink', // name of the link that is used to toggle + shortCutsClass: 'datetimeshortcuts', // class of the clock and cal shortcuts + timezoneWarningClass: 'timezonewarning', // class of the warning for timezone mismatch + timezoneOffset: 0, + init: function() { + var body = document.getElementsByTagName('body')[0]; + var serverOffset = body.getAttribute('data-admin-utc-offset'); + if (serverOffset) { + var localOffset = new Date().getTimezoneOffset() * -60; + DateTimeShortcuts.timezoneOffset = localOffset - serverOffset; + } -var findPosXRel = function(el) { - $el = yawdadmin.jQuery(el); - if ($el.closest('.modal, body').prop("tagName").toLowerCase() == 'body') return findPosX(el); - return $el.position().left; -} - -var findPosYRel = function(el) { - $el = yawdadmin.jQuery(el); - $closest = $el.closest('.modal, body'); - if ($closest.prop("tagName").toLowerCase() == 'body') return findPosY(el); - return $el.position().top + $closest.find('.modal-header').height() + 18; -} + var inputs = document.getElementsByTagName('input'); + for (var i = 0; i < inputs.length; i++) { + var inp = inputs[i]; + if (inp.getAttribute('type') === 'text' && inp.className.match(/vTimeField/)) { + DateTimeShortcuts.addClock(inp); + DateTimeShortcuts.addTimezoneWarning(inp); + } + else if (inp.getAttribute('type') === 'text' && inp.className.match(/vDateField/)) { + DateTimeShortcuts.addCalendar(inp); + DateTimeShortcuts.addTimezoneWarning(inp); + } + } + }, + // Return the current time while accounting for the server timezone. + now: function() { + var body = document.getElementsByTagName('body')[0]; + var serverOffset = body.getAttribute('data-admin-utc-offset'); + if (serverOffset) { + var localNow = new Date(); + var localOffset = localNow.getTimezoneOffset() * -60; + localNow.setTime(localNow.getTime() + 1000 * (serverOffset - localOffset)); + return localNow; + } else { + return new Date(); + } + }, + // Add a warning when the time zone in the browser and backend do not match. + addTimezoneWarning: function(inp) { + var $ = yawdadmin.jQuery; + var warningClass = DateTimeShortcuts.timezoneWarningClass; + var timezoneOffset = DateTimeShortcuts.timezoneOffset / 3600; + // Only warn if there is a time zone mismatch. + if (!timezoneOffset) { + return; + } -var DateTimeShortcuts = { - calendars: [], - calendarInputs: [], - clockInputs: [], - calendarDivName1: 'calendarbox', // name of calendar
        that gets toggled - calendarDivName2: 'calendarin', // name of
        that contains calendar - calendarLinkName: 'calendarlink',// name of the link that is used to toggle - clockDivName: 'clockbox', // name of clock
        that gets toggled - clockLinkName: 'clocklink', // name of the link that is used to toggle - shortCutsClass: 'datetimeshortcuts', // class of the clock and cal shortcuts - admin_media_prefix: '', - init: function() { - // Get admin_media_prefix by grabbing it off the window object. It's - // set in the admin/base.html template, so if it's not there, someone's - // overridden the template. In that case, we'll set a clearly-invalid - // value in the hopes that someone will examine HTTP requests and see it. - if (window.__admin_media_prefix__ != undefined) { - DateTimeShortcuts.admin_media_prefix = window.__admin_media_prefix__; - } else { - DateTimeShortcuts.admin_media_prefix = '/missing-admin-media-prefix/'; - } + // Check if warning is already there. + if ($(inp).siblings('.' + warningClass).length) { + return; + } - var inputs = document.getElementsByTagName('input'); - for (i=0; i 0) { + message = ngettext( + 'Note: You are %s hour ahead of server time.', + 'Note: You are %s hours ahead of server time.', + timezoneOffset + ); } - else if (inp.getAttribute('type') == 'text' && inp.className.match(/vDateField/)) { - DateTimeShortcuts.addCalendar(inp); + else { + timezoneOffset *= -1; + message = ngettext( + 'Note: You are %s hour behind server time.', + 'Note: You are %s hours behind server time.', + timezoneOffset + ); } - } - }, - // Add clock widget to a given field - addClock: function(inp) { - var num = DateTimeShortcuts.clockInputs.length; - DateTimeShortcuts.clockInputs[num] = inp; + message = interpolate(message, [timezoneOffset]); + + var $warning = $(''); + $warning.attr('class', warningClass); + $warning.text(message); + + $(inp).parent() + .append($('
        ')) + .append($warning); + }, + // Add clock widget to a given field + addClock: function(inp) { + var num = DateTimeShortcuts.clockInputs.length; + DateTimeShortcuts.clockInputs[num] = inp; + DateTimeShortcuts.dismissClockFunc[num] = function() { DateTimeShortcuts.dismissClock(num); return true; }; + + // Shortcut links (clock icon and "Now" link) + var shortcuts_span = document.createElement('span'); + shortcuts_span.className = DateTimeShortcuts.shortCutsClass; + inp.parentNode.insertBefore(shortcuts_span, inp.nextSibling); + var now_link = document.createElement('a'); + now_link.setAttribute('href', "javascript:DateTimeShortcuts.handleClockQuicklink(" + num + ", -1);"); + now_link.appendChild(document.createTextNode(gettext('Now'))); + var clock_link = document.createElement('a'); + clock_link.setAttribute('href', 'javascript:DateTimeShortcuts.openClock(' + num + ');'); + clock_link.id = DateTimeShortcuts.clockLinkName + num; + quickElement( + 'span', clock_link, '', + 'class', 'clock-icon', + 'title', gettext('Choose a Time') + ); + shortcuts_span.appendChild(document.createTextNode('\u00A0')); + shortcuts_span.appendChild(now_link); + shortcuts_span.appendChild(document.createTextNode('\u00A0|\u00A0')); + shortcuts_span.appendChild(clock_link); - // Shortcut links (clock icon and "Now" link) - var shortcuts_span = document.createElement('span'); - shortcuts_span.className = DateTimeShortcuts.shortCutsClass; - inp.parentNode.insertBefore(shortcuts_span, inp.nextSibling); - var now_link = document.createElement('a'); - now_link.setAttribute('href', "javascript:DateTimeShortcuts.handleClockQuicklink(" + num + ", new Date().strftime('" + get_format('TIME_INPUT_FORMATS')[0] + "'));"); - now_link.appendChild(document.createTextNode(gettext('Now'))); - var clock_link = document.createElement('a'); - clock_link.setAttribute('href', 'javascript:DateTimeShortcuts.openClock(' + num + ');'); - clock_link.id = DateTimeShortcuts.clockLinkName + num; - quickElement('i', clock_link, '', 'class', 'icon-time'); - shortcuts_span.appendChild(document.createTextNode('\240')); - shortcuts_span.appendChild(now_link); - shortcuts_span.appendChild(document.createTextNode('\240|\240')); - shortcuts_span.appendChild(clock_link); - - // Create clock link div - // - // Markup looks like: - //
        - //

        Choose a time

        - // - //

        Cancel

        - //
        + // Create clock link div + // + // Markup looks like: + //
        + //

        Choose a time

        + // + //

        Cancel

        + //
        - var clock_box = document.createElement('div'); - clock_box.style.display = 'none'; - clock_box.style.position = 'absolute'; - clock_box.className = 'clockbox module'; - clock_box.setAttribute('id', DateTimeShortcuts.clockDivName + num); - yawdadmin.jQuery(inp).closest('.modal, body').append(clock_box); - addEvent(clock_box, 'click', DateTimeShortcuts.cancelEventPropagation); + var clock_box = document.createElement('div'); + clock_box.style.display = 'none'; + clock_box.style.position = 'absolute'; + clock_box.className = 'clockbox module'; + clock_box.setAttribute('id', DateTimeShortcuts.clockDivName + num); + document.body.appendChild(clock_box); + addEvent(clock_box, 'click', cancelEventPropagation); - quickElement('h2', clock_box, gettext('Choose a time')); - var time_list = quickElement('ul', clock_box, ''); - time_list.className = 'timelist'; - var time_format = get_format('TIME_INPUT_FORMATS')[0]; - quickElement("a", quickElement("li", time_list, ""), gettext("Now"), "href", "javascript:DateTimeShortcuts.handleClockQuicklink(" + num + ", new Date().strftime('" + time_format + "'));"); - quickElement("a", quickElement("li", time_list, ""), gettext("Midnight"), "href", "javascript:DateTimeShortcuts.handleClockQuicklink(" + num + ", new Date(1970,1,1,0,0,0,0).strftime('" + time_format + "'));"); - quickElement("a", quickElement("li", time_list, ""), gettext("6 a.m."), "href", "javascript:DateTimeShortcuts.handleClockQuicklink(" + num + ", new Date(1970,1,1,6,0,0,0).strftime('" + time_format + "'));"); - quickElement("a", quickElement("li", time_list, ""), gettext("Noon"), "href", "javascript:DateTimeShortcuts.handleClockQuicklink(" + num + ", new Date(1970,1,1,12,0,0,0).strftime('" + time_format + "'));"); + quickElement('h2', clock_box, gettext('Choose a time')); + var time_list = quickElement('ul', clock_box); + time_list.className = 'timelist'; + quickElement("a", quickElement("li", time_list), gettext("Now"), "href", "javascript:DateTimeShortcuts.handleClockQuicklink(" + num + ", -1);"); + quickElement("a", quickElement("li", time_list), gettext("Midnight"), "href", "javascript:DateTimeShortcuts.handleClockQuicklink(" + num + ", 0);"); + quickElement("a", quickElement("li", time_list), gettext("6 a.m."), "href", "javascript:DateTimeShortcuts.handleClockQuicklink(" + num + ", 6);"); + quickElement("a", quickElement("li", time_list), gettext("Noon"), "href", "javascript:DateTimeShortcuts.handleClockQuicklink(" + num + ", 12);"); + quickElement("a", quickElement("li", time_list), gettext("6 p.m."), "href", "javascript:DateTimeShortcuts.handleClockQuicklink(" + num + ", 18);"); - var cancel_p = quickElement('p', clock_box, ''); - cancel_p.className = 'calendar-cancel'; - quickElement('a', cancel_p, gettext('Cancel'), 'href', 'javascript:DateTimeShortcuts.dismissClock(' + num + ');'); - yawdadmin.jQuery(document).bind('keyup', function(event) { - if (event.which == 27) { - // ESC key closes popup - DateTimeShortcuts.dismissClock(num); - event.preventDefault(); + var cancel_p = quickElement('p', clock_box); + cancel_p.className = 'calendar-cancel'; + quickElement('a', cancel_p, gettext('Cancel'), 'href', 'javascript:DateTimeShortcuts.dismissClock(' + num + ');'); + yawdadmin.jQuery(document).bind('keyup', function(event) { + if (event.which === 27) { + // ESC key closes popup + DateTimeShortcuts.dismissClock(num); + event.preventDefault(); + } + }); + }, + openClock: function(num) { + var clock_box = document.getElementById(DateTimeShortcuts.clockDivName + num); + var clock_link = document.getElementById(DateTimeShortcuts.clockLinkName + num); + + // Recalculate the clockbox position + // is it left-to-right or right-to-left layout ? + if (getStyle(document.body, 'direction') !== 'rtl') { + clock_box.style.left = findPosX(clock_link) + 17 + 'px'; + } + else { + // since style's width is in em, it'd be tough to calculate + // px value of it. let's use an estimated px for now + // TODO: IE returns wrong value for findPosX when in rtl mode + // (it returns as it was left aligned), needs to be fixed. + clock_box.style.left = findPosX(clock_link) - 110 + 'px'; } - }); - }, - openClock: function(num) { - var clock_box = document.getElementById(DateTimeShortcuts.clockDivName+num) - var clock_link = document.getElementById(DateTimeShortcuts.clockLinkName+num) + clock_box.style.top = Math.max(0, findPosY(clock_link) - 30) + 'px'; - // Recalculate the clockbox position - // is it left-to-right or right-to-left layout ? - if (getStyle(document.body,'direction')!='rtl') { - clock_box.style.left = findPosXRel(clock_link) + 17 + 'px'; - } - else { - // since style's width is in em, it'd be tough to calculate - // px value of it. let's use an estimated px for now - // TODO: IE returns wrong value for findPosX when in rtl mode - // (it returns as it was left aligned), needs to be fixed. - clock_box.style.left = findPosXRel(clock_link) - 110 + 'px'; - } - clock_box.style.top = Math.max(0, findPosYRel(clock_link) - 30) + 'px'; + // Show the clock box + clock_box.style.display = 'block'; + addEvent(document, 'click', DateTimeShortcuts.dismissClockFunc[num]); + }, + dismissClock: function(num) { + document.getElementById(DateTimeShortcuts.clockDivName + num).style.display = 'none'; + removeEvent(document, 'click', DateTimeShortcuts.dismissClockFunc[num]); + }, + handleClockQuicklink: function(num, val) { + var d; + if (val === -1) { + d = DateTimeShortcuts.now(); + } + else { + d = new Date(1970, 1, 1, val, 0, 0, 0); + } + DateTimeShortcuts.clockInputs[num].value = d.strftime(get_format('TIME_INPUT_FORMATS')[0]); + DateTimeShortcuts.clockInputs[num].focus(); + DateTimeShortcuts.dismissClock(num); + }, + // Add calendar widget to a given field. + addCalendar: function(inp) { + var num = DateTimeShortcuts.calendars.length; - // Show the clock box - clock_box.style.display = 'block'; - addEvent(window.document, 'click', function() { DateTimeShortcuts.dismissClock(num); return true; }); - }, - dismissClock: function(num) { - document.getElementById(DateTimeShortcuts.clockDivName + num).style.display = 'none'; - window.document.onclick = null; - }, - handleClockQuicklink: function(num, val) { - DateTimeShortcuts.clockInputs[num].value = val; - DateTimeShortcuts.clockInputs[num].focus(); - DateTimeShortcuts.dismissClock(num); - }, - // Add calendar widget to a given field. - addCalendar: function(inp) { - var num = DateTimeShortcuts.calendars.length; + DateTimeShortcuts.calendarInputs[num] = inp; + DateTimeShortcuts.dismissCalendarFunc[num] = function() { DateTimeShortcuts.dismissCalendar(num); return true; }; - DateTimeShortcuts.calendarInputs[num] = inp; + // Shortcut links (calendar icon and "Today" link) + var shortcuts_span = document.createElement('span'); + shortcuts_span.className = DateTimeShortcuts.shortCutsClass; + inp.parentNode.insertBefore(shortcuts_span, inp.nextSibling); + var today_link = document.createElement('a'); + today_link.setAttribute('href', 'javascript:DateTimeShortcuts.handleCalendarQuickLink(' + num + ', 0);'); + today_link.appendChild(document.createTextNode(gettext('Today'))); + var cal_link = document.createElement('a'); + cal_link.setAttribute('href', 'javascript:DateTimeShortcuts.openCalendar(' + num + ');'); + cal_link.id = DateTimeShortcuts.calendarLinkName + num; + quickElement( + 'span', cal_link, '', + 'class', 'date-icon', + 'title', gettext('Choose a Date') + ); + shortcuts_span.appendChild(document.createTextNode('\u00A0')); + shortcuts_span.appendChild(today_link); + shortcuts_span.appendChild(document.createTextNode('\u00A0|\u00A0')); + shortcuts_span.appendChild(cal_link); - // Shortcut links (calendar icon and "Today" link) - var shortcuts_span = document.createElement('span'); - shortcuts_span.className = DateTimeShortcuts.shortCutsClass; - inp.parentNode.insertBefore(shortcuts_span, inp.nextSibling); - var today_link = document.createElement('a'); - today_link.setAttribute('href', 'javascript:DateTimeShortcuts.handleCalendarQuickLink(' + num + ', 0);'); - today_link.appendChild(document.createTextNode(gettext('Today'))); - var cal_link = document.createElement('a'); - cal_link.setAttribute('href', 'javascript:DateTimeShortcuts.openCalendar(' + num + ');'); - cal_link.id = DateTimeShortcuts.calendarLinkName + num; - quickElement('i', cal_link, '', 'class', 'icon-calendar'); - shortcuts_span.appendChild(document.createTextNode('\240')); - shortcuts_span.appendChild(today_link); - shortcuts_span.appendChild(document.createTextNode('\240|\240')); - shortcuts_span.appendChild(cal_link); + // Create calendarbox div. + // + // Markup looks like: + // + //
        + //

        + // + // February 2003 + //

        + //
        + // + //
        + //
        + // Yesterday | Today | Tomorrow + //
        + //

        Cancel

        + //
        + var cal_box = document.createElement('div'); + cal_box.style.display = 'none'; + cal_box.style.position = 'absolute'; + cal_box.className = 'calendarbox module'; + cal_box.setAttribute('id', DateTimeShortcuts.calendarDivName1 + num); + document.body.appendChild(cal_box); + addEvent(cal_box, 'click', cancelEventPropagation); - // Create calendarbox div. - // - // Markup looks like: - // - //
        - //

        - // - // February 2003 - //

        - //
        - // - //
        - //
        - // Yesterday | Today | Tomorrow - //
        - //

        Cancel

        - //
        - var cal_box = document.createElement('div'); - cal_box.style.display = 'none'; - cal_box.style.position = 'absolute'; - cal_box.className = 'calendarbox module'; - cal_box.setAttribute('id', DateTimeShortcuts.calendarDivName1 + num); - yawdadmin.jQuery(inp).closest('.modal, body').append(cal_box); - addEvent(cal_box, 'click', DateTimeShortcuts.cancelEventPropagation); + // next-prev links + var cal_nav = quickElement('div', cal_box); + var cal_nav_prev = quickElement('a', cal_nav, '<', 'href', 'javascript:DateTimeShortcuts.drawPrev(' + num + ');'); + cal_nav_prev.className = 'calendarnav-previous'; + var cal_nav_next = quickElement('a', cal_nav, '>', 'href', 'javascript:DateTimeShortcuts.drawNext(' + num + ');'); + cal_nav_next.className = 'calendarnav-next'; - // next-prev links - var cal_nav = quickElement('div', cal_box, ''); - var cal_nav_prev = quickElement('a', cal_nav, '<', 'href', 'javascript:DateTimeShortcuts.drawPrev('+num+');'); - cal_nav_prev.className = 'calendarnav-previous'; - var cal_nav_next = quickElement('a', cal_nav, '>', 'href', 'javascript:DateTimeShortcuts.drawNext('+num+');'); - cal_nav_next.className = 'calendarnav-next'; + // main box + var cal_main = quickElement('div', cal_box, '', 'id', DateTimeShortcuts.calendarDivName2 + num); + cal_main.className = 'calendar'; + DateTimeShortcuts.calendars[num] = new Calendar(DateTimeShortcuts.calendarDivName2 + num, DateTimeShortcuts.handleCalendarCallback(num)); + DateTimeShortcuts.calendars[num].drawCurrent(); - // main box - var cal_main = quickElement('div', cal_box, '', 'id', DateTimeShortcuts.calendarDivName2 + num); - cal_main.className = 'calendar'; - DateTimeShortcuts.calendars[num] = new Calendar(DateTimeShortcuts.calendarDivName2 + num, DateTimeShortcuts.handleCalendarCallback(num)); - DateTimeShortcuts.calendars[num].drawCurrent(); + // calendar shortcuts + var shortcuts = quickElement('div', cal_box); + shortcuts.className = 'calendar-shortcuts'; + quickElement('a', shortcuts, gettext('Yesterday'), 'href', 'javascript:DateTimeShortcuts.handleCalendarQuickLink(' + num + ', -1);'); + shortcuts.appendChild(document.createTextNode('\u00A0|\u00A0')); + quickElement('a', shortcuts, gettext('Today'), 'href', 'javascript:DateTimeShortcuts.handleCalendarQuickLink(' + num + ', 0);'); + shortcuts.appendChild(document.createTextNode('\u00A0|\u00A0')); + quickElement('a', shortcuts, gettext('Tomorrow'), 'href', 'javascript:DateTimeShortcuts.handleCalendarQuickLink(' + num + ', +1);'); - // calendar shortcuts - var shortcuts = quickElement('div', cal_box, ''); - shortcuts.className = 'calendar-shortcuts'; - quickElement('a', shortcuts, gettext('Yesterday'), 'href', 'javascript:DateTimeShortcuts.handleCalendarQuickLink(' + num + ', -1);'); - shortcuts.appendChild(document.createTextNode('\240|\240')); - quickElement('a', shortcuts, gettext('Today'), 'href', 'javascript:DateTimeShortcuts.handleCalendarQuickLink(' + num + ', 0);'); - shortcuts.appendChild(document.createTextNode('\240|\240')); - quickElement('a', shortcuts, gettext('Tomorrow'), 'href', 'javascript:DateTimeShortcuts.handleCalendarQuickLink(' + num + ', +1);'); + // cancel bar + var cancel_p = quickElement('p', cal_box); + cancel_p.className = 'calendar-cancel'; + quickElement('a', cancel_p, gettext('Cancel'), 'href', 'javascript:DateTimeShortcuts.dismissCalendar(' + num + ');'); + yawdadmin.jQuery(document).bind('keyup', function(event) { + if (event.which === 27) { + // ESC key closes popup + DateTimeShortcuts.dismissCalendar(num); + event.preventDefault(); + } + }); + }, + openCalendar: function(num) { + var cal_box = document.getElementById(DateTimeShortcuts.calendarDivName1 + num); + var cal_link = document.getElementById(DateTimeShortcuts.calendarLinkName + num); + var inp = DateTimeShortcuts.calendarInputs[num]; - // cancel bar - var cancel_p = quickElement('p', cal_box, ''); - cancel_p.className = 'calendar-cancel'; - quickElement('a', cancel_p, gettext('Cancel'), 'href', 'javascript:DateTimeShortcuts.dismissCalendar(' + num + ');'); - yawdadmin.jQuery(document).bind('keyup', function(event) { - if (event.which == 27) { - // ESC key closes popup - DateTimeShortcuts.dismissCalendar(num); - event.preventDefault(); + // Determine if the current value in the input has a valid date. + // If so, draw the calendar with that date's year and month. + if (inp.value) { + var format = get_format('DATE_INPUT_FORMATS')[0]; + var selected = inp.value.strptime(format); + var year = selected.getUTCFullYear(); + var month = selected.getUTCMonth() + 1; + var re = /\d{4}/; + if (re.test(year.toString()) && month >= 1 && month <= 12) { + DateTimeShortcuts.calendars[num].drawDate(month, year, selected); + } } - }); - }, - openCalendar: function(num) { - var cal_box = document.getElementById(DateTimeShortcuts.calendarDivName1+num) - var cal_link = document.getElementById(DateTimeShortcuts.calendarLinkName+num) - var inp = DateTimeShortcuts.calendarInputs[num]; - // Determine if the current value in the input has a valid date. - // If so, draw the calendar with that date's year and month. - if (inp.value) { - var date_parts = inp.value.split('-'); - var year = date_parts[0]; - var month = parseFloat(date_parts[1]); - if (year.match(/\d\d\d\d/) && month >= 1 && month <= 12) { - DateTimeShortcuts.calendars[num].drawDate(month, year); + // Recalculate the clockbox position + // is it left-to-right or right-to-left layout ? + if (getStyle(document.body, 'direction') !== 'rtl') { + cal_box.style.left = findPosX(cal_link) + 17 + 'px'; } - } + else { + // since style's width is in em, it'd be tough to calculate + // px value of it. let's use an estimated px for now + // TODO: IE returns wrong value for findPosX when in rtl mode + // (it returns as it was left aligned), needs to be fixed. + cal_box.style.left = findPosX(cal_link) - 180 + 'px'; + } + cal_box.style.top = Math.max(0, findPosY(cal_link) - 75) + 'px'; - // Recalculate the clockbox position - // is it left-to-right or right-to-left layout ? - if (getStyle(document.body,'direction')!='rtl') { - cal_box.style.left = findPosXRel(cal_link) + 17 + 'px'; + cal_box.style.display = 'block'; + addEvent(document, 'click', DateTimeShortcuts.dismissCalendarFunc[num]); + }, + dismissCalendar: function(num) { + document.getElementById(DateTimeShortcuts.calendarDivName1 + num).style.display = 'none'; + removeEvent(document, 'click', DateTimeShortcuts.dismissCalendarFunc[num]); + }, + drawPrev: function(num) { + DateTimeShortcuts.calendars[num].drawPreviousMonth(); + }, + drawNext: function(num) { + DateTimeShortcuts.calendars[num].drawNextMonth(); + }, + handleCalendarCallback: function(num) { + var format = get_format('DATE_INPUT_FORMATS')[0]; + // the format needs to be escaped a little + format = format.replace('\\', '\\\\'); + format = format.replace('\r', '\\r'); + format = format.replace('\n', '\\n'); + format = format.replace('\t', '\\t'); + format = format.replace("'", "\\'"); + return ["function(y, m, d) { DateTimeShortcuts.calendarInputs[", + num, + "].value = new Date(y, m-1, d).strftime('", + format, + "');DateTimeShortcuts.calendarInputs[", + num, + "].focus();document.getElementById(DateTimeShortcuts.calendarDivName1+", + num, + ").style.display='none';}"].join(''); + }, + handleCalendarQuickLink: function(num, offset) { + var d = DateTimeShortcuts.now(); + d.setDate(d.getDate() + offset); + DateTimeShortcuts.calendarInputs[num].value = d.strftime(get_format('DATE_INPUT_FORMATS')[0]); + DateTimeShortcuts.calendarInputs[num].focus(); + DateTimeShortcuts.dismissCalendar(num); } - else { - // since style's width is in em, it'd be tough to calculate - // px value of it. let's use an estimated px for now - // TODO: IE returns wrong value for findPosX when in rtl mode - // (it returns as it was left aligned), needs to be fixed. - cal_box.style.left = findPosXRel(cal_link) - 180 + 'px'; - } - cal_box.style.top = Math.max(0, findPosYRel(cal_link) - 75) + 'px'; - - cal_box.style.display = 'block'; - addEvent(window.document, 'click', function() { DateTimeShortcuts.dismissCalendar(num); return true; }); - }, - dismissCalendar: function(num) { - document.getElementById(DateTimeShortcuts.calendarDivName1+num).style.display = 'none'; - window.document.onclick = null; - }, - drawPrev: function(num) { - DateTimeShortcuts.calendars[num].drawPreviousMonth(); - }, - drawNext: function(num) { - DateTimeShortcuts.calendars[num].drawNextMonth(); - }, - handleCalendarCallback: function(num) { - format = get_format('DATE_INPUT_FORMATS')[0]; - // the format needs to be escaped a little - format = format.replace('\\', '\\\\'); - format = format.replace('\r', '\\r'); - format = format.replace('\n', '\\n'); - format = format.replace('\t', '\\t'); - format = format.replace("'", "\\'"); - return ["function(y, m, d) { DateTimeShortcuts.calendarInputs[", - num, - "].value = new Date(y, m-1, d).strftime('", - format, - "');DateTimeShortcuts.calendarInputs[", - num, - "].focus();document.getElementById(DateTimeShortcuts.calendarDivName1+", - num, - ").style.display='none';}"].join(''); - }, - handleCalendarQuickLink: function(num, offset) { - var d = new Date(); - d.setDate(d.getDate() + offset) - DateTimeShortcuts.calendarInputs[num].value = d.strftime(get_format('DATE_INPUT_FORMATS')[0]); - DateTimeShortcuts.calendarInputs[num].focus(); - DateTimeShortcuts.dismissCalendar(num); - }, - cancelEventPropagation: function(e) { - if (!e) e = window.event; - e.cancelBubble = true; - if (e.stopPropagation) e.stopPropagation(); - } -} + }; -addEvent(window, 'load', DateTimeShortcuts.init); \ No newline at end of file + addEvent(window, 'load', DateTimeShortcuts.init); + window.DateTimeShortcuts = DateTimeShortcuts; +})(); \ No newline at end of file diff --git a/yawdadmin/static/admin/js/inlines.js b/yawdadmin/static/admin/js/inlines.js index ce21b0d..23f269d 100644 --- a/yawdadmin/static/admin/js/inlines.js +++ b/yawdadmin/static/admin/js/inlines.js @@ -1,3 +1,4 @@ +/*global DateTimeShortcuts, SelectFilter*/ /** * Django admin inlines * @@ -15,294 +16,260 @@ * See: http://www.opensource.org/licenses/bsd-license.php */ (function($) { - $.fn.formset = function(opts) { - var options = $.extend({}, $.fn.formset.defaults, opts); - var $this = $(this); - var $parent = $this.parent(); - var updateElementIndex = function(el, prefix, ndx) { - var id_regex = new RegExp("(" + prefix + "-(\\d+|__prefix__))"); - var replacement = prefix + "-" + ndx; - var jel = $(el); - if (jel.attr("for")) { - $(el).attr("for", $(el).attr("for").replace(id_regex, replacement)); - } - if (el.id) { - el.id = el.id.replace(id_regex, replacement); - } - if (el.name) { - el.name = el.name.replace(id_regex, replacement); - } - var modal = jel.find('.modal'); - if (modal.length) { - modal.attr('id', 'modal-wrapper-'+replacement); - jel.find('.inline-modal').attr('href', '#modal-wrapper-'+replacement); - } - }; - var totalForms = $("#id_" + options.prefix + "-TOTAL_FORMS").attr("autocomplete", "off"); - var nextIndex = parseInt(totalForms.val(), 10); - var maxForms = $("#id_" + options.prefix + "-MAX_NUM_FORMS").attr("autocomplete", "off"); - - // add delete buttons to all rows that don't have a delete checkbox - $(this).each(function() { - if (!$(this).find("[name=" + $(this).attr("id") + "-id]").val()) { - var row = $(this); - if (row.is("tr")) { - // If the forms are laid out in table rows, insert - // the remove button into the last table cell: - row.children(":last").append('"); - } else if (row.is("ul") || row.is("ol")) { - // If they're laid out as an ordered/unordered list, - // insert an
      • after the last list item: - row.append('
      • ' + options.deleteText + "
        • "); - } else { - // Otherwise, just insert the remove button as the - // last child element of the form's container: - var modal = row.closest('.inline-related-modal'); - var extra_class = (modal.length) ? '' : ' icon-white'; - row.children(":first").append(' ' + options.deleteText + ""); - } - // The delete button of each row triggers a bunch of other things - $(this).find("a." + options.deleteCssClass).click(function(e) { - e.preventDefault(); - // Remove the parent form containing this button: - var row = $(this).parents("." + options.formCssClass); - row.remove(); - nextIndex -= 1; - // If a post-delete callback was provided, call it with the deleted form: - if (options.removed) { - options.removed(row); - } - // Update the TOTAL_FORMS form count. - var forms = $("." + options.formCssClass); - $("#id_" + options.prefix + "-TOTAL_FORMS").val(forms.length); - // Show add button again once we drop below max - if ((maxForms.val() === '') || (maxForms.val()-forms.length) > 0) { - addButton.parent().show(); - } - // Also, update names and ids for all remaining form controls - // so they remain in sequence: - for (var i=0, formCount=forms.length; i 0; - $this.each(function(i) { - $(this).not("." + options.emptyCssClass).addClass(options.formCssClass); - }); - if ($this.length && showAddButton) { - var addButton; - if ($this.prop("tagName") == "TR") { - // If forms are laid out as table rows, insert the - // "add" button in a new table row: - var numCols = this.eq(-1).children().length; - $parent.append(' ' + options.addText + ""); - addButton = $parent.find("tr:last a"); - } else { - // Otherwise, insert it immediately after the last form: - $this.filter(":last").after('
         ' + options.addText + "
        "); - addButton = $this.filter(":last").next().find("a"); - } - addButton.click(function(e) { - e.preventDefault(); - var totalForms = $("#id_" + options.prefix + "-TOTAL_FORMS"); - var template = $("#" + options.prefix + "-empty"); - var row = template.clone(true); - //handle possible select2 widgets - var select2_cont = row.find('.select2-container'); - if (select2_cont.length) { - select2_cont.remove(); - var select2_offscreen = row.find('.select2-offscreen'); - if (select2_offscreen.data('options-callback')) - select2_offscreen.select2(window[select2_offscreen.data('options-callback')]()); - else - select2_offscreen.select2(); - } - row.removeClass(options.emptyCssClass) - .addClass(options.formCssClass) - .attr("id", options.prefix + "-" + nextIndex); - var modal = row.find("#modal-wrapper-"+options.prefix + "-empty"); - if (modal.length) { - var modal_id = "modal-wrapper-"+options.prefix + "-" + nextIndex; - modal.attr("id", modal_id); - row.find('a.inline-modal').attr("href", "#" + modal_id); - } - - row.find("*").each(function() { - updateElementIndex(this, options.prefix, totalForms.val()); + var showAddButton = maxForms.val() === '' || (maxForms.val() - totalForms.val()) > 0; + $this.each(function(i) { + $(this).not("." + options.emptyCssClass).addClass(options.formCssClass); }); - // Insert the new form when it has been fully edited - row.insertBefore($(template)); - // Update number of total forms - $(totalForms).val(parseInt(totalForms.val(), 10) + 1); - nextIndex += 1; - // Hide add button in case we've hit the max, except we want to add infinitely - if ((maxForms.val() !== '') && (maxForms.val()-totalForms.val()) <= 0) { - addButton.parent().hide(); - } - // If a post-add callback was supplied, call it with the added form: - if (options.added) { - options.added(row); + if ($this.length && showAddButton) { + var addButton; + if ($this.prop("tagName") === "TR") { + // If forms are laid out as table rows, insert the + // "add" button in a new table row: + var numCols = this.eq(-1).children().length; + $parent.append('' + options.addText + ""); + addButton = $parent.find("tr:last a"); + } else { + // Otherwise, insert it immediately after the last form: + $this.filter(":last").after('
        ' + options.addText + "
        "); + addButton = $this.filter(":last").next().find("a"); + } + addButton.click(function(e) { + e.preventDefault(); + var template = $("#" + options.prefix + "-empty"); + var row = template.clone(true); + row.removeClass(options.emptyCssClass) + .addClass(options.formCssClass) + .attr("id", options.prefix + "-" + nextIndex); + if (row.is("tr")) { + // If the forms are laid out in table rows, insert + // the remove button into the last table cell: + row.children(":last").append('"); + } else if (row.is("ul") || row.is("ol")) { + // If they're laid out as an ordered/unordered list, + // insert an
      • after the last list item: + row.append('
      • ' + options.deleteText + "
        • "); + } else { + // Otherwise, just insert the remove button as the + // last child element of the form's container: + row.children(":first").append('' + options.deleteText + ""); + } + row.find("*").each(function() { + updateElementIndex(this, options.prefix, totalForms.val()); + }); + // Insert the new form when it has been fully edited + row.insertBefore($(template)); + // Update number of total forms + $(totalForms).val(parseInt(totalForms.val(), 10) + 1); + nextIndex += 1; + // Hide add button in case we've hit the max, except we want to add infinitely + if ((maxForms.val() !== '') && (maxForms.val() - totalForms.val()) <= 0) { + addButton.parent().hide(); + } + // The delete button of each row triggers a bunch of other things + row.find("a." + options.deleteCssClass).click(function(e1) { + e1.preventDefault(); + // Remove the parent form containing this button: + row.remove(); + nextIndex -= 1; + // If a post-delete callback was provided, call it with the deleted form: + if (options.removed) { + options.removed(row); + } + $(document).trigger('formset:removed', [row, options.prefix]); + // Update the TOTAL_FORMS form count. + var forms = $("." + options.formCssClass); + $("#id_" + options.prefix + "-TOTAL_FORMS").val(forms.length); + // Show add button again once we drop below max + if ((maxForms.val() === '') || (maxForms.val() - forms.length) > 0) { + addButton.parent().show(); + } + // Also, update names and ids for all remaining form controls + // so they remain in sequence: + var i, formCount; + var updateElementCallback = function() { + updateElementIndex(this, options.prefix, i); + }; + for (i = 0, formCount = forms.length; i < formCount; i++) { + updateElementIndex($(forms).get(i), options.prefix, i); + $(forms.get(i)).find("*").each(updateElementCallback); + } + }); + // If a post-add callback was supplied, call it with the added form: + if (options.added) { + options.added(row); + } + $(document).trigger('formset:added', [row, options.prefix]); + }); } - }); - } - return this; - }; + return this; + }; - /* Setup plugin defaults */ - $.fn.formset.defaults = { - prefix: "form", // The form prefix for your django formset - addText: "add another", // Text for the add link - deleteText: "remove", // Text for the delete link - addCssClass: "add-row", // CSS class applied to the add link - deleteCssClass: "delete-row", // CSS class applied to the delete link - emptyCssClass: "empty-row", // CSS class applied to the empty row - formCssClass: "dynamic-form", // CSS class applied to each form in a formset - added: null, // Function called each time a new form is added - removed: null // Function called each time a form is deleted - }; + /* Setup plugin defaults */ + $.fn.formset.defaults = { + prefix: "form", // The form prefix for your django formset + addText: "add another", // Text for the add link + deleteText: "remove", // Text for the delete link + addCssClass: "add-row", // CSS class applied to the add link + deleteCssClass: "delete-row", // CSS class applied to the delete link + emptyCssClass: "empty-row", // CSS class applied to the empty row + formCssClass: "dynamic-form", // CSS class applied to each form in a formset + added: null, // Function called each time a new form is added + removed: null // Function called each time a form is deleted + }; - // Tabular inlines --------------------------------------------------------- - $.fn.tabularFormset = function(options) { - var $rows = $(this); - var alternatingRows = function(row) { - $($rows.selector).not(".add-row").removeClass("row1 row2") - .filter(":even").addClass("row1").end() - .filter(":odd").addClass("row2"); - }; + // Tabular inlines --------------------------------------------------------- + $.fn.tabularFormset = function(options) { + var $rows = $(this); + var alternatingRows = function(row) { + $($rows.selector).not(".add-row").removeClass("row1 row2") + .filter(":even").addClass("row1").end() + .filter(":odd").addClass("row2"); + }; - var reinitDateTimeShortCuts = function() { - // Reinitialize the calendar and clock widgets by force - if (typeof DateTimeShortcuts != "undefined") { - $(".datetimeshortcuts").remove(); - DateTimeShortcuts.init(); - } - }; + var reinitDateTimeShortCuts = function() { + // Reinitialize the calendar and clock widgets by force + if (typeof DateTimeShortcuts !== "undefined") { + $(".datetimeshortcuts").remove(); + DateTimeShortcuts.init(); + } + }; - var updateSelectFilter = function() { - // If any SelectFilter widgets are a part of the new form, - // instantiate a new SelectFilter instance for it. - if (typeof SelectFilter != 'undefined'){ - $('.selectfilter').each(function(index, value){ - var namearr = value.name.split('-'); - SelectFilter.init(value.id, namearr[namearr.length-1], false, options.adminStaticPrefix ); - }); - $('.selectfilterstacked').each(function(index, value){ - var namearr = value.name.split('-'); - SelectFilter.init(value.id, namearr[namearr.length-1], true, options.adminStaticPrefix ); - }); - } - }; + var updateSelectFilter = function() { + // If any SelectFilter widgets are a part of the new form, + // instantiate a new SelectFilter instance for it. + if (typeof SelectFilter !== 'undefined') { + $('.selectfilter').each(function(index, value) { + var namearr = value.name.split('-'); + SelectFilter.init(value.id, namearr[namearr.length - 1], false); + }); + $('.selectfilterstacked').each(function(index, value) { + var namearr = value.name.split('-'); + SelectFilter.init(value.id, namearr[namearr.length - 1], true); + }); + } + }; - var initPrepopulatedFields = function(row) { - row.find('.prepopulated_field').each(function() { - var field = $(this), - input = field.find('input, select, textarea'), - dependency_list = input.data('dependency_list') || [], - dependencies = []; - $.each(dependency_list, function(i, field_name) { - dependencies.push('#' + row.find('.field-' + field_name).find('input, select, textarea').attr('id')); + var initPrepopulatedFields = function(row) { + row.find('.prepopulated_field').each(function() { + var field = $(this), + input = field.find('input, select, textarea'), + dependency_list = input.data('dependency_list') || [], + dependencies = []; + $.each(dependency_list, function(i, field_name) { + dependencies.push('#' + row.find('.field-' + field_name).find('input, select, textarea').attr('id')); + }); + if (dependencies.length) { + input.prepopulate(dependencies, input.attr('maxlength')); + } + }); + }; + + $rows.formset({ + prefix: options.prefix, + addText: options.addText, + formCssClass: "dynamic-" + options.prefix, + deleteCssClass: "inline-deletelink", + deleteText: options.deleteText, + emptyCssClass: "empty-form", + removed: alternatingRows, + added: function(row) { + initPrepopulatedFields(row); + reinitDateTimeShortCuts(); + updateSelectFilter(); + alternatingRows(row); + } }); - if (dependencies.length) { - input.prepopulate(dependencies, input.attr('maxlength')); - } - }); + + return $rows; }; - $rows.formset({ - prefix: options.prefix, - addText: options.addText, - formCssClass: "dynamic-" + options.prefix, - deleteCssClass: "inline-deletelink", - deleteText: options.deleteText, - emptyCssClass: "empty-form", - removed: alternatingRows, - added: function(row) { - initPrepopulatedFields(row); - reinitDateTimeShortCuts(); - updateSelectFilter(); - alternatingRows(row); - } - }); + // Stacked inlines --------------------------------------------------------- + $.fn.stackedFormset = function(options) { + var $rows = $(this); + var updateInlineLabel = function(row) { + $($rows.selector).find(".inline_label").each(function(i) { + var count = i + 1; + $(this).html($(this).html().replace(/(#\d+)/g, "#" + count)); + }); + }; - return $rows; - }; + var reinitDateTimeShortCuts = function() { + // Reinitialize the calendar and clock widgets by force, yuck. + if (typeof DateTimeShortcuts !== "undefined") { + $(".datetimeshortcuts").remove(); + DateTimeShortcuts.init(); + } + }; - // Stacked inlines --------------------------------------------------------- - $.fn.stackedFormset = function(options) { - var $rows = $(this); - var updateInlineLabel = function(row) { - $($rows.selector).find(".inline_label").each(function(i) { - var count = i + 1; - $(this).html($(this).html().replace(/(#\d+)/g, "#" + count)); - }); - }; + var updateSelectFilter = function() { + // If any SelectFilter widgets were added, instantiate a new instance. + if (typeof SelectFilter !== "undefined") { + $(".selectfilter").each(function(index, value) { + var namearr = value.name.split('-'); + SelectFilter.init(value.id, namearr[namearr.length - 1], false); + }); + $(".selectfilterstacked").each(function(index, value) { + var namearr = value.name.split('-'); + SelectFilter.init(value.id, namearr[namearr.length - 1], true); + }); + } + }; - var reinitDateTimeShortCuts = function() { - // Reinitialize the calendar and clock widgets by force, yuck. - if (typeof DateTimeShortcuts != "undefined") { - $(".datetimeshortcuts").remove(); - DateTimeShortcuts.init(); - } - }; + var initPrepopulatedFields = function(row) { + row.find('.prepopulated_field').each(function() { + var field = $(this), + input = field.find('input, select, textarea'), + dependency_list = input.data('dependency_list') || [], + dependencies = []; + $.each(dependency_list, function(i, field_name) { + dependencies.push('#' + row.find('.form-row .field-' + field_name).find('input, select, textarea').attr('id')); + }); + if (dependencies.length) { + input.prepopulate(dependencies, input.attr('maxlength')); + } + }); + }; - var updateSelectFilter = function() { - // If any SelectFilter widgets were added, instantiate a new instance. - if (typeof SelectFilter != "undefined"){ - $(".selectfilter").each(function(index, value){ - var namearr = value.name.split('-'); - SelectFilter.init(value.id, namearr[namearr.length-1], false, options.adminStaticPrefix); - }); - $(".selectfilterstacked").each(function(index, value){ - var namearr = value.name.split('-'); - SelectFilter.init(value.id, namearr[namearr.length-1], true, options.adminStaticPrefix); + $rows.formset({ + prefix: options.prefix, + addText: options.addText, + formCssClass: "dynamic-" + options.prefix, + deleteCssClass: "inline-deletelink", + deleteText: options.deleteText, + emptyCssClass: "empty-form", + removed: updateInlineLabel, + added: function(row) { + initPrepopulatedFields(row); + reinitDateTimeShortCuts(); + updateSelectFilter(); + updateInlineLabel(row); + } }); - } - }; - var initPrepopulatedFields = function(row) { - row.find('.prepopulated_field').each(function() { - var field = $(this), - input = field.find('input, select, textarea'), - dependency_list = input.data('dependency_list') || [], - dependencies = []; - $.each(dependency_list, function(i, field_name) { - dependencies.push('#' + row.find('.form-row .field-' + field_name).find('input, select, textarea').attr('id')); - }); - if (dependencies.length) { - input.prepopulate(dependencies, input.attr('maxlength')); - } - }); + return $rows; }; - - $rows.formset({ - prefix: options.prefix, - addText: options.addText, - formCssClass: "dynamic-" + options.prefix, - deleteCssClass: "inline-deletelink", - deleteText: options.deleteText, - emptyCssClass: "empty-form", - removed: updateInlineLabel, - added: (function(row) { - initPrepopulatedFields(row); - reinitDateTimeShortCuts(); - updateSelectFilter(); - updateInlineLabel(row); - }) - }); - - return $rows; - }; })(yawdadmin.jQuery); \ No newline at end of file diff --git a/yawdadmin/static/admin/js/inlines.min.js b/yawdadmin/static/admin/js/inlines.min.js index b931116..b047ab0 100644 --- a/yawdadmin/static/admin/js/inlines.min.js +++ b/yawdadmin/static/admin/js/inlines.min.js @@ -1 +1,9 @@ -(function(a){a.fn.formset=function(b){var l=a.extend({},a.fn.formset.defaults,b);var g=a(this);var d=g.parent();var k=function(p,r,n){var m=new RegExp("("+r+"-(\\d+|__prefix__))");var o=r+"-"+n;var s=a(p);if(s.attr("for")){a(p).attr("for",a(p).attr("for").replace(m,o))}if(p.id){p.id=p.id.replace(m,o)}if(p.name){p.name=p.name.replace(m,o)}var q=s.find(".modal");if(q.length){q.attr("id","modal-wrapper-"+o);s.find(".inline-modal").attr("href","#modal-wrapper-"+o)}};var e=a("#id_"+l.prefix+"-TOTAL_FORMS").attr("autocomplete","off");var f=parseInt(e.val(),10);var i=a("#id_"+l.prefix+"-MAX_NUM_FORMS").attr("autocomplete","off");a(this).each(function(){if(!a(this).find("[name="+a(this).attr("id")+"-id]").val()){var o=a(this);if(o.is("tr")){o.children(":last").append('")}else{if(o.is("ul")||o.is("ol")){o.append('
      • '+l.deleteText+"
        • ")}else{var n=o.closest(".inline-related-modal");var m=(n.length)?"":" icon-white";o.children(":first").append(' '+l.deleteText+"")}}a(this).find("a."+l.deleteCssClass).click(function(s){s.preventDefault();var t=a(this).parents("."+l.formCssClass);t.remove();f-=1;if(l.removed){l.removed(t)}var p=a("."+l.formCssClass);a("#id_"+l.prefix+"-TOTAL_FORMS").val(p.length);if((i.val()==="")||(i.val()-p.length)>0){h.parent().show()}for(var q=0,r=p.length;q0;g.each(function(m){a(this).not("."+l.emptyCssClass).addClass(l.formCssClass)});if(g.length&&j){var h;if(g.prop("tagName")=="TR"){var c=this.eq(-1).children().length;d.append(' '+l.addText+"");h=d.find("tr:last a")}else{g.filter(":last").after('
         '+l.addText+"
        ");h=g.filter(":last").next().find("a")}h.click(function(r){r.preventDefault();var q=a("#id_"+l.prefix+"-TOTAL_FORMS");var n=a("#"+l.prefix+"-empty");var t=n.clone(true);var m=t.find(".select2-container");if(m.length){m.remove();var s=t.find(".select2-offscreen");if(s.data("options-callback")){s.select2(window[s.data("options-callback")]())}else{s.select2()}}t.removeClass(l.emptyCssClass).addClass(l.formCssClass).attr("id",l.prefix+"-"+f);var o=t.find("#modal-wrapper-"+l.prefix+"-empty");if(o.length){var p="modal-wrapper-"+l.prefix+"-"+f;o.attr("id",p);t.find("a.inline-modal").attr("href","#"+p)}t.find("*").each(function(){k(this,l.prefix,q.val())});t.insertBefore(a(n));a(q).val(parseInt(q.val(),10)+1);f+=1;if((i.val()!=="")&&(i.val()-q.val())<=0){h.parent().hide()}if(l.added){l.added(t)}})}return this};a.fn.formset.defaults={prefix:"form",addText:"add another",deleteText:"remove",addCssClass:"add-row",deleteCssClass:"delete-row",emptyCssClass:"empty-row",formCssClass:"dynamic-form",added:null,removed:null};a.fn.tabularFormset=function(d){var c=a(this);var f=function(h){a(c.selector).not(".add-row").removeClass("row1 row2").filter(":even").addClass("row1").end().filter(":odd").addClass("row2")};var b=function(){if(typeof DateTimeShortcuts!="undefined"){a(".datetimeshortcuts").remove();DateTimeShortcuts.init()}};var e=function(){if(typeof SelectFilter!="undefined"){a(".selectfilter").each(function(h,j){var i=j.name.split("-");SelectFilter.init(j.id,i[i.length-1],false,d.adminStaticPrefix)});a(".selectfilterstacked").each(function(h,j){var i=j.name.split("-");SelectFilter.init(j.id,i[i.length-1],true,d.adminStaticPrefix)})}};var g=function(h){h.find(".prepopulated_field").each(function(){var l=a(this),j=l.find("input, select, textarea"),i=j.data("dependency_list")||[],k=[];a.each(i,function(m,n){k.push("#"+h.find(".field-"+n).find("input, select, textarea").attr("id"))});if(k.length){j.prepopulate(k,j.attr("maxlength"))}})};c.formset({prefix:d.prefix,addText:d.addText,formCssClass:"dynamic-"+d.prefix,deleteCssClass:"inline-deletelink",deleteText:d.deleteText,emptyCssClass:"empty-form",removed:f,added:function(h){g(h);b();e();f(h)}});return c};a.fn.stackedFormset=function(d){var c=a(this);var e=function(h){a(c.selector).find(".inline_label").each(function(j){var k=j+1;a(this).html(a(this).html().replace(/(#\d+)/g,"#"+k))})};var b=function(){if(typeof DateTimeShortcuts!="undefined"){a(".datetimeshortcuts").remove();DateTimeShortcuts.init()}};var f=function(){if(typeof SelectFilter!="undefined"){a(".selectfilter").each(function(h,j){var i=j.name.split("-");SelectFilter.init(j.id,i[i.length-1],false,d.adminStaticPrefix)});a(".selectfilterstacked").each(function(h,j){var i=j.name.split("-");SelectFilter.init(j.id,i[i.length-1],true,d.adminStaticPrefix)})}};var g=function(h){h.find(".prepopulated_field").each(function(){var l=a(this),j=l.find("input, select, textarea"),i=j.data("dependency_list")||[],k=[];a.each(i,function(m,n){k.push("#"+h.find(".form-row .field-"+n).find("input, select, textarea").attr("id"))});if(k.length){j.prepopulate(k,j.attr("maxlength"))}})};c.formset({prefix:d.prefix,addText:d.addText,formCssClass:"dynamic-"+d.prefix,deleteCssClass:"inline-deletelink",deleteText:d.deleteText,emptyCssClass:"empty-form",removed:e,added:(function(h){g(h);b();f();e(h)})});return c}})(yawdadmin.jQuery); \ No newline at end of file +(function(b){b.fn.formset=function(d){var a=b.extend({},b.fn.formset.defaults,d),e=b(this);d=e.parent();var k=function(a,f,l){var c=new RegExp("("+f+"-(\\d+|__prefix__))");f=f+"-"+l;b(a).prop("for")&&b(a).prop("for",b(a).prop("for").replace(c,f));a.id&&(a.id=a.id.replace(c,f));a.name&&(a.name=a.name.replace(c,f))},h=b("#id_"+a.prefix+"-TOTAL_FORMS").prop("autocomplete","off"),l=parseInt(h.val(),10),f=b("#id_"+a.prefix+"-MAX_NUM_FORMS").prop("autocomplete","off"),c=""===f.val()||0'+a.addText+""),m=d.find("tr:last a")):(e.filter(":last").after('
        '+a.addText+"
        "),m=e.filter(":last").next().find("a"));m.click(function(c){c.preventDefault();c=b("#"+a.prefix+ +"-empty");var g=c.clone(!0);g.removeClass(a.emptyCssClass).addClass(a.formCssClass).attr("id",a.prefix+"-"+l);g.is("tr")?g.children(":last").append('"):g.is("ul")||g.is("ol")?g.append('
      • '+a.deleteText+"
        • "):g.children(":first").append(''+a.deleteText+"");g.find("*").each(function(){k(this, +a.prefix,h.val())});g.insertBefore(b(c));b(h).val(parseInt(h.val(),10)+1);l+=1;""!==f.val()&&0>=f.val()-h.val()&&m.parent().hide();g.find("a."+a.deleteCssClass).click(function(c){c.preventDefault();g.remove();--l;a.removed&&a.removed(g);b(document).trigger("formset:removed",[g,a.prefix]);c=b("."+a.formCssClass);b("#id_"+a.prefix+"-TOTAL_FORMS").val(c.length);(""===f.val()||0 0) { - values.push($(field).val()); - } - }) - field.val(URLify(values.join(' '), maxLength)); + field = $(field); + if (field.val().length > 0) { + values.push(field.val()); + } + }); + prepopulatedField.val(URLify(values.join(' '), maxLength, allowUnicode)); }; - $(dependencies.join(',')).keyup(populate).change(populate).focus(populate); + prepopulatedField.data('_changed', false); + prepopulatedField.change(function() { + prepopulatedField.data('_changed', true); + }); + + if (!prepopulatedField.val()) { + $(dependencies.join(',')).keyup(populate).change(populate).focus(populate); + } }); }; })(yawdadmin.jQuery); \ No newline at end of file diff --git a/yawdadmin/static/admin/js/prepopulate.min.js b/yawdadmin/static/admin/js/prepopulate.min.js index 94872a7..0c72ae0 100644 --- a/yawdadmin/static/admin/js/prepopulate.min.js +++ b/yawdadmin/static/admin/js/prepopulate.min.js @@ -1 +1 @@ -(function(a){a.fn.prepopulate=function(c,b){return this.each(function(){var e=a(this);e.data("_changed",false);e.change(function(){e.data("_changed",true)});var d=function(){if(e.data("_changed")==true){return}var f=[];a.each(c,function(g,h){if(a(h).val().length>0){f.push(a(h).val())}});e.val(URLify(f.join(" "),b))};a(c.join(",")).keyup(d).change(d).focus(d)})}})(yawdadmin.jQuery); \ No newline at end of file +(function(c){c.fn.prepopulate=function(e,f,g){return this.each(function(){var a=c(this),b=function(){if(!a.data("_changed")){var b=[];c.each(e,function(a,d){d=c(d);0 Date: Fri, 14 Oct 2016 09:47:14 +0200 Subject: [PATCH 34/34] Update setup.py update version to 0.7.3 to avoid conflct --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index c31c8a5..98fb89a 100644 --- a/setup.py +++ b/setup.py @@ -4,7 +4,7 @@ setup( name='yawd-admin', url='http://yawd.eu/open-source-projects/yawd-admin/', - version='0.7.2', + version='0.7.3', description='An administration website for Django', long_description=open('README.rst', 'rt').read(), author='yawd',