diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-09-11 11:43:14 +0200 | 
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-09-11 11:43:14 +0200 | 
| commit | 9ebf429a92a8fa0dd04df6cdd51caa2ef1c58c39 (patch) | |
| tree | 3bbb30e8d51acc9d52083be6b21c2bdcfd2f5fdc /ishtar_common | |
| parent | 73afc7f761b29a1404cdf567e1880816abcb96aa (diff) | |
| parent | 08f1fe99d11e40ca506469c1d782791fca18d49d (diff) | |
| download | Ishtar-9ebf429a92a8fa0dd04df6cdd51caa2ef1c58c39.tar.bz2 Ishtar-9ebf429a92a8fa0dd04df6cdd51caa2ef1c58c39.zip  | |
Merge branch 'v0.9' into wheezy
Diffstat (limited to 'ishtar_common')
| -rw-r--r-- | ishtar_common/context_processors.py | 35 | ||||
| -rw-r--r-- | ishtar_common/forms_common.py | 10 | ||||
| -rw-r--r-- | ishtar_common/locale/django.pot | 647 | ||||
| -rw-r--r-- | ishtar_common/menu_base.py | 4 | ||||
| -rw-r--r-- | ishtar_common/models.py | 19 | ||||
| -rw-r--r-- | ishtar_common/static/js/chosen/chosen-sprite.png | bin | 0 -> 538 bytes | |||
| -rw-r--r-- | ishtar_common/static/js/chosen/chosen.jquery.min.js | 2 | ||||
| -rw-r--r-- | ishtar_common/static/js/chosen/chosen.min.css | 3 | ||||
| -rw-r--r-- | ishtar_common/static/js/ishtar.js | 58 | ||||
| -rw-r--r-- | ishtar_common/static/media/style.css | 48 | ||||
| -rw-r--r-- | ishtar_common/templates/base.html | 35 | ||||
| -rw-r--r-- | ishtar_common/templates/ishtar/blocks/shortcut_menu.html | 27 | ||||
| -rw-r--r-- | ishtar_common/templates/ishtar/blocks/window_nav.html | 7 | ||||
| -rw-r--r-- | ishtar_common/templates/window.html | 2 | ||||
| -rw-r--r-- | ishtar_common/templatetags/window_header.py | 8 | ||||
| -rw-r--r-- | ishtar_common/urls.py | 4 | ||||
| -rw-r--r-- | ishtar_common/views.py | 148 | 
17 files changed, 651 insertions, 406 deletions
diff --git a/ishtar_common/context_processors.py b/ishtar_common/context_processors.py index f8a4a0f95..bb12a401d 100644 --- a/ishtar_common/context_processors.py +++ b/ishtar_common/context_processors.py @@ -19,29 +19,11 @@  from django.conf import settings  from django.contrib.sites.models import Site -from django.utils.translation import ugettext_lazy as _  from ishtar_common.version import VERSION -from ishtar_common.utils import shortify  from menus import Menu -from ishtar_common.models import get_current_profile -from archaeological_operations.models import Operation -from archaeological_files.models import File -from archaeological_context_records.models import ContextRecord -from archaeological_finds.models import Find - -profile = get_current_profile() -CURRENT_ITEMS = [] -if profile.files: -    CURRENT_ITEMS.append((_(u"Archaeological file"), File)) -CURRENT_ITEMS.append((_(u"Operation"), Operation)) -if profile.context_record: -    CURRENT_ITEMS.append((_(u"Context record"), ContextRecord)) -if profile.find: -    CURRENT_ITEMS.append((_(u"Find"), Find)) -  def get_base_context(request):      dct = {'URL_PATH': settings.URL_PATH} @@ -74,21 +56,4 @@ def get_base_context(request):      dct['VERSION'] = u".".join([unicode(n) for n in VERSION])      if settings.EXTRA_VERSION:          dct['VERSION'] += unicode(settings.EXTRA_VERSION) -    dct['current_menu'] = [] -    for lbl, model in CURRENT_ITEMS: -        model_name = model.__name__.lower() -        cls = '' -        current = model_name in request.session and request.session[model_name] -        items = [] -        for item in model.get_owns(request.user): -            pk = unicode(item.pk) -            if item.IS_BASKET: -                pk = "basket-" + pk -            selected = pk == current -            if selected: -                cls = item.get_short_menu_class() -            items.append((pk, shortify(unicode(item), 60), -                          selected, item.get_short_menu_class())) -        if items: -            dct['current_menu'].append((lbl, model_name, cls, items))      return dct diff --git a/ishtar_common/forms_common.py b/ishtar_common/forms_common.py index 560a1abb3..e288745e2 100644 --- a/ishtar_common/forms_common.py +++ b/ishtar_common/forms_common.py @@ -107,6 +107,16 @@ class NewImportForm(forms.ModelForm):          fields = ('importer_type', 'imported_file', 'imported_images',                    'conservative_import', 'encoding', 'skip_lines') +    def clean(self): +        data = self.cleaned_data +        if data.get('conservative_import', None) \ +                and data.get('importer_type') \ +                and not data.get('importer_type').unicity_keys: +            raise forms.ValidationError( +                _(u"This import type have no unicity type defined. " +                  u"Conservative import is not possible.")) +        return data +      def save(self, user, commit=True):          self.instance.user = user          return super(NewImportForm, self).save(commit) diff --git a/ishtar_common/locale/django.pot b/ishtar_common/locale/django.pot index 771e1f2f2..7d64d9d63 100644 --- a/ishtar_common/locale/django.pot +++ b/ishtar_common/locale/django.pot @@ -20,22 +20,6 @@ msgstr ""  msgid "Related item"  msgstr "" -#: context_processors.py:38 -msgid "Archaeological file" -msgstr "" - -#: context_processors.py:39 models.py:1512 -msgid "Operation" -msgstr "" - -#: context_processors.py:41 -msgid "Context record" -msgstr "" - -#: context_processors.py:43 -msgid "Find" -msgstr "" -  #: data_importer.py:182  #, python-format  msgid "\"%(value)s\" is too long. The max length is %(length)d characters." @@ -147,7 +131,7 @@ msgstr ""  msgid "Enter a valid name consisting of letters, spaces and hyphens."  msgstr "" -#: forms.py:71 forms_common.py:510 +#: forms.py:71 forms_common.py:520  msgid "Confirm"  msgstr "" @@ -171,12 +155,12 @@ msgstr ""  msgid "Add a new item"  msgstr "" -#: forms.py:245 models.py:1276 +#: forms.py:245 models.py:1278  msgid "Template"  msgstr "" -#: forms_common.py:40 forms_common.py:58 forms_common.py:171 -#: forms_common.py:298 models.py:1342 models.py:2655 +#: forms_common.py:40 forms_common.py:58 forms_common.py:181 +#: forms_common.py:308 models.py:1344 models.py:2658  #: templates/blocks/JQueryAdvancedTown.html:19  #: templates/ishtar/sheet_organization.html:13  msgid "Town" @@ -192,70 +176,76 @@ msgid ""  "french town Saint-Denis in the Seine-Saint-Denis department.</p>"  msgstr "" -#: forms_common.py:67 forms_common.py:747 ishtar_menu.py:47 models.py:1510 -#: models.py:2324 models.py:2478 models.py:2535 +#: forms_common.py:67 forms_common.py:757 ishtar_menu.py:47 models.py:1512 +#: models.py:2326 models.py:2480 models.py:2538  #: templates/ishtar/sheet_person.html:4  msgid "Person"  msgstr "" -#: forms_common.py:159 forms_common.py:236 forms_common.py:343 -#: ishtar_menu.py:71 models.py:1511 models.py:2229 +#: forms_common.py:116 +msgid "" +"This import type have no unicity type defined. Conservative import is not " +"possible." +msgstr "" + +#: forms_common.py:169 forms_common.py:246 forms_common.py:353 +#: ishtar_menu.py:71 models.py:1513 models.py:2231  #: templates/ishtar/sheet_organization.html:4  msgid "Organization"  msgstr "" -#: forms_common.py:162 forms_common.py:199 forms_common.py:231 -#: forms_common.py:268 forms_common.py:338 models.py:943 models.py:1275 -#: models.py:1556 models.py:1774 models.py:2223 models.py:2310 models.py:2641 +#: forms_common.py:172 forms_common.py:209 forms_common.py:241 +#: forms_common.py:278 forms_common.py:348 models.py:945 models.py:1277 +#: models.py:1558 models.py:1776 models.py:2225 models.py:2312 models.py:2644  #: templates/ishtar/sheet_organization.html:8  #: templates/ishtar/sheet_organization.html:21  msgid "Name"  msgstr "" -#: forms_common.py:163 models.py:1497 models.py:1905 +#: forms_common.py:173 models.py:1499 models.py:1907  msgid "Organization type"  msgstr "" -#: forms_common.py:165 forms_common.py:292 models.py:1337 +#: forms_common.py:175 forms_common.py:302 models.py:1339  #: templates/ishtar/sheet_organization.html:10  msgid "Address"  msgstr "" -#: forms_common.py:167 forms_common.py:295 models.py:1338 +#: forms_common.py:177 forms_common.py:305 models.py:1340  #: templates/ishtar/sheet_organization.html:11  msgid "Address complement"  msgstr "" -#: forms_common.py:169 forms_common.py:296 models.py:1340 +#: forms_common.py:179 forms_common.py:306 models.py:1342  #: templates/ishtar/sheet_organization.html:12  msgid "Postal code"  msgstr "" -#: forms_common.py:172 forms_common.py:299 models.py:1343 +#: forms_common.py:182 forms_common.py:309 models.py:1345  msgid "Country"  msgstr "" -#: forms_common.py:174 forms_common.py:233 forms_common.py:272 -#: forms_common.py:340 forms_common.py:464 models.py:1370 +#: forms_common.py:184 forms_common.py:243 forms_common.py:282 +#: forms_common.py:350 forms_common.py:474 models.py:1372  msgid "Email"  msgstr "" -#: forms_common.py:175 forms_common.py:275 models.py:1355 +#: forms_common.py:185 forms_common.py:285 models.py:1357  #: templates/ishtar/sheet_organization.html:14  #: templates/ishtar/sheet_person.html:19  #: templates/ishtar/wizard/wizard_person.html:17  msgid "Phone"  msgstr "" -#: forms_common.py:176 forms_common.py:284 models.py:1367 +#: forms_common.py:186 forms_common.py:294 models.py:1369  #: templates/ishtar/sheet_organization.html:15  #: templates/ishtar/sheet_person.html:37  #: templates/ishtar/wizard/wizard_person.html:35  msgid "Mobile phone"  msgstr "" -#: forms_common.py:200 forms_common.py:234 forms_common.py:341 models.py:1933 -#: models.py:2225 models.py:2576 templates/sheet_ope.html:85 +#: forms_common.py:210 forms_common.py:244 forms_common.py:351 models.py:1935 +#: models.py:2227 models.py:2579 templates/sheet_ope.html:85  #: templates/sheet_ope.html.py:105 templates/sheet_ope.html:126  #: templates/ishtar/import_list.html:13  #: templates/ishtar/sheet_organization.html:23 @@ -263,225 +253,225 @@ msgstr ""  msgid "Type"  msgstr "" -#: forms_common.py:209 views.py:137 +#: forms_common.py:219 views.py:137  msgid "Organization search"  msgstr "" -#: forms_common.py:232 forms_common.py:266 forms_common.py:339 models.py:2308 +#: forms_common.py:242 forms_common.py:276 forms_common.py:349 models.py:2310  #: templates/ishtar/sheet_organization.html:22  msgid "Surname"  msgstr "" -#: forms_common.py:248 forms_common.py:326 views.py:102 +#: forms_common.py:258 forms_common.py:336 views.py:102  msgid "Person search"  msgstr "" -#: forms_common.py:260 templates/ishtar/sheet_person.html:7 +#: forms_common.py:270 templates/ishtar/sheet_person.html:7  #: templates/ishtar/wizard/wizard_person.html:6  msgid "Identity"  msgstr "" -#: forms_common.py:263 forms_common.py:665 forms_common.py:714 models.py:1906 -#: models.py:2302 models.py:2304 models.py:2573 templates/sheet_ope.html:104 +#: forms_common.py:273 forms_common.py:675 forms_common.py:724 models.py:1908 +#: models.py:2304 models.py:2306 models.py:2576 templates/sheet_ope.html:104  #: templates/ishtar/blocks/window_tables/documents.html:7  msgid "Title"  msgstr "" -#: forms_common.py:264 models.py:2306 +#: forms_common.py:274 models.py:2308  msgid "Salutation"  msgstr "" -#: forms_common.py:270 models.py:2312 +#: forms_common.py:280 models.py:2314  msgid "Raw name"  msgstr "" -#: forms_common.py:273 models.py:1356 +#: forms_common.py:283 models.py:1358  msgid "Phone description"  msgstr "" -#: forms_common.py:276 models.py:1358 models.py:1360 +#: forms_common.py:286 models.py:1360 models.py:1362  msgid "Phone description 2"  msgstr "" -#: forms_common.py:278 +#: forms_common.py:288  msgid "Phone 2"  msgstr "" -#: forms_common.py:280 models.py:1364 +#: forms_common.py:290 models.py:1366  msgid "Phone description 3"  msgstr "" -#: forms_common.py:282 models.py:1362 +#: forms_common.py:292 models.py:1364  msgid "Phone 3"  msgstr "" -#: forms_common.py:287 +#: forms_common.py:297  msgid "Current organization"  msgstr "" -#: forms_common.py:301 models.py:1345 +#: forms_common.py:311 models.py:1347  msgid "Other address: address"  msgstr "" -#: forms_common.py:304 models.py:1348 +#: forms_common.py:314 models.py:1350  msgid "Other address: address complement"  msgstr "" -#: forms_common.py:306 models.py:1349 +#: forms_common.py:316 models.py:1351  msgid "Other address: postal code"  msgstr "" -#: forms_common.py:308 models.py:1351 +#: forms_common.py:318 models.py:1353  msgid "Other address: town"  msgstr "" -#: forms_common.py:310 models.py:1353 +#: forms_common.py:320 models.py:1355  msgid "Other address: country"  msgstr "" -#: forms_common.py:322 +#: forms_common.py:332  msgid "Already has an account"  msgstr "" -#: forms_common.py:337 +#: forms_common.py:347  msgid "Username"  msgstr "" -#: forms_common.py:355 +#: forms_common.py:365  msgid "Account search"  msgstr "" -#: forms_common.py:402 forms_common.py:442 forms_common.py:446 models.py:2277 +#: forms_common.py:412 forms_common.py:452 forms_common.py:456 models.py:2279  msgid "Person type"  msgstr "" -#: forms_common.py:458 forms_common.py:463 ishtar_menu.py:32 +#: forms_common.py:468 forms_common.py:473 ishtar_menu.py:32  msgid "Account"  msgstr "" -#: forms_common.py:467 wizards.py:1192 +#: forms_common.py:477 wizards.py:1192  msgid "New password"  msgstr "" -#: forms_common.py:470 +#: forms_common.py:480  msgid "New password (confirmation)"  msgstr "" -#: forms_common.py:491 +#: forms_common.py:501  msgid "Your password and confirmation password do not match."  msgstr "" -#: forms_common.py:496 +#: forms_common.py:506  msgid "You must provide a correct password."  msgstr "" -#: forms_common.py:504 +#: forms_common.py:514  msgid "This username already exists."  msgstr "" -#: forms_common.py:511 +#: forms_common.py:521  msgid "Send the new password by email?"  msgstr "" -#: forms_common.py:520 forms_common.py:533 models.py:2656 +#: forms_common.py:530 forms_common.py:543 models.py:2659  msgid "Towns"  msgstr "" -#: forms_common.py:530 +#: forms_common.py:540  msgid "There are identical towns."  msgstr "" -#: forms_common.py:614 +#: forms_common.py:624  msgid "Only one choice can be checked."  msgstr "" -#: forms_common.py:662 +#: forms_common.py:672  msgid "Documentation informations"  msgstr "" -#: forms_common.py:667 forms_common.py:715 models.py:1907 models.py:2556 +#: forms_common.py:677 forms_common.py:725 models.py:1909 models.py:2559  msgid "Source type"  msgstr "" -#: forms_common.py:669 forms_common.py:716 templates/sheet_ope.html:84 +#: forms_common.py:679 forms_common.py:726 templates/sheet_ope.html:84  msgid "Reference"  msgstr "" -#: forms_common.py:672 forms_common.py:717 +#: forms_common.py:682 forms_common.py:727  msgid "Internal reference"  msgstr "" -#: forms_common.py:675 models.py:2587 +#: forms_common.py:685 models.py:2590  msgid "Numerical ressource (web address)"  msgstr "" -#: forms_common.py:676 models.py:2589 +#: forms_common.py:686 models.py:2592  msgid "Receipt date"  msgstr "" -#: forms_common.py:678 models.py:2060 models.py:2591 +#: forms_common.py:688 models.py:2062 models.py:2594  msgid "Creation date"  msgstr "" -#: forms_common.py:681 models.py:2594 +#: forms_common.py:691 models.py:2597  msgid "Receipt date in documentation"  msgstr "" -#: forms_common.py:683 forms_common.py:719 models.py:287 models.py:546 -#: models.py:1801 models.py:2316 models.py:2601 +#: forms_common.py:693 forms_common.py:729 models.py:289 models.py:548 +#: models.py:1803 models.py:2318 models.py:2604  msgid "Comment"  msgstr "" -#: forms_common.py:685 forms_common.py:718 models.py:945 models.py:1560 -#: models.py:1733 models.py:1775 models.py:2600 templates/sheet_ope.html:128 +#: forms_common.py:695 forms_common.py:728 models.py:947 models.py:1562 +#: models.py:1735 models.py:1777 models.py:2603 templates/sheet_ope.html:128  msgid "Description"  msgstr "" -#: forms_common.py:688 models.py:2602 +#: forms_common.py:698 models.py:2605  msgid "Additional information"  msgstr "" -#: forms_common.py:690 forms_common.py:722 models.py:2604 +#: forms_common.py:700 forms_common.py:732 models.py:2607  msgid "Has a duplicate"  msgstr "" -#: forms_common.py:693 +#: forms_common.py:703  msgid "Image"  msgstr "" -#: forms_common.py:694 +#: forms_common.py:704  #, python-format  msgid ""  "<p>Heavy images are resized to: %(width)dx%(height)d (ratio is preserved).</"  "p>"  msgstr "" -#: forms_common.py:711 forms_common.py:740 forms_common.py:774 models.py:2540 +#: forms_common.py:721 forms_common.py:750 forms_common.py:784 models.py:2543  #: templates/ishtar/wizard/wizard_person_deletion.html:124  msgid "Author"  msgstr "" -#: forms_common.py:721 +#: forms_common.py:731  msgid "Additional informations"  msgstr "" -#: forms_common.py:732 +#: forms_common.py:742  msgid "Would you like to delete this documentation?"  msgstr "" -#: forms_common.py:748 models.py:1908 models.py:2530 models.py:2537 +#: forms_common.py:758 models.py:1910 models.py:2533 models.py:2540  msgid "Author type"  msgstr "" -#: forms_common.py:767 +#: forms_common.py:777  msgid "Author selection"  msgstr "" -#: forms_common.py:781 +#: forms_common.py:791  msgid "There are identical authors."  msgstr "" -#: forms_common.py:785 models.py:2541 models.py:2583 +#: forms_common.py:795 models.py:2544 models.py:2586  #: templates/sheet_ope.html:106  #: templates/ishtar/blocks/window_tables/documents.html:9  msgid "Authors" @@ -499,7 +489,7 @@ msgstr ""  msgid "Deletion"  msgstr "" -#: ishtar_menu.py:39 models.py:1071 views.py:1239 +#: ishtar_menu.py:39 models.py:1073 views.py:1365  msgid "Global variables"  msgstr "" @@ -523,20 +513,20 @@ msgstr ""  msgid "Merge"  msgstr "" -#: ishtar_menu.py:66 ishtar_menu.py:93 models.py:2097 widgets.py:110 +#: ishtar_menu.py:66 ishtar_menu.py:93 models.py:2099 widgets.py:110  #: templates/ishtar/form_delete.html:11  msgid "Delete"  msgstr "" -#: ishtar_menu.py:101 models.py:2071 +#: ishtar_menu.py:101 models.py:2073  msgid "Imports"  msgstr "" -#: ishtar_menu.py:104 views.py:1247 +#: ishtar_menu.py:104 views.py:1373  msgid "New import"  msgstr "" -#: ishtar_menu.py:108 views.py:1261 +#: ishtar_menu.py:108 views.py:1387  msgid "Current imports"  msgstr "" @@ -556,200 +546,200 @@ msgstr ""  msgid "This item already exists."  msgstr "" -#: models.py:283 models.py:545 models.py:1310 models.py:1322 +#: models.py:285 models.py:547 models.py:1312 models.py:1324  msgid "Label"  msgstr "" -#: models.py:285 +#: models.py:287  msgid "Textual ID"  msgstr "" -#: models.py:288 models.py:548 models.py:1279 +#: models.py:290 models.py:550 models.py:1281  msgid "Available"  msgstr "" -#: models.py:567 models.py:1847 +#: models.py:569 models.py:1849  msgid "Key"  msgstr "" -#: models.py:573 +#: models.py:575  msgid "Specific key to an import"  msgstr "" -#: models.py:664 +#: models.py:666  msgid "Last editor"  msgstr "" -#: models.py:667 +#: models.py:669  msgid "Creator"  msgstr "" -#: models.py:807 models.py:2667 +#: models.py:809 models.py:2670  msgid "Order"  msgstr "" -#: models.py:808 +#: models.py:810  msgid "Symmetrical"  msgstr "" -#: models.py:809 +#: models.py:811  msgid "Tiny label"  msgstr "" -#: models.py:823 +#: models.py:825  msgid "Cannot have symmetrical and an inverse_relation"  msgstr "" -#: models.py:937 +#: models.py:939  msgid "Euro"  msgstr "" -#: models.py:938 +#: models.py:940  msgid "US dollar"  msgstr "" -#: models.py:944 models.py:1558 +#: models.py:946 models.py:1560  msgid "Slug"  msgstr "" -#: models.py:946 +#: models.py:948  msgid "Files module"  msgstr "" -#: models.py:947 +#: models.py:949  msgid "Context records module"  msgstr "" -#: models.py:949 +#: models.py:951  msgid "Finds module"  msgstr "" -#: models.py:950 +#: models.py:952  msgid "Need context records module"  msgstr "" -#: models.py:952 +#: models.py:954  msgid "Warehouses module"  msgstr "" -#: models.py:953 +#: models.py:955  msgid "Need finds module"  msgstr "" -#: models.py:955 +#: models.py:957  msgid "Home page"  msgstr "" -#: models.py:956 +#: models.py:958  #, python-brace-format  msgid ""  "Homepage of Ishtar - if not defined a default homepage will appear. Use the "  "markdown syntax. {random_image} can be used to display a random image."  msgstr "" -#: models.py:960 +#: models.py:962  msgid "File external id"  msgstr "" -#: models.py:962 +#: models.py:964  msgid ""  "Formula to manage file external ID. Change this with care. With incorrect "  "formula, the application might be unusable and import of external data can "  "be destructive."  msgstr "" -#: models.py:967 +#: models.py:969  msgid "Parcel external id"  msgstr "" -#: models.py:970 +#: models.py:972  msgid ""  "Formula to manage parcel external ID. Change this with care. With incorrect "  "formula, the application might be unusable and import of external data can "  "be destructive."  msgstr "" -#: models.py:975 +#: models.py:977  msgid "Context record external id"  msgstr "" -#: models.py:977 +#: models.py:979  msgid ""  "Formula to manage context record external ID. Change this with care. With "  "incorrect formula, the application might be unusable and import of external "  "data can be destructive."  msgstr "" -#: models.py:982 +#: models.py:984  msgid "Base find external id"  msgstr "" -#: models.py:984 +#: models.py:986  msgid ""  "Formula to manage base find external ID. Change this with care. With "  "incorrect formula, the application might be unusable and import of external "  "data can be destructive."  msgstr "" -#: models.py:989 +#: models.py:991  msgid "Find external id"  msgstr "" -#: models.py:991 +#: models.py:993  msgid ""  "Formula to manage find external ID. Change this with care. With incorrect "  "formula, the application might be unusable and import of external data can "  "be destructive."  msgstr "" -#: models.py:996 +#: models.py:998  msgid "Raw name for person"  msgstr "" -#: models.py:998 +#: models.py:1000  msgid ""  "Formula to manage person raw_name. Change this with care. With incorrect "  "formula, the application might be unusable and import of external data can "  "be destructive."  msgstr "" -#: models.py:1002 +#: models.py:1004  msgid "Current active"  msgstr "" -#: models.py:1003 +#: models.py:1005  msgid "Currency"  msgstr "" -#: models.py:1007 +#: models.py:1009  msgid "Ishtar site profile"  msgstr "" -#: models.py:1008 +#: models.py:1010  msgid "Ishtar site profiles"  msgstr "" -#: models.py:1064 +#: models.py:1066  msgid "Variable name"  msgstr "" -#: models.py:1065 +#: models.py:1067  msgid "Description of the variable"  msgstr "" -#: models.py:1067 models.py:1848 +#: models.py:1069 models.py:1850  msgid "Value"  msgstr "" -#: models.py:1070 +#: models.py:1072  msgid "Global variable"  msgstr "" -#: models.py:1180 models.py:1210 +#: models.py:1182 models.py:1212  msgid "Total"  msgstr "" -#: models.py:1187 models.py:1311 models.py:1323 +#: models.py:1189 models.py:1313 models.py:1325  #: templates/ishtar/sheet_person.html:22  #: templates/ishtar/dashboards/dashboard_main_detail.html:141  #: templates/ishtar/dashboards/dashboard_main_detail_users.html:26 @@ -757,589 +747,593 @@ msgstr ""  msgid "Number"  msgstr "" -#: models.py:1274 +#: models.py:1276  msgid "Administrative Act"  msgstr "" -#: models.py:1278 +#: models.py:1280  msgid "Associated object"  msgstr "" -#: models.py:1282 +#: models.py:1284  msgid "Document template"  msgstr "" -#: models.py:1283 +#: models.py:1285  msgid "Document templates"  msgstr "" -#: models.py:1314 models.py:1324 models.py:2055 +#: models.py:1316 models.py:1326 models.py:2057  msgid "State"  msgstr "" -#: models.py:1328 templates/blocks/JQueryAdvancedTown.html:12 +#: models.py:1330 templates/blocks/JQueryAdvancedTown.html:12  msgid "Department"  msgstr "" -#: models.py:1329 +#: models.py:1331  msgid "Departments"  msgstr "" -#: models.py:1366 +#: models.py:1368  msgid "Raw phone"  msgstr "" -#: models.py:1372 +#: models.py:1374  msgid "Alternative address is prefered"  msgstr "" -#: models.py:1411 +#: models.py:1413  msgid "Tel: "  msgstr "" -#: models.py:1415 +#: models.py:1417  msgid "Mobile: "  msgstr "" -#: models.py:1419 +#: models.py:1421  msgid "Email: "  msgstr "" -#: models.py:1424 +#: models.py:1426  msgid "Merge key"  msgstr "" -#: models.py:1498 +#: models.py:1500  msgid "Organization types"  msgstr "" -#: models.py:1514 +#: models.py:1514 views.py:211 +msgid "Operation" +msgstr "" + +#: models.py:1516  msgid "Archaeological site"  msgstr "" -#: models.py:1515 +#: models.py:1517  msgid "Parcels"  msgstr "" -#: models.py:1517 +#: models.py:1519  msgid "Operation source"  msgstr "" -#: models.py:1520 views.py:1064 views.py:1115 +#: models.py:1522 views.py:1190 views.py:1241  msgid "Archaeological files"  msgstr "" -#: models.py:1522 views.py:1067 views.py:1123 +#: models.py:1524 views.py:1193 views.py:1249  msgid "Context records"  msgstr "" -#: models.py:1524 +#: models.py:1526  msgid "Context record relations"  msgstr "" -#: models.py:1526 views.py:1069 views.py:1126 +#: models.py:1528 views.py:1195 views.py:1252  msgid "Finds"  msgstr "" -#: models.py:1562 templates/ishtar/dashboards/dashboard_main.html:25 +#: models.py:1564 templates/ishtar/dashboards/dashboard_main.html:25  msgid "Users"  msgstr "" -#: models.py:1564 +#: models.py:1566  msgid "Associated model"  msgstr "" -#: models.py:1567 +#: models.py:1569  msgid "Is template"  msgstr "" -#: models.py:1568 +#: models.py:1570  msgid "Unicity keys (separator \";\")"  msgstr "" -#: models.py:1572 +#: models.py:1574  msgid "Importer - Type"  msgstr "" -#: models.py:1573 +#: models.py:1575  msgid "Importer - Types"  msgstr "" -#: models.py:1663 +#: models.py:1665  msgid "Importer - Default"  msgstr "" -#: models.py:1664 +#: models.py:1666  msgid "Importer - Defaults"  msgstr "" -#: models.py:1699 +#: models.py:1701  msgid "Importer - Default value"  msgstr "" -#: models.py:1700 +#: models.py:1702  msgid "Importer - Default values"  msgstr "" -#: models.py:1732 +#: models.py:1734  msgid "Column number"  msgstr "" -#: models.py:1735 +#: models.py:1737  msgid "Required"  msgstr "" -#: models.py:1738 +#: models.py:1740  msgid "Importer - Column"  msgstr "" -#: models.py:1739 +#: models.py:1741  msgid "Importer - Columns"  msgstr "" -#: models.py:1759 +#: models.py:1761  msgid "Field name"  msgstr "" -#: models.py:1761 models.py:1795 +#: models.py:1763 models.py:1797  msgid "Force creation of new items"  msgstr "" -#: models.py:1763 models.py:1797 +#: models.py:1765 models.py:1799  msgid "Concatenate with existing"  msgstr "" -#: models.py:1765 models.py:1799 +#: models.py:1767 models.py:1801  msgid "Concatenate character"  msgstr "" -#: models.py:1769 +#: models.py:1771  msgid "Importer - Duplicate field"  msgstr "" -#: models.py:1770 +#: models.py:1772  msgid "Importer - Duplicate fields"  msgstr "" -#: models.py:1777 +#: models.py:1779  msgid "Regular expression"  msgstr "" -#: models.py:1780 +#: models.py:1782  msgid "Importer - Regular expression"  msgstr "" -#: models.py:1781 +#: models.py:1783  msgid "Importer - Regular expressions"  msgstr "" -#: models.py:1804 +#: models.py:1806  msgid "Importer - Target"  msgstr "" -#: models.py:1805 +#: models.py:1807  msgid "Importer - Targets"  msgstr "" -#: models.py:1829 views.py:350 +#: models.py:1831 views.py:476  msgid "True"  msgstr "" -#: models.py:1830 views.py:352 +#: models.py:1832 views.py:478  msgid "False"  msgstr "" -#: models.py:1849 +#: models.py:1851  msgid "Is set"  msgstr "" -#: models.py:1856 +#: models.py:1858  msgid "Importer - Target key"  msgstr "" -#: models.py:1857 +#: models.py:1859  msgid "Importer - Targets keys"  msgstr "" -#: models.py:1909 models.py:2568 models.py:2579 +#: models.py:1911 models.py:2571 models.py:2582  msgid "Format"  msgstr "" -#: models.py:1910 models.py:2671 +#: models.py:1912 models.py:2674  msgid "Operation type"  msgstr "" -#: models.py:1911 +#: models.py:1913  msgid "Period"  msgstr "" -#: models.py:1912 +#: models.py:1914  msgid "Report state"  msgstr "" -#: models.py:1913 +#: models.py:1915  msgid "Unit"  msgstr "" -#: models.py:1914 +#: models.py:1916  msgid "Material"  msgstr "" -#: models.py:1916 +#: models.py:1918  msgid "Conservatory state"  msgstr "" -#: models.py:1917 +#: models.py:1919  msgid "Preservation type"  msgstr "" -#: models.py:1918 +#: models.py:1920  msgid "Object type"  msgstr "" -#: models.py:1920 +#: models.py:1922  msgid "Identification type"  msgstr "" -#: models.py:1922 +#: models.py:1924  msgid "Context record relation type"  msgstr "" -#: models.py:1923 models.py:2562 +#: models.py:1925 models.py:2565  msgid "Support type"  msgstr "" -#: models.py:1929 +#: models.py:1931  msgid "Integer"  msgstr "" -#: models.py:1930 +#: models.py:1932  msgid "Float"  msgstr "" -#: models.py:1931 +#: models.py:1933  msgid "String"  msgstr "" -#: models.py:1932 templates/sheet_ope.html:86 +#: models.py:1934 templates/sheet_ope.html:86  msgid "Date"  msgstr "" -#: models.py:1934 templates/sheet_ope.html:61 templates/sheet_ope.html.py:83 +#: models.py:1936 templates/sheet_ope.html:61 templates/sheet_ope.html.py:83  #: templates/ishtar/dashboards/dashboard_main_detail.html:126  msgid "Year"  msgstr "" -#: models.py:1935 +#: models.py:1937  msgid "String to boolean"  msgstr "" -#: models.py:1936 +#: models.py:1938  msgctxt "filesystem"  msgid "File"  msgstr "" -#: models.py:1937 +#: models.py:1939  msgid "Unknow type"  msgstr "" -#: models.py:1953 +#: models.py:1955  msgid "4 digit year. e.g.: \"2015\""  msgstr "" -#: models.py:1954 +#: models.py:1956  msgid "4 digit year/month/day. e.g.: \"2015/02/04\""  msgstr "" -#: models.py:1955 +#: models.py:1957  msgid "Day/month/4 digit year. e.g.: \"04/02/2015\""  msgstr "" -#: models.py:1965 +#: models.py:1967  msgid "Options"  msgstr "" -#: models.py:1967 +#: models.py:1969  msgid "Split character(s)"  msgstr "" -#: models.py:1971 +#: models.py:1973  msgid "Importer - Formater type"  msgstr "" -#: models.py:1972 +#: models.py:1974  msgid "Importer - Formater types"  msgstr "" -#: models.py:2019 templates/ishtar/dashboards/dashboard_main_detail.html:63 +#: models.py:2021 templates/ishtar/dashboards/dashboard_main_detail.html:63  msgid "Created"  msgstr "" -#: models.py:2020 +#: models.py:2022  msgid "Analyse in progress"  msgstr "" -#: models.py:2021 +#: models.py:2023  msgid "Analysed"  msgstr "" -#: models.py:2022 +#: models.py:2024  msgid "Import pending"  msgstr "" -#: models.py:2023 +#: models.py:2025  msgid "Import in progress"  msgstr "" -#: models.py:2024 +#: models.py:2026  msgid "Finished with errors"  msgstr "" -#: models.py:2025 +#: models.py:2027  msgid "Finished"  msgstr "" -#: models.py:2026 +#: models.py:2028  msgid "Archived"  msgstr "" -#: models.py:2038 +#: models.py:2040  msgid "Imported file"  msgstr "" -#: models.py:2041 +#: models.py:2043  msgid "Associated images (zip file)"  msgstr "" -#: models.py:2043 +#: models.py:2045  msgid "Encoding"  msgstr "" -#: models.py:2045 +#: models.py:2047  msgid "Skip lines"  msgstr "" -#: models.py:2046 templates/ishtar/import_list.html:47 +#: models.py:2048 templates/ishtar/import_list.html:47  msgid "Error file"  msgstr "" -#: models.py:2049 +#: models.py:2051  msgid "Result file"  msgstr "" -#: models.py:2052 templates/ishtar/import_list.html:53 +#: models.py:2054 templates/ishtar/import_list.html:53  msgid "Match file"  msgstr "" -#: models.py:2058 +#: models.py:2060  msgid "Conservative import"  msgstr "" -#: models.py:2063 +#: models.py:2065  msgid "End date"  msgstr "" -#: models.py:2065 +#: models.py:2067  msgid "Remaining seconds"  msgstr "" -#: models.py:2070 +#: models.py:2072  msgid "Import"  msgstr "" -#: models.py:2087 +#: models.py:2089  msgid "Analyse"  msgstr "" -#: models.py:2089 models.py:2092 +#: models.py:2091 models.py:2094  msgid "Re-analyse"  msgstr "" -#: models.py:2090 +#: models.py:2092  msgid "Launch import"  msgstr "" -#: models.py:2093 +#: models.py:2095  msgid "Re-import"  msgstr "" -#: models.py:2094 +#: models.py:2096  msgid "Archive"  msgstr "" -#: models.py:2096 +#: models.py:2098  msgid "Unarchive"  msgstr "" -#: models.py:2230 +#: models.py:2232  msgid "Organizations"  msgstr "" -#: models.py:2232 +#: models.py:2234  msgid "Can view all Organizations"  msgstr "" -#: models.py:2233 +#: models.py:2235  msgid "Can view own Organization"  msgstr "" -#: models.py:2234 +#: models.py:2236  msgid "Can add own Organization"  msgstr "" -#: models.py:2236 +#: models.py:2238  msgid "Can change own Organization"  msgstr "" -#: models.py:2238 +#: models.py:2240  msgid "Can delete own Organization"  msgstr "" -#: models.py:2273 +#: models.py:2275  msgid "Groups"  msgstr "" -#: models.py:2278 +#: models.py:2280  msgid "Person types"  msgstr "" -#: models.py:2284 +#: models.py:2286  msgid "Title type"  msgstr "" -#: models.py:2285 +#: models.py:2287  msgid "Title types"  msgstr "" -#: models.py:2292 +#: models.py:2294  msgid "Mr"  msgstr "" -#: models.py:2293 +#: models.py:2295  msgid "Miss"  msgstr "" -#: models.py:2294 +#: models.py:2296  msgid "Mr and Mrs"  msgstr "" -#: models.py:2295 +#: models.py:2297  msgid "Mrs"  msgstr "" -#: models.py:2296 +#: models.py:2298  msgid "Doctor"  msgstr "" -#: models.py:2314 +#: models.py:2316  msgid "Contact type"  msgstr "" -#: models.py:2317 models.py:2366 +#: models.py:2319 models.py:2368  msgid "Types"  msgstr "" -#: models.py:2320 +#: models.py:2322  msgid "Is attached to"  msgstr "" -#: models.py:2325 +#: models.py:2327  msgid "Persons"  msgstr "" -#: models.py:2327 +#: models.py:2329  msgid "Can view all Persons"  msgstr "" -#: models.py:2328 +#: models.py:2330  msgid "Can view own Person"  msgstr "" -#: models.py:2329 +#: models.py:2331  msgid "Can add own Person"  msgstr "" -#: models.py:2330 +#: models.py:2332  msgid "Can change own Person"  msgstr "" -#: models.py:2331 +#: models.py:2333  msgid "Can delete own Person"  msgstr "" -#: models.py:2482 +#: models.py:2484  msgid "Ishtar user"  msgstr "" -#: models.py:2483 +#: models.py:2485  msgid "Ishtar users"  msgstr "" -#: models.py:2525 +#: models.py:2528  msgid "To modify the password use the form in Auth > User"  msgstr "" -#: models.py:2531 +#: models.py:2534  msgid "Author types"  msgstr "" -#: models.py:2557 +#: models.py:2560  msgid "Source types"  msgstr "" -#: models.py:2563 +#: models.py:2566  msgid "Support types"  msgstr "" -#: models.py:2569 +#: models.py:2572  msgid "Formats"  msgstr "" -#: models.py:2574 +#: models.py:2577  msgid "External ID"  msgstr "" -#: models.py:2577 +#: models.py:2580  msgid "Support"  msgstr "" -#: models.py:2581 +#: models.py:2584  msgid "Scale"  msgstr "" -#: models.py:2595 +#: models.py:2598  msgid "Item number"  msgstr "" -#: models.py:2596 +#: models.py:2599  msgid "Ref."  msgstr "" -#: models.py:2599 +#: models.py:2602  msgid "Internal ref."  msgstr "" -#: models.py:2642 +#: models.py:2645  msgid "Surface (m2)"  msgstr "" -#: models.py:2643 templates/sheet_ope.html:46 templates/sheet_ope.html.py:107 +#: models.py:2646 templates/sheet_ope.html:46 templates/sheet_ope.html.py:107  msgid "Localisation"  msgstr "" -#: models.py:2668 +#: models.py:2671  msgid "Is preventive"  msgstr "" -#: models.py:2672 +#: models.py:2675  msgid "Operation types"  msgstr "" -#: models.py:2701 +#: models.py:2704  msgid "Preventive"  msgstr "" -#: models.py:2702 +#: models.py:2705  msgid "Research"  msgstr "" @@ -1383,28 +1377,40 @@ msgstr ""  msgid "Account deletion"  msgstr "" -#: views.py:977 views.py:1046 +#: views.py:210 +msgid "Archaeological file" +msgstr "" + +#: views.py:213 +msgid "Context record" +msgstr "" + +#: views.py:215 +msgid "Find" +msgstr "" + +#: views.py:1103 views.py:1172  msgid "Operation not permitted."  msgstr "" -#: views.py:979 +#: views.py:1105  #, python-format  msgid "New %s"  msgstr "" -#: views.py:1065 views.py:1119 +#: views.py:1191 views.py:1245  msgid "Operations"  msgstr "" -#: views.py:1308 templates/ishtar/import_list.html:43 +#: views.py:1434 templates/ishtar/import_list.html:43  msgid "Link unmatched items"  msgstr "" -#: views.py:1323 +#: views.py:1449  msgid "Delete import"  msgstr "" -#: views.py:1382 views.py:1398 +#: views.py:1508 views.py:1524  msgid "Corporation manager"  msgstr "" @@ -1471,29 +1477,29 @@ msgstr ""  msgid "The %(app_name)s team"  msgstr "" -#: templates/base.html:36 +#: templates/base.html:41  msgid "Logged in"  msgstr "" -#: templates/base.html:37 +#: templates/base.html:42  msgid "Log out"  msgstr "" -#: templates/base.html:38 +#: templates/base.html:43  msgid "Change password"  msgstr "" -#: templates/base.html:40 templates/registration/activate.html:10 +#: templates/base.html:45 templates/registration/activate.html:10  #: templates/registration/login.html:8 templates/registration/login.html:10  #: templates/registration/password_reset_complete.html:8  msgid "Log in"  msgstr "" -#: templates/base.html:46 +#: templates/base.html:51  msgid "Lang"  msgstr "" -#: templates/base.html:46 templates/base.html.py:93 templates/welcome.html:8 +#: templates/base.html:51 templates/base.html.py:75 templates/welcome.html:8  #: templates/welcome.html.py:9 templates/welcome.html:10  #: templates/welcome.html.py:11 templates/ishtar/manage_basket.html:4  #: templates/ishtar/blocks/window_field.html:1 @@ -1503,27 +1509,23 @@ msgstr ""  msgid ":"  msgstr "" -#: templates/base.html:71 -msgid "Default selected items" -msgstr "" - -#: templates/base.html:91 +#: templates/base.html:73  msgid "Current items"  msgstr "" -#: templates/base.html:125 +#: templates/base.html:107  msgid "Processing..."  msgstr "" -#: templates/base.html:126 +#: templates/base.html:108  msgid "This can be long."  msgstr "" -#: templates/base.html:127 +#: templates/base.html:109  msgid "Time to take a coffee?"  msgstr "" -#: templates/base.html:128 +#: templates/base.html:110  msgid "Time to take another coffee?"  msgstr "" @@ -2070,6 +2072,17 @@ msgstr ""  msgid "Documents associated to finds"  msgstr "" +#: templates/ishtar/blocks/shortcut_menu.html:6 +msgid "" +"Pin an item in order to constrain default searches with this item. By " +"default only your items are displayed. New created and modified items are " +"auto-pin." +msgstr "" + +#: templates/ishtar/blocks/shortcut_menu.html:18 +msgid "Unpin" +msgstr "" +  #: templates/ishtar/blocks/window_nav.html:6  msgid "Previous version"  msgstr "" @@ -2092,15 +2105,23 @@ msgstr ""  msgid "Next version"  msgstr "" -#: templates/ishtar/blocks/window_nav.html:45 +#: templates/ishtar/blocks/window_nav.html:46 +msgid "Item pined in your shortcut menu." +msgstr "" + +#: templates/ishtar/blocks/window_nav.html:46 +msgid "Pin" +msgstr "" + +#: templates/ishtar/blocks/window_nav.html:52  msgid "Export as OpenOffice.org file"  msgstr "" -#: templates/ishtar/blocks/window_nav.html:45 +#: templates/ishtar/blocks/window_nav.html:52  msgid "Export as PDF file"  msgstr "" -#: templates/ishtar/blocks/window_nav.html:49 +#: templates/ishtar/blocks/window_nav.html:56  msgid "Relation between items are not historized."  msgstr "" diff --git a/ishtar_common/menu_base.py b/ishtar_common/menu_base.py index 7c309d376..64dfbae95 100644 --- a/ishtar_common/menu_base.py +++ b/ishtar_common/menu_base.py @@ -89,9 +89,9 @@ class MenuItem:          for access_control in self.access_controls:              access_control = prefix + access_control              if hasattr(user, 'ishtaruser') and \ -                user.ishtaruser.has_perm(access_control, self.model) or\ +                user.ishtaruser.has_perm(access_control, self.model, +                                         session=session) or \                 access_control in user.get_group_permissions(): -                #                         session=session) or \                  return True          # manage by person type          if hasattr(user, 'ishtaruser'): diff --git a/ishtar_common/models.py b/ishtar_common/models.py index 6150ab0aa..e4a72eab7 100644 --- a/ishtar_common/models.py +++ b/ishtar_common/models.py @@ -235,7 +235,7 @@ class OwnPerms:          return cls.objects.filter(query).count()      @classmethod -    def get_owns(cls, user): +    def get_owns(cls, user, replace_query={}):          """          Get Own items          """ @@ -247,10 +247,12 @@ class OwnPerms:          if hasattr(cls, 'BASKET_MODEL'):              items = list(cls.BASKET_MODEL.objects.filter(user=user).all())          query = cls.get_query_owns(user) -        if not query: +        if not query and not replace_query:              return cls.objects.filter(pk__isnull=True) -        items += list( -            cls.objects.filter(query).order_by(*cls._meta.ordering).all()) +        q = cls.objects.filter(query) +        if replace_query: +            q = cls.objects.filter(**replace_query) +        items += list(q.order_by(*cls._meta.ordering).all())          return items @@ -2412,10 +2414,10 @@ class Person(Address, Merge, OwnPerms, ValueGetter):                  bool(self.person_types.filter(                       groups__permissions__codename=right_name).count()) or \                  bool(self.ishtaruser.filter( -                     groups__permissions__codename__in=right_name +                     groups__permissions__codename__in=[right_name]                       ).count()) or\                  bool(self.ishtaruser.filter( -                     user_permissions__codename__in=right_name).count()) +                     user_permissions__codename__in=[right_name]).count())          # or self.person_types.filter(wizard__url_name=right_name).count())          if session:              cache.set(cache_key, res, settings.CACHE_SMALLTIMEOUT) @@ -2512,8 +2514,9 @@ class IshtarUser(User):      def has_perm(self, perm, model=None, session=None, obj=None):          if not session:              return super(IshtarUser, self).has_perm(perm, model) -        cache_key = 'usersession-{}-{}'.format(session.session_key, perm, -                                               model or 'no') +        cache_key = 'usersession-{}-{}-{}-{}'.format( +            session.session_key, perm, model.__name__ if model else 'no', +            obj.pk if obj else 'no')          res = cache.get(cache_key)          if res in (True, False):              return res diff --git a/ishtar_common/static/js/chosen/chosen-sprite.png b/ishtar_common/static/js/chosen/chosen-sprite.png Binary files differnew file mode 100644 index 000000000..c57da70b4 --- /dev/null +++ b/ishtar_common/static/js/chosen/chosen-sprite.png diff --git a/ishtar_common/static/js/chosen/chosen.jquery.min.js b/ishtar_common/static/js/chosen/chosen.jquery.min.js new file mode 100644 index 000000000..806018e6c --- /dev/null +++ b/ishtar_common/static/js/chosen/chosen.jquery.min.js @@ -0,0 +1,2 @@ +/* Chosen v1.6.2 | (c) 2011-2016 by Harvest | MIT License, https://github.com/harvesthq/chosen/blob/master/LICENSE.md */ +(function(){var a,AbstractChosen,Chosen,SelectParser,b,c={}.hasOwnProperty,d=function(a,b){function d(){this.constructor=a}for(var e in b)c.call(b,e)&&(a[e]=b[e]);return d.prototype=b.prototype,a.prototype=new d,a.__super__=b.prototype,a};SelectParser=function(){function SelectParser(){this.options_index=0,this.parsed=[]}return SelectParser.prototype.add_node=function(a){return"OPTGROUP"===a.nodeName.toUpperCase()?this.add_group(a):this.add_option(a)},SelectParser.prototype.add_group=function(a){var b,c,d,e,f,g;for(b=this.parsed.length,this.parsed.push({array_index:b,group:!0,label:this.escapeExpression(a.label),title:a.title?a.title:void 0,children:0,disabled:a.disabled,classes:a.className}),f=a.childNodes,g=[],d=0,e=f.length;e>d;d++)c=f[d],g.push(this.add_option(c,b,a.disabled));return g},SelectParser.prototype.add_option=function(a,b,c){return"OPTION"===a.nodeName.toUpperCase()?(""!==a.text?(null!=b&&(this.parsed[b].children+=1),this.parsed.push({array_index:this.parsed.length,options_index:this.options_index,value:a.value,text:a.text,html:a.innerHTML,title:a.title?a.title:void 0,selected:a.selected,disabled:c===!0?c:a.disabled,group_array_index:b,group_label:null!=b?this.parsed[b].label:null,classes:a.className,style:a.style.cssText})):this.parsed.push({array_index:this.parsed.length,options_index:this.options_index,empty:!0}),this.options_index+=1):void 0},SelectParser.prototype.escapeExpression=function(a){var b,c;return null==a||a===!1?"":/[\&\<\>\"\'\`]/.test(a)?(b={"<":"<",">":">",'"':""","'":"'","`":"`"},c=/&(?!\w+;)|[\<\>\"\'\`]/g,a.replace(c,function(a){return b[a]||"&"})):a},SelectParser}(),SelectParser.select_to_array=function(a){var b,c,d,e,f;for(c=new SelectParser,f=a.childNodes,d=0,e=f.length;e>d;d++)b=f[d],c.add_node(b);return c.parsed},AbstractChosen=function(){function AbstractChosen(a,b){this.form_field=a,this.options=null!=b?b:{},AbstractChosen.browser_is_supported()&&(this.is_multiple=this.form_field.multiple,this.set_default_text(),this.set_default_values(),this.setup(),this.set_up_html(),this.register_observers(),this.on_ready())}return AbstractChosen.prototype.set_default_values=function(){var a=this;return this.click_test_action=function(b){return a.test_active_click(b)},this.activate_action=function(b){return a.activate_field(b)},this.active_field=!1,this.mouse_on_container=!1,this.results_showing=!1,this.result_highlighted=null,this.allow_single_deselect=null!=this.options.allow_single_deselect&&null!=this.form_field.options[0]&&""===this.form_field.options[0].text?this.options.allow_single_deselect:!1,this.disable_search_threshold=this.options.disable_search_threshold||0,this.disable_search=this.options.disable_search||!1,this.enable_split_word_search=null!=this.options.enable_split_word_search?this.options.enable_split_word_search:!0,this.group_search=null!=this.options.group_search?this.options.group_search:!0,this.search_contains=this.options.search_contains||!1,this.single_backstroke_delete=null!=this.options.single_backstroke_delete?this.options.single_backstroke_delete:!0,this.max_selected_options=this.options.max_selected_options||1/0,this.inherit_select_classes=this.options.inherit_select_classes||!1,this.display_selected_options=null!=this.options.display_selected_options?this.options.display_selected_options:!0,this.display_disabled_options=null!=this.options.display_disabled_options?this.options.display_disabled_options:!0,this.include_group_label_in_selected=this.options.include_group_label_in_selected||!1,this.max_shown_results=this.options.max_shown_results||Number.POSITIVE_INFINITY,this.case_sensitive_search=this.options.case_sensitive_search||!1},AbstractChosen.prototype.set_default_text=function(){return this.form_field.getAttribute("data-placeholder")?this.default_text=this.form_field.getAttribute("data-placeholder"):this.is_multiple?this.default_text=this.options.placeholder_text_multiple||this.options.placeholder_text||AbstractChosen.default_multiple_text:this.default_text=this.options.placeholder_text_single||this.options.placeholder_text||AbstractChosen.default_single_text,this.results_none_found=this.form_field.getAttribute("data-no_results_text")||this.options.no_results_text||AbstractChosen.default_no_result_text},AbstractChosen.prototype.choice_label=function(a){return this.include_group_label_in_selected&&null!=a.group_label?"<b class='group-name'>"+a.group_label+"</b>"+a.html:a.html},AbstractChosen.prototype.mouse_enter=function(){return this.mouse_on_container=!0},AbstractChosen.prototype.mouse_leave=function(){return this.mouse_on_container=!1},AbstractChosen.prototype.input_focus=function(a){var b=this;if(this.is_multiple){if(!this.active_field)return setTimeout(function(){return b.container_mousedown()},50)}else if(!this.active_field)return this.activate_field()},AbstractChosen.prototype.input_blur=function(a){var b=this;return this.mouse_on_container?void 0:(this.active_field=!1,setTimeout(function(){return b.blur_test()},100))},AbstractChosen.prototype.results_option_build=function(a){var b,c,d,e,f,g,h;for(b="",e=0,h=this.results_data,f=0,g=h.length;g>f&&(c=h[f],d="",d=c.group?this.result_add_group(c):this.result_add_option(c),""!==d&&(e++,b+=d),(null!=a?a.first:void 0)&&(c.selected&&this.is_multiple?this.choice_build(c):c.selected&&!this.is_multiple&&this.single_set_selected_text(this.choice_label(c))),!(e>=this.max_shown_results));f++);return b},AbstractChosen.prototype.result_add_option=function(a){var b,c;return a.search_match&&this.include_option_in_results(a)?(b=[],a.disabled||a.selected&&this.is_multiple||b.push("active-result"),!a.disabled||a.selected&&this.is_multiple||b.push("disabled-result"),a.selected&&b.push("result-selected"),null!=a.group_array_index&&b.push("group-option"),""!==a.classes&&b.push(a.classes),c=document.createElement("li"),c.className=b.join(" "),c.style.cssText=a.style,c.setAttribute("data-option-array-index",a.array_index),c.innerHTML=a.search_text,a.title&&(c.title=a.title),this.outerHTML(c)):""},AbstractChosen.prototype.result_add_group=function(a){var b,c;return(a.search_match||a.group_match)&&a.active_options>0?(b=[],b.push("group-result"),a.classes&&b.push(a.classes),c=document.createElement("li"),c.className=b.join(" "),c.innerHTML=a.search_text,a.title&&(c.title=a.title),this.outerHTML(c)):""},AbstractChosen.prototype.results_update_field=function(){return this.set_default_text(),this.is_multiple||this.results_reset_cleanup(),this.result_clear_highlight(),this.results_build(),this.results_showing?this.winnow_results():void 0},AbstractChosen.prototype.reset_single_select_options=function(){var a,b,c,d,e;for(d=this.results_data,e=[],b=0,c=d.length;c>b;b++)a=d[b],a.selected?e.push(a.selected=!1):e.push(void 0);return e},AbstractChosen.prototype.results_toggle=function(){return this.results_showing?this.results_hide():this.results_show()},AbstractChosen.prototype.results_search=function(a){return this.results_showing?this.winnow_results():this.results_show()},AbstractChosen.prototype.winnow_results=function(){var a,b,c,d,e,f,g,h,i,j,k,l;for(this.no_results_clear(),d=0,f=this.get_search_text(),a=f.replace(/[-[\]{}()*+?.,\\^$|#\s]/g,"\\$&"),i=new RegExp(a,"i"),c=this.get_search_regex(a),l=this.results_data,j=0,k=l.length;k>j;j++)b=l[j],b.search_match=!1,e=null,this.include_option_in_results(b)&&(b.group&&(b.group_match=!1,b.active_options=0),null!=b.group_array_index&&this.results_data[b.group_array_index]&&(e=this.results_data[b.group_array_index],0===e.active_options&&e.search_match&&(d+=1),e.active_options+=1),b.search_text=b.group?b.label:b.html,(!b.group||this.group_search)&&(b.search_match=this.search_string_match(b.search_text,c),b.search_match&&!b.group&&(d+=1),b.search_match?(f.length&&(g=b.search_text.search(i),h=b.search_text.substr(0,g+f.length)+"</em>"+b.search_text.substr(g+f.length),b.search_text=h.substr(0,g)+"<em>"+h.substr(g)),null!=e&&(e.group_match=!0)):null!=b.group_array_index&&this.results_data[b.group_array_index].search_match&&(b.search_match=!0)));return this.result_clear_highlight(),1>d&&f.length?(this.update_results_content(""),this.no_results(f)):(this.update_results_content(this.results_option_build()),this.winnow_results_set_highlight())},AbstractChosen.prototype.get_search_regex=function(a){var b,c;return b=this.search_contains?"":"^",c=this.case_sensitive_search?"":"i",new RegExp(b+a,c)},AbstractChosen.prototype.search_string_match=function(a,b){var c,d,e,f;if(b.test(a))return!0;if(this.enable_split_word_search&&(a.indexOf(" ")>=0||0===a.indexOf("["))&&(d=a.replace(/\[|\]/g,"").split(" "),d.length))for(e=0,f=d.length;f>e;e++)if(c=d[e],b.test(c))return!0},AbstractChosen.prototype.choices_count=function(){var a,b,c,d;if(null!=this.selected_option_count)return this.selected_option_count;for(this.selected_option_count=0,d=this.form_field.options,b=0,c=d.length;c>b;b++)a=d[b],a.selected&&(this.selected_option_count+=1);return this.selected_option_count},AbstractChosen.prototype.choices_click=function(a){return a.preventDefault(),this.results_showing||this.is_disabled?void 0:this.results_show()},AbstractChosen.prototype.keyup_checker=function(a){var b,c;switch(b=null!=(c=a.which)?c:a.keyCode,this.search_field_scale(),b){case 8:if(this.is_multiple&&this.backstroke_length<1&&this.choices_count()>0)return this.keydown_backstroke();if(!this.pending_backstroke)return this.result_clear_highlight(),this.results_search();break;case 13:if(a.preventDefault(),this.results_showing)return this.result_select(a);break;case 27:return this.results_showing&&this.results_hide(),!0;case 9:case 38:case 40:case 16:case 91:case 17:case 18:break;default:return this.results_search()}},AbstractChosen.prototype.clipboard_event_checker=function(a){var b=this;return setTimeout(function(){return b.results_search()},50)},AbstractChosen.prototype.container_width=function(){return null!=this.options.width?this.options.width:""+this.form_field.offsetWidth+"px"},AbstractChosen.prototype.include_option_in_results=function(a){return this.is_multiple&&!this.display_selected_options&&a.selected?!1:!this.display_disabled_options&&a.disabled?!1:a.empty?!1:!0},AbstractChosen.prototype.search_results_touchstart=function(a){return this.touch_started=!0,this.search_results_mouseover(a)},AbstractChosen.prototype.search_results_touchmove=function(a){return this.touch_started=!1,this.search_results_mouseout(a)},AbstractChosen.prototype.search_results_touchend=function(a){return this.touch_started?this.search_results_mouseup(a):void 0},AbstractChosen.prototype.outerHTML=function(a){var b;return a.outerHTML?a.outerHTML:(b=document.createElement("div"),b.appendChild(a),b.innerHTML)},AbstractChosen.browser_is_supported=function(){return"Microsoft Internet Explorer"===window.navigator.appName?document.documentMode>=8:/iP(od|hone)/i.test(window.navigator.userAgent)||/IEMobile/i.test(window.navigator.userAgent)||/Windows Phone/i.test(window.navigator.userAgent)||/BlackBerry/i.test(window.navigator.userAgent)||/BB10/i.test(window.navigator.userAgent)||/Android.*Mobile/i.test(window.navigator.userAgent)?!1:!0},AbstractChosen.default_multiple_text="Select Some Options",AbstractChosen.default_single_text="Select an Option",AbstractChosen.default_no_result_text="No results match",AbstractChosen}(),a=jQuery,a.fn.extend({chosen:function(b){return AbstractChosen.browser_is_supported()?this.each(function(c){var d,e;return d=a(this),e=d.data("chosen"),"destroy"===b?void(e instanceof Chosen&&e.destroy()):void(e instanceof Chosen||d.data("chosen",new Chosen(this,b)))}):this}}),Chosen=function(c){function Chosen(){return b=Chosen.__super__.constructor.apply(this,arguments)}return d(Chosen,c),Chosen.prototype.setup=function(){return this.form_field_jq=a(this.form_field),this.current_selectedIndex=this.form_field.selectedIndex,this.is_rtl=this.form_field_jq.hasClass("chosen-rtl")},Chosen.prototype.set_up_html=function(){var b,c;return b=["chosen-container"],b.push("chosen-container-"+(this.is_multiple?"multi":"single")),this.inherit_select_classes&&this.form_field.className&&b.push(this.form_field.className),this.is_rtl&&b.push("chosen-rtl"),c={"class":b.join(" "),style:"width: "+this.container_width()+";",title:this.form_field.title},this.form_field.id.length&&(c.id=this.form_field.id.replace(/[^\w]/g,"_")+"_chosen"),this.container=a("<div />",c),this.is_multiple?this.container.html('<ul class="chosen-choices"><li class="search-field"><input type="text" value="'+this.default_text+'" class="default" autocomplete="off" style="width:25px;" /></li></ul><div class="chosen-drop"><ul class="chosen-results"></ul></div>'):this.container.html('<a class="chosen-single chosen-default"><span>'+this.default_text+'</span><div><b></b></div></a><div class="chosen-drop"><div class="chosen-search"><input type="text" autocomplete="off" /></div><ul class="chosen-results"></ul></div>'),this.form_field_jq.hide().after(this.container),this.dropdown=this.container.find("div.chosen-drop").first(),this.search_field=this.container.find("input").first(),this.search_results=this.container.find("ul.chosen-results").first(),this.search_field_scale(),this.search_no_results=this.container.find("li.no-results").first(),this.is_multiple?(this.search_choices=this.container.find("ul.chosen-choices").first(),this.search_container=this.container.find("li.search-field").first()):(this.search_container=this.container.find("div.chosen-search").first(),this.selected_item=this.container.find(".chosen-single").first()),this.results_build(),this.set_tab_index(),this.set_label_behavior()},Chosen.prototype.on_ready=function(){return this.form_field_jq.trigger("chosen:ready",{chosen:this})},Chosen.prototype.register_observers=function(){var a=this;return this.container.bind("touchstart.chosen",function(b){return a.container_mousedown(b),b.preventDefault()}),this.container.bind("touchend.chosen",function(b){return a.container_mouseup(b),b.preventDefault()}),this.container.bind("mousedown.chosen",function(b){a.container_mousedown(b)}),this.container.bind("mouseup.chosen",function(b){a.container_mouseup(b)}),this.container.bind("mouseenter.chosen",function(b){a.mouse_enter(b)}),this.container.bind("mouseleave.chosen",function(b){a.mouse_leave(b)}),this.search_results.bind("mouseup.chosen",function(b){a.search_results_mouseup(b)}),this.search_results.bind("mouseover.chosen",function(b){a.search_results_mouseover(b)}),this.search_results.bind("mouseout.chosen",function(b){a.search_results_mouseout(b)}),this.search_results.bind("mousewheel.chosen DOMMouseScroll.chosen",function(b){a.search_results_mousewheel(b)}),this.search_results.bind("touchstart.chosen",function(b){a.search_results_touchstart(b)}),this.search_results.bind("touchmove.chosen",function(b){a.search_results_touchmove(b)}),this.search_results.bind("touchend.chosen",function(b){a.search_results_touchend(b)}),this.form_field_jq.bind("chosen:updated.chosen",function(b){a.results_update_field(b)}),this.form_field_jq.bind("chosen:activate.chosen",function(b){a.activate_field(b)}),this.form_field_jq.bind("chosen:open.chosen",function(b){a.container_mousedown(b)}),this.form_field_jq.bind("chosen:close.chosen",function(b){a.input_blur(b)}),this.search_field.bind("blur.chosen",function(b){a.input_blur(b)}),this.search_field.bind("keyup.chosen",function(b){a.keyup_checker(b)}),this.search_field.bind("keydown.chosen",function(b){a.keydown_checker(b)}),this.search_field.bind("focus.chosen",function(b){a.input_focus(b)}),this.search_field.bind("cut.chosen",function(b){a.clipboard_event_checker(b)}),this.search_field.bind("paste.chosen",function(b){a.clipboard_event_checker(b)}),this.is_multiple?this.search_choices.bind("click.chosen",function(b){a.choices_click(b)}):this.container.bind("click.chosen",function(a){a.preventDefault()})},Chosen.prototype.destroy=function(){return a(this.container[0].ownerDocument).unbind("click.chosen",this.click_test_action),this.search_field[0].tabIndex&&(this.form_field_jq[0].tabIndex=this.search_field[0].tabIndex),this.container.remove(),this.form_field_jq.removeData("chosen"),this.form_field_jq.show()},Chosen.prototype.search_field_disabled=function(){return this.is_disabled=this.form_field_jq[0].disabled,this.is_disabled?(this.container.addClass("chosen-disabled"),this.search_field[0].disabled=!0,this.is_multiple||this.selected_item.unbind("focus.chosen",this.activate_action),this.close_field()):(this.container.removeClass("chosen-disabled"),this.search_field[0].disabled=!1,this.is_multiple?void 0:this.selected_item.bind("focus.chosen",this.activate_action))},Chosen.prototype.container_mousedown=function(b){return this.is_disabled||(b&&"mousedown"===b.type&&!this.results_showing&&b.preventDefault(),null!=b&&a(b.target).hasClass("search-choice-close"))?void 0:(this.active_field?this.is_multiple||!b||a(b.target)[0]!==this.selected_item[0]&&!a(b.target).parents("a.chosen-single").length||(b.preventDefault(),this.results_toggle()):(this.is_multiple&&this.search_field.val(""),a(this.container[0].ownerDocument).bind("click.chosen",this.click_test_action),this.results_show()),this.activate_field())},Chosen.prototype.container_mouseup=function(a){return"ABBR"!==a.target.nodeName||this.is_disabled?void 0:this.results_reset(a)},Chosen.prototype.search_results_mousewheel=function(a){var b;return a.originalEvent&&(b=a.originalEvent.deltaY||-a.originalEvent.wheelDelta||a.originalEvent.detail),null!=b?(a.preventDefault(),"DOMMouseScroll"===a.type&&(b=40*b),this.search_results.scrollTop(b+this.search_results.scrollTop())):void 0},Chosen.prototype.blur_test=function(a){return!this.active_field&&this.container.hasClass("chosen-container-active")?this.close_field():void 0},Chosen.prototype.close_field=function(){return a(this.container[0].ownerDocument).unbind("click.chosen",this.click_test_action),this.active_field=!1,this.results_hide(),this.container.removeClass("chosen-container-active"),this.clear_backstroke(),this.show_search_field_default(),this.search_field_scale()},Chosen.prototype.activate_field=function(){return this.container.addClass("chosen-container-active"),this.active_field=!0,this.search_field.val(this.search_field.val()),this.search_field.focus()},Chosen.prototype.test_active_click=function(b){var c;return c=a(b.target).closest(".chosen-container"),c.length&&this.container[0]===c[0]?this.active_field=!0:this.close_field()},Chosen.prototype.results_build=function(){return this.parsing=!0,this.selected_option_count=null,this.results_data=SelectParser.select_to_array(this.form_field),this.is_multiple?this.search_choices.find("li.search-choice").remove():this.is_multiple||(this.single_set_selected_text(),this.disable_search||this.form_field.options.length<=this.disable_search_threshold?(this.search_field[0].readOnly=!0,this.container.addClass("chosen-container-single-nosearch")):(this.search_field[0].readOnly=!1,this.container.removeClass("chosen-container-single-nosearch"))),this.update_results_content(this.results_option_build({first:!0})),this.search_field_disabled(),this.show_search_field_default(),this.search_field_scale(),this.parsing=!1},Chosen.prototype.result_do_highlight=function(a){var b,c,d,e,f;if(a.length){if(this.result_clear_highlight(),this.result_highlight=a,this.result_highlight.addClass("highlighted"),d=parseInt(this.search_results.css("maxHeight"),10),f=this.search_results.scrollTop(),e=d+f,c=this.result_highlight.position().top+this.search_results.scrollTop(),b=c+this.result_highlight.outerHeight(),b>=e)return this.search_results.scrollTop(b-d>0?b-d:0);if(f>c)return this.search_results.scrollTop(c)}},Chosen.prototype.result_clear_highlight=function(){return this.result_highlight&&this.result_highlight.removeClass("highlighted"),this.result_highlight=null},Chosen.prototype.results_show=function(){return this.is_multiple&&this.max_selected_options<=this.choices_count()?(this.form_field_jq.trigger("chosen:maxselected",{chosen:this}),!1):(this.container.addClass("chosen-with-drop"),this.results_showing=!0,this.search_field.focus(),this.search_field.val(this.search_field.val()),this.winnow_results(),this.form_field_jq.trigger("chosen:showing_dropdown",{chosen:this}))},Chosen.prototype.update_results_content=function(a){return this.search_results.html(a)},Chosen.prototype.results_hide=function(){return this.results_showing&&(this.result_clear_highlight(),this.container.removeClass("chosen-with-drop"),this.form_field_jq.trigger("chosen:hiding_dropdown",{chosen:this})),this.results_showing=!1},Chosen.prototype.set_tab_index=function(a){var b;return this.form_field.tabIndex?(b=this.form_field.tabIndex,this.form_field.tabIndex=-1,this.search_field[0].tabIndex=b):void 0},Chosen.prototype.set_label_behavior=function(){var b=this;return this.form_field_label=this.form_field_jq.parents("label"),!this.form_field_label.length&&this.form_field.id.length&&(this.form_field_label=a("label[for='"+this.form_field.id+"']")),this.form_field_label.length>0?this.form_field_label.bind("click.chosen",function(a){return b.is_multiple?b.container_mousedown(a):b.activate_field()}):void 0},Chosen.prototype.show_search_field_default=function(){return this.is_multiple&&this.choices_count()<1&&!this.active_field?(this.search_field.val(this.default_text),this.search_field.addClass("default")):(this.search_field.val(""),this.search_field.removeClass("default"))},Chosen.prototype.search_results_mouseup=function(b){var c;return c=a(b.target).hasClass("active-result")?a(b.target):a(b.target).parents(".active-result").first(),c.length?(this.result_highlight=c,this.result_select(b),this.search_field.focus()):void 0},Chosen.prototype.search_results_mouseover=function(b){var c;return c=a(b.target).hasClass("active-result")?a(b.target):a(b.target).parents(".active-result").first(),c?this.result_do_highlight(c):void 0},Chosen.prototype.search_results_mouseout=function(b){return a(b.target).hasClass("active-result")?this.result_clear_highlight():void 0},Chosen.prototype.choice_build=function(b){var c,d,e=this;return c=a("<li />",{"class":"search-choice"}).html("<span>"+this.choice_label(b)+"</span>"),b.disabled?c.addClass("search-choice-disabled"):(d=a("<a />",{"class":"search-choice-close","data-option-array-index":b.array_index}),d.bind("click.chosen",function(a){return e.choice_destroy_link_click(a)}),c.append(d)),this.search_container.before(c)},Chosen.prototype.choice_destroy_link_click=function(b){return b.preventDefault(),b.stopPropagation(),this.is_disabled?void 0:this.choice_destroy(a(b.target))},Chosen.prototype.choice_destroy=function(a){return this.result_deselect(a[0].getAttribute("data-option-array-index"))?(this.show_search_field_default(),this.is_multiple&&this.choices_count()>0&&this.search_field.val().length<1&&this.results_hide(),a.parents("li").first().remove(),this.search_field_scale()):void 0},Chosen.prototype.results_reset=function(){return this.reset_single_select_options(),this.form_field.options[0].selected=!0,this.single_set_selected_text(),this.show_search_field_default(),this.results_reset_cleanup(),this.form_field_jq.trigger("change"),this.active_field?this.results_hide():void 0},Chosen.prototype.results_reset_cleanup=function(){return this.current_selectedIndex=this.form_field.selectedIndex,this.selected_item.find("abbr").remove()},Chosen.prototype.result_select=function(a){var b,c;return this.result_highlight?(b=this.result_highlight,this.result_clear_highlight(),this.is_multiple&&this.max_selected_options<=this.choices_count()?(this.form_field_jq.trigger("chosen:maxselected",{chosen:this}),!1):(this.is_multiple?b.removeClass("active-result"):this.reset_single_select_options(),b.addClass("result-selected"),c=this.results_data[b[0].getAttribute("data-option-array-index")],c.selected=!0,this.form_field.options[c.options_index].selected=!0,this.selected_option_count=null,this.is_multiple?this.choice_build(c):this.single_set_selected_text(this.choice_label(c)),(a.metaKey||a.ctrlKey)&&this.is_multiple||this.results_hide(),this.show_search_field_default(),(this.is_multiple||this.form_field.selectedIndex!==this.current_selectedIndex)&&this.form_field_jq.trigger("change",{selected:this.form_field.options[c.options_index].value}),this.current_selectedIndex=this.form_field.selectedIndex,a.preventDefault(),this.search_field_scale())):void 0},Chosen.prototype.single_set_selected_text=function(a){return null==a&&(a=this.default_text),a===this.default_text?this.selected_item.addClass("chosen-default"):(this.single_deselect_control_build(),this.selected_item.removeClass("chosen-default")),this.selected_item.find("span").html(a)},Chosen.prototype.result_deselect=function(a){var b;return b=this.results_data[a],this.form_field.options[b.options_index].disabled?!1:(b.selected=!1,this.form_field.options[b.options_index].selected=!1,this.selected_option_count=null,this.result_clear_highlight(),this.results_showing&&this.winnow_results(),this.form_field_jq.trigger("change",{deselected:this.form_field.options[b.options_index].value}),this.search_field_scale(),!0)},Chosen.prototype.single_deselect_control_build=function(){return this.allow_single_deselect?(this.selected_item.find("abbr").length||this.selected_item.find("span").first().after('<abbr class="search-choice-close"></abbr>'),this.selected_item.addClass("chosen-single-with-deselect")):void 0},Chosen.prototype.get_search_text=function(){return a("<div/>").text(a.trim(this.search_field.val())).html()},Chosen.prototype.winnow_results_set_highlight=function(){var a,b;return b=this.is_multiple?[]:this.search_results.find(".result-selected.active-result"),a=b.length?b.first():this.search_results.find(".active-result").first(),null!=a?this.result_do_highlight(a):void 0},Chosen.prototype.no_results=function(b){var c;return c=a('<li class="no-results">'+this.results_none_found+' "<span></span>"</li>'),c.find("span").first().html(b),this.search_results.append(c),this.form_field_jq.trigger("chosen:no_results",{chosen:this})},Chosen.prototype.no_results_clear=function(){return this.search_results.find(".no-results").remove()},Chosen.prototype.keydown_arrow=function(){var a;return this.results_showing&&this.result_highlight?(a=this.result_highlight.nextAll("li.active-result").first())?this.result_do_highlight(a):void 0:this.results_show()},Chosen.prototype.keyup_arrow=function(){var a;return this.results_showing||this.is_multiple?this.result_highlight?(a=this.result_highlight.prevAll("li.active-result"),a.length?this.result_do_highlight(a.first()):(this.choices_count()>0&&this.results_hide(),this.result_clear_highlight())):void 0:this.results_show()},Chosen.prototype.keydown_backstroke=function(){var a;return this.pending_backstroke?(this.choice_destroy(this.pending_backstroke.find("a").first()),this.clear_backstroke()):(a=this.search_container.siblings("li.search-choice").last(),a.length&&!a.hasClass("search-choice-disabled")?(this.pending_backstroke=a,this.single_backstroke_delete?this.keydown_backstroke():this.pending_backstroke.addClass("search-choice-focus")):void 0)},Chosen.prototype.clear_backstroke=function(){return this.pending_backstroke&&this.pending_backstroke.removeClass("search-choice-focus"),this.pending_backstroke=null},Chosen.prototype.keydown_checker=function(a){var b,c;switch(b=null!=(c=a.which)?c:a.keyCode,this.search_field_scale(),8!==b&&this.pending_backstroke&&this.clear_backstroke(),b){case 8:this.backstroke_length=this.search_field.val().length;break;case 9:this.results_showing&&!this.is_multiple&&this.result_select(a),this.mouse_on_container=!1;break;case 13:this.results_showing&&a.preventDefault();break;case 32:this.disable_search&&a.preventDefault();break;case 38:a.preventDefault(),this.keyup_arrow();break;case 40:a.preventDefault(),this.keydown_arrow()}},Chosen.prototype.search_field_scale=function(){var b,c,d,e,f,g,h,i,j;if(this.is_multiple){for(d=0,h=0,f="position:absolute; left: -1000px; top: -1000px; display:none;",g=["font-size","font-style","font-weight","font-family","line-height","text-transform","letter-spacing"],i=0,j=g.length;j>i;i++)e=g[i],f+=e+":"+this.search_field.css(e)+";";return b=a("<div />",{style:f}),b.text(this.search_field.val()),a("body").append(b),h=b.width()+25,b.remove(),c=this.container.outerWidth(),h>c-10&&(h=c-10),this.search_field.css({width:h+"px"})}},Chosen}(AbstractChosen)}).call(this);
\ No newline at end of file diff --git a/ishtar_common/static/js/chosen/chosen.min.css b/ishtar_common/static/js/chosen/chosen.min.css new file mode 100644 index 000000000..60b117182 --- /dev/null +++ b/ishtar_common/static/js/chosen/chosen.min.css @@ -0,0 +1,3 @@ +/* Chosen v1.6.2 | (c) 2011-2016 by Harvest | MIT License, https://github.com/harvesthq/chosen/blob/master/LICENSE.md */ + +.chosen-container{position:relative;display:inline-block;vertical-align:middle;font-size:13px;-webkit-user-select:none;-moz-user-select:none;user-select:none}.chosen-container *{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.chosen-container .chosen-drop{position:absolute;top:100%;left:-9999px;z-index:1010;width:100%;border:1px solid #aaa;border-top:0;background:#fff;box-shadow:0 4px 5px rgba(0,0,0,.15)}.chosen-container.chosen-with-drop .chosen-drop{left:0}.chosen-container a{cursor:pointer}.chosen-container .search-choice .group-name,.chosen-container .chosen-single .group-name{margin-right:4px;overflow:hidden;white-space:nowrap;text-overflow:ellipsis;font-weight:400;color:#999}.chosen-container .search-choice .group-name:after,.chosen-container .chosen-single .group-name:after{content:":";padding-left:2px;vertical-align:top}.chosen-container-single .chosen-single{position:relative;display:block;overflow:hidden;padding:0 0 0 8px;height:25px;border:1px solid #aaa;border-radius:5px;background-color:#fff;background:-webkit-gradient(linear,50% 0,50% 100%,color-stop(20%,#fff),color-stop(50%,#f6f6f6),color-stop(52%,#eee),color-stop(100%,#f4f4f4));background:-webkit-linear-gradient(#fff 20%,#f6f6f6 50%,#eee 52%,#f4f4f4 100%);background:-moz-linear-gradient(#fff 20%,#f6f6f6 50%,#eee 52%,#f4f4f4 100%);background:-o-linear-gradient(#fff 20%,#f6f6f6 50%,#eee 52%,#f4f4f4 100%);background:linear-gradient(#fff 20%,#f6f6f6 50%,#eee 52%,#f4f4f4 100%);background-clip:padding-box;box-shadow:0 0 3px #fff inset,0 1px 1px rgba(0,0,0,.1);color:#444;text-decoration:none;white-space:nowrap;line-height:24px}.chosen-container-single .chosen-default{color:#999}.chosen-container-single .chosen-single span{display:block;overflow:hidden;margin-right:26px;text-overflow:ellipsis;white-space:nowrap}.chosen-container-single .chosen-single-with-deselect span{margin-right:38px}.chosen-container-single .chosen-single abbr{position:absolute;top:6px;right:26px;display:block;width:12px;height:12px;background:url(chosen-sprite.png) -42px 1px no-repeat;font-size:1px}.chosen-container-single .chosen-single abbr:hover{background-position:-42px -10px}.chosen-container-single.chosen-disabled .chosen-single abbr:hover{background-position:-42px -10px}.chosen-container-single .chosen-single div{position:absolute;top:0;right:0;display:block;width:18px;height:100%}.chosen-container-single .chosen-single div b{display:block;width:100%;height:100%;background:url(chosen-sprite.png) no-repeat 0 2px}.chosen-container-single .chosen-search{position:relative;z-index:1010;margin:0;padding:3px 4px;white-space:nowrap}.chosen-container-single .chosen-search input[type=text]{margin:1px 0;padding:4px 20px 4px 5px;width:100%;height:auto;outline:0;border:1px solid #aaa;background:#fff url(chosen-sprite.png) no-repeat 100% -20px;background:url(chosen-sprite.png) no-repeat 100% -20px;font-size:1em;font-family:sans-serif;line-height:normal;border-radius:0}.chosen-container-single .chosen-drop{margin-top:-1px;border-radius:0 0 4px 4px;background-clip:padding-box}.chosen-container-single.chosen-container-single-nosearch .chosen-search{position:absolute;left:-9999px}.chosen-container .chosen-results{color:#444;position:relative;overflow-x:hidden;overflow-y:auto;margin:0 4px 4px 0;padding:0 0 0 4px;max-height:240px;-webkit-overflow-scrolling:touch}.chosen-container .chosen-results li{display:none;margin:0;padding:5px 6px;list-style:none;line-height:15px;word-wrap:break-word;-webkit-touch-callout:none}.chosen-container .chosen-results li.active-result{display:list-item;cursor:pointer}.chosen-container .chosen-results li.disabled-result{display:list-item;color:#ccc;cursor:default}.chosen-container .chosen-results li.highlighted{background-color:#3875d7;background-image:-webkit-gradient(linear,50% 0,50% 100%,color-stop(20%,#3875d7),color-stop(90%,#2a62bc));background-image:-webkit-linear-gradient(#3875d7 20%,#2a62bc 90%);background-image:-moz-linear-gradient(#3875d7 20%,#2a62bc 90%);background-image:-o-linear-gradient(#3875d7 20%,#2a62bc 90%);background-image:linear-gradient(#3875d7 20%,#2a62bc 90%);color:#fff}.chosen-container .chosen-results li.no-results{color:#777;display:list-item;background:#f4f4f4}.chosen-container .chosen-results li.group-result{display:list-item;font-weight:700;cursor:default}.chosen-container .chosen-results li.group-option{padding-left:15px}.chosen-container .chosen-results li em{font-style:normal;text-decoration:underline}.chosen-container-multi .chosen-choices{position:relative;overflow:hidden;margin:0;padding:0 5px;width:100%;height:auto;border:1px solid #aaa;background-color:#fff;background-image:-webkit-gradient(linear,50% 0,50% 100%,color-stop(1%,#eee),color-stop(15%,#fff));background-image:-webkit-linear-gradient(#eee 1%,#fff 15%);background-image:-moz-linear-gradient(#eee 1%,#fff 15%);background-image:-o-linear-gradient(#eee 1%,#fff 15%);background-image:linear-gradient(#eee 1%,#fff 15%);cursor:text}.chosen-container-multi .chosen-choices li{float:left;list-style:none}.chosen-container-multi .chosen-choices li.search-field{margin:0;padding:0;white-space:nowrap}.chosen-container-multi .chosen-choices li.search-field input[type=text]{margin:1px 0;padding:0;height:25px;outline:0;border:0!important;background:transparent!important;box-shadow:none;color:#999;font-size:100%;font-family:sans-serif;line-height:normal;border-radius:0}.chosen-container-multi .chosen-choices li.search-choice{position:relative;margin:3px 5px 3px 0;padding:3px 20px 3px 5px;border:1px solid #aaa;max-width:100%;border-radius:3px;background-color:#eee;background-image:-webkit-gradient(linear,50% 0,50% 100%,color-stop(20%,#f4f4f4),color-stop(50%,#f0f0f0),color-stop(52%,#e8e8e8),color-stop(100%,#eee));background-image:-webkit-linear-gradient(#f4f4f4 20%,#f0f0f0 50%,#e8e8e8 52%,#eee 100%);background-image:-moz-linear-gradient(#f4f4f4 20%,#f0f0f0 50%,#e8e8e8 52%,#eee 100%);background-image:-o-linear-gradient(#f4f4f4 20%,#f0f0f0 50%,#e8e8e8 52%,#eee 100%);background-image:linear-gradient(#f4f4f4 20%,#f0f0f0 50%,#e8e8e8 52%,#eee 100%);background-size:100% 19px;background-repeat:repeat-x;background-clip:padding-box;box-shadow:0 0 2px #fff inset,0 1px 0 rgba(0,0,0,.05);color:#333;line-height:13px;cursor:default}.chosen-container-multi .chosen-choices li.search-choice span{word-wrap:break-word}.chosen-container-multi .chosen-choices li.search-choice .search-choice-close{position:absolute;top:4px;right:3px;display:block;width:12px;height:12px;background:url(chosen-sprite.png) -42px 1px no-repeat;font-size:1px}.chosen-container-multi .chosen-choices li.search-choice .search-choice-close:hover{background-position:-42px -10px}.chosen-container-multi .chosen-choices li.search-choice-disabled{padding-right:5px;border:1px solid #ccc;background-color:#e4e4e4;background-image:-webkit-gradient(linear,50% 0,50% 100%,color-stop(20%,#f4f4f4),color-stop(50%,#f0f0f0),color-stop(52%,#e8e8e8),color-stop(100%,#eee));background-image:-webkit-linear-gradient(#f4f4f4 20%,#f0f0f0 50%,#e8e8e8 52%,#eee 100%);background-image:-moz-linear-gradient(#f4f4f4 20%,#f0f0f0 50%,#e8e8e8 52%,#eee 100%);background-image:-o-linear-gradient(#f4f4f4 20%,#f0f0f0 50%,#e8e8e8 52%,#eee 100%);background-image:linear-gradient(#f4f4f4 20%,#f0f0f0 50%,#e8e8e8 52%,#eee 100%);color:#666}.chosen-container-multi .chosen-choices li.search-choice-focus{background:#d4d4d4}.chosen-container-multi .chosen-choices li.search-choice-focus .search-choice-close{background-position:-42px -10px}.chosen-container-multi .chosen-results{margin:0;padding:0}.chosen-container-multi .chosen-drop .result-selected{display:list-item;color:#ccc;cursor:default}.chosen-container-active .chosen-single{border:1px solid #5897fb;box-shadow:0 0 5px rgba(0,0,0,.3)}.chosen-container-active.chosen-with-drop .chosen-single{border:1px solid #aaa;-moz-border-radius-bottomright:0;border-bottom-right-radius:0;-moz-border-radius-bottomleft:0;border-bottom-left-radius:0;background-image:-webkit-gradient(linear,50% 0,50% 100%,color-stop(20%,#eee),color-stop(80%,#fff));background-image:-webkit-linear-gradient(#eee 20%,#fff 80%);background-image:-moz-linear-gradient(#eee 20%,#fff 80%);background-image:-o-linear-gradient(#eee 20%,#fff 80%);background-image:linear-gradient(#eee 20%,#fff 80%);box-shadow:0 1px 0 #fff inset}.chosen-container-active.chosen-with-drop .chosen-single div{border-left:0;background:transparent}.chosen-container-active.chosen-with-drop .chosen-single div b{background-position:-18px 2px}.chosen-container-active .chosen-choices{border:1px solid #5897fb;box-shadow:0 0 5px rgba(0,0,0,.3)}.chosen-container-active .chosen-choices li.search-field input[type=text]{color:#222!important}.chosen-disabled{opacity:.5!important;cursor:default}.chosen-disabled .chosen-single{cursor:default}.chosen-disabled .chosen-choices .search-choice .search-choice-close{cursor:default}.chosen-rtl{text-align:right}.chosen-rtl .chosen-single{overflow:visible;padding:0 8px 0 0}.chosen-rtl .chosen-single span{margin-right:0;margin-left:26px;direction:rtl}.chosen-rtl .chosen-single-with-deselect span{margin-left:38px}.chosen-rtl .chosen-single div{right:auto;left:3px}.chosen-rtl .chosen-single abbr{right:auto;left:26px}.chosen-rtl .chosen-choices li{float:right}.chosen-rtl .chosen-choices li.search-field input[type=text]{direction:rtl}.chosen-rtl .chosen-choices li.search-choice{margin:3px 5px 3px 0;padding:3px 5px 3px 19px}.chosen-rtl .chosen-choices li.search-choice .search-choice-close{right:auto;left:4px}.chosen-rtl.chosen-container-single-nosearch .chosen-search,.chosen-rtl .chosen-drop{left:9999px}.chosen-rtl.chosen-container-single .chosen-results{margin:0 0 4px 4px;padding:0 4px 0 0}.chosen-rtl .chosen-results li.group-option{padding-right:15px;padding-left:0}.chosen-rtl.chosen-container-active.chosen-with-drop .chosen-single div{border-right:0}.chosen-rtl .chosen-search input[type=text]{padding:4px 5px 4px 20px;background:#fff url(chosen-sprite.png) no-repeat -30px -20px;background:url(chosen-sprite.png) no-repeat -30px -20px;direction:rtl}.chosen-rtl.chosen-container-single .chosen-single div b{background-position:6px 2px}.chosen-rtl.chosen-container-single.chosen-with-drop .chosen-single div b{background-position:-12px 2px}@media only screen and (-webkit-min-device-pixel-ratio:1.5),only screen and (min-resolution:144dpi),only screen and (min-resolution:1.5dppx){.chosen-rtl .chosen-search input[type=text],.chosen-container-single .chosen-single abbr,.chosen-container-single .chosen-single div b,.chosen-container-single .chosen-search input[type=text],.chosen-container-multi .chosen-choices .search-choice .search-choice-close,.chosen-container .chosen-results-scroll-down span,.chosen-container .chosen-results-scroll-up span{background-image:url(chosen-sprite@2x.png)!important;background-size:52px 37px!important;background-repeat:no-repeat!important}}
\ No newline at end of file diff --git a/ishtar_common/static/js/ishtar.js b/ishtar_common/static/js/ishtar.js index 4d82cb238..fecefe0a9 100644 --- a/ishtar_common/static/js/ishtar.js +++ b/ishtar_common/static/js/ishtar.js @@ -1,5 +1,5 @@ -  /* CSRFToken management */ +  $.ajaxSetup({  beforeSend: function(xhr, settings) {      function getCookie(name) { @@ -23,6 +23,8 @@ beforeSend: function(xhr, settings) {      }  }}); +var shortcut_url = ''; +  function manage_async_link(event){      event.preventDefault();      var url = $(this).attr('href'); @@ -36,30 +38,66 @@ function manage_async_link(event){  function get_next_table_id(){}  function get_previous_table_id(){} -$(document).ready(function(){ -    $("#main_menu > ul > li > ul").hide(); -    $("#main_menu ul ul .selected").parents().show(); -    var items = new Array('file', 'operation'); +function init_shortcut_menu(html){ +    $("#progress").hide(); +    $("#context_menu").html(html); +    $(".chosen-select").chosen();      $("#current_file").change(function(){          $.post('/' + url_path + 'update-current-item/', -               {item:'file', value:$("#current_file").val()} +               {item:'file', value:$("#current_file").val()}, +               load_shortcut_menu          );      });      $("#current_operation").change(function(){          $.post('/' + url_path + 'update-current-item/', -               {item:'operation', value:$("#current_operation").val()} +               {item:'operation', value:$("#current_operation").val()}, +               load_shortcut_menu          );      });      $("#current_contextrecord").change(function(){          $.post('/' + url_path + 'update-current-item/', -               {item:'contextrecord', value:$("#current_contextrecord").val()} +               {item:'contextrecord', value:$("#current_contextrecord").val()}, +               load_shortcut_menu          );      });      $("#current_find").change(function(){          $.post('/' + url_path + 'update-current-item/', -               {item:'find', value:$("#current_find").val()} +               {item:'find', value:$("#current_find").val()}, +               load_shortcut_menu          );      }); +} + +function display_info(msg){ +    $('#message .information .content').html(msg); +    $('#message').fadeIn('slow'); +    $('#message .information').fadeIn('slow'); +    setTimeout( +        function(){ +            $('#message .information').fadeOut('slow'); +            $('#message').fadeOut('slow'); +        }, 5000); +} + +function load_shortcut_menu(){ +    if (!shortcut_url) return; +    $("#progress").show(); +    $.ajax({ +        url: shortcut_url, +        cache: false, +        success:function(html){ +            init_shortcut_menu(html); +        }, +        error:function(XMLHttpRequest, textStatus, errorThrows){ +            $("#progress").hide(); +        } +    }); +} + +$(document).ready(function(){ +    $("#main_menu > ul > li > ul").hide(); +    $("#main_menu ul ul .selected").parents().show(); +    var items = new Array('file', 'operation');      if ($(document).height() < 1.5*$(window).height()){          $('#to_bottom_arrow').hide();          $('#to_top_arrow').hide(); @@ -67,6 +105,7 @@ $(document).ready(function(){      $('#language_selector').change(function(){          $('#language_form').submit();      }); +    load_shortcut_menu();      if ($.isFunction($(".prettyPhoto a").prettyPhoto)){          $(".prettyPhoto a").prettyPhoto({'social_tools':''});      } @@ -74,6 +113,7 @@ $(document).ready(function(){          $(this).attr('class', $(this).children("option:selected").attr('class'));      });      $("a.async-link").click(manage_async_link); +    $(".chosen-select").chosen();  });  $(document).on("click", '#to_bottom_arrow', function(){ diff --git a/ishtar_common/static/media/style.css b/ishtar_common/static/media/style.css index 4de3cd315..bff3ef473 100644 --- a/ishtar_common/static/media/style.css +++ b/ishtar_common/static/media/style.css @@ -21,6 +21,8 @@ div.form, ul.form {  }  /* color  */ + +.pin-action,  #window hr,  #context_menu .red,  a, a.remove { @@ -46,6 +48,7 @@ a.add-button,      color:#000;  } +.chosen-container,  #context_menu .green,  #context_menu .red,  #context_menu .orange, @@ -244,6 +247,17 @@ button.ui-widget-header:hover {      background: #f8b950;  } +#ui-datepicker-div{ +    z-index: 100  !important; +} + +.chosen-container-active.chosen-with-drop .chosen-single, +.chosen-container-single .chosen-single{ +    background: none; +    background-color: #fff; +    border-radius:4px; +} +  textarea,  input[type=text],  input[type=password], @@ -289,6 +303,26 @@ div.nav-button{      border: 0 solid transparent;  } +#message, +#message div{ +    display: none; +} + +#message { +    z-index: 42200; +    position: absolute; +    top: 5px; +    right: 5px; +    background: #fff; +    padding: 0.5em 1em; +    border: 1px solid; +    border-radius: 3px; +} + +#message span{ +    padding: 0 1em; +} +  #to_bottom_arrow{      bottom:80px;  } @@ -391,6 +425,15 @@ div#context_menu fieldset{      border-radius: 0;  } +div#context_menu table{ +    display: inline; +    vertical-align: top; +} + +div#context_menu .icon{ +    padding: 0.6em 0.5em; +} +  div#context_menu ul{      margin:0;      padding:2px; @@ -595,6 +638,7 @@ ul.form-flex {  ul.form-flex li{      width: 395px; +    padding-top: 0.3em;  }  @media screen and (min-width: 1051px) { @@ -717,6 +761,10 @@ ul.form .help_text{      font-style: normal;  } +.pin-action:hover{ +    cursor:pointer; +} +  .autocomplete{      width:350px;  } diff --git a/ishtar_common/templates/base.html b/ishtar_common/templates/base.html index 4b8b68f8a..703644a35 100644 --- a/ishtar_common/templates/base.html +++ b/ishtar_common/templates/base.html @@ -14,12 +14,14 @@      <script language="javascript" type="text/javascript" src="{{JQUERY_URL}}?ver={{VERSION}}"></script>      <script language="javascript" type="text/javascript" src="{{JQUERY_UI_URL}}jquery-ui.js?ver={{VERSION}}"></script>      <script language="javascript" type="text/javascript" src="{{JQUERY_UI_URL}}ui/i18n/jquery.ui.datepicker-{{COUNTRY}}.js?ver={{VERSION}}"></script> +    <script language="javascript" type="text/javascript" src="{{STATIC_URL}}js/chosen/chosen.jquery.min.js?ver={{VERSION}}"></script>      <script language="javascript" type="text/javascript" src="{{STATIC_URL}}/js/prettyPhoto/js/jquery.prettyPhoto.js?ver={{VERSION}}"></script>      <script language="javascript" type="text/javascript" src="{{STATIC_URL}}js/i18n/grid.locale-{{COUNTRY}}.js?ver={{VERSION}}"></script>      <script language="javascript" type="text/javascript" src="{{STATIC_URL}}js/jquery.jqGrid.min.js?ver={{VERSION}}"></script>      <script language="javascript" type="text/javascript" src="{{STATIC_URL}}js/grid.tbltogrid.js?ver={{VERSION}}"></script>      <script language="javascript" type="text/javascript" src="{{STATIC_URL}}/js/ishtar.js?ver={{VERSION}}"></script>      <link type="text/css" href="{{JQUERY_UI_URL}}jquery-ui.css?ver={{VERSION}}" rel="stylesheet" /> +    <link type="text/css" href="{{STATIC_URL}}js/chosen/chosen.min.css?ver={{VERSION}}" rel="stylesheet" />      <link rel="stylesheet" href="{{STATIC_URL}}/font-awesome/css/font-awesome.min.css?ver={{VERSION}}" />      <link rel="stylesheet" href="{{STATIC_URL}}/js/prettyPhoto/css/prettyPhoto.css?ver={{VERSION}}" />      <link rel="stylesheet" href="{{STATIC_URL}}media/ui.jqgrid.css?ver={{VERSION}}" /> @@ -28,6 +30,9 @@      {% include "blocks/extra_head.html" %}      {% block extra_head %}      {% endblock %} +    <script type='text/javascript'> +    var shortcut_url = '{% url "shortcut-menu" %}'; +    </script>  </head>  <body{% if current_theme%} id='{{current_theme}}'{%endif%}>      <div id="header"> @@ -64,31 +69,8 @@      <a href='{% url "start" %}' id="logo">  {% if APP_NAME %}<p id="app_name">{{APP_NAME}}</p>{%endif%}      </a> -    {% if not reminders %}<div id="context_menu"> -        {% block context %}{% if current_menu %} -        <form method="post" action="{% url 'update-current-item' %}"> -        <fieldset> -        <legend>{% trans "Default selected items"%}</legend> -        <table id='current_items'> -        {% for lbl, model_name, main_cls, items in current_menu %} -            <tr> -                <td><label for="current_{{model_name}}">{{lbl}}</label></td> -                <td> -                  <select class='{{main_cls}}' id='current_{{model_name}}'> -                    <option class='normal' value=''>--</option> -                    {% for val, label, selected, cls in items %}<option{% if cls %} class='{{cls}}'{% endif %} value='{{val}}'{% if selected %} selected="selected"{% endif %}>{% ifequal cls 'basket' %} {% endifequal %}{% ifequal cls 'green' %} {% endifequal %}{% ifequal cls 'orange' %} {% endifequal %}{% ifequal cls 'red' %} {% endifequal %}{{label}}</option> -                  {% endfor %}</select> -                </td>{% with 'show-'|add:model_name as model_url%} -                <td><a href='#' onclick='load_current_window("{% url model_url 0 %}", "{{model_name}}");' class='display_details'><i class="fa fa-info-circle" aria-hidden="true"></i></a></td> -                {% endwith %} -            </tr> -        {% endfor %} -        </table> -        </fieldset> -        </form> -        {% endif %}{% endblock %} -    </div>{% endif %} -{% if reminders %}<fieldset id='reminder'><legend>{% trans "Current items" %}</legend> +    {% if not reminders %}<div id="context_menu"></div> +    {% else %}<fieldset id='reminder'><legend>{% trans "Current items" %}</legend>  {% for lbl, value in reminders %}  <p><strong class='lbl'>{{lbl}}{% trans ":"%}</strong> <span class='value'>{{value}}</span></p>  {% endfor %} @@ -128,6 +110,9 @@              <p class='progress-detail progress-4'>{% trans "Time to take another coffee?" %} <i class="fa fa-coffee" aria-hidden="true"></i></p>          </div>      </div> +    <div id='message'> +        <div class='information'><i class="fa fa-info-circle" aria-hidden="true"></i> <span class='content'></span></div> +    </div>  </body>  </html> diff --git a/ishtar_common/templates/ishtar/blocks/shortcut_menu.html b/ishtar_common/templates/ishtar/blocks/shortcut_menu.html new file mode 100644 index 000000000..c1100ae01 --- /dev/null +++ b/ishtar_common/templates/ishtar/blocks/shortcut_menu.html @@ -0,0 +1,27 @@ +{% load i18n %} +{% load url from future%} +{% if current_menu %} +<form method="post" action="{% url 'update-current-item' %}"> +<fieldset> +<i class="icon fa fa-thumb-tack fa-2x" aria-hidden="true" title="{% trans 'Pin an item in order to constrain default searches with this item. By default only your items are displayed. New created and modified items are auto-pin.' %}"></i> +<table id='current_items'> +{% for lbl, model_name, main_cls, items in current_menu %} +<tr> +    <td><label for="current_{{model_name}}">{{lbl}}</label></td> +    <td> +      <select class='{{main_cls}} chosen-select' id='current_{{model_name}}'> +        <option class='normal' value=''>--</option> +        {% for val, label, selected, cls in items %}<option{% if cls %} class='{{cls}}'{% endif %} value='{{val}}'{% if selected %} selected="selected"{% endif %}>{% ifequal cls 'basket' %} {% endifequal %}{% ifequal cls 'green' %} {% endifequal %}{% ifequal cls 'orange' %} {% endifequal %}{% ifequal cls 'red' %} {% endifequal %}{{label}}</option> +      {% endfor %}</select> +    </td>{% with 'show-'|add:model_name as model_url%} +    <td><a href='#' onclick='load_current_window("{% url model_url 0 %}", "{{model_name}}");' class='display_details'><i class="fa fa-info-circle" aria-hidden="true"></i></a></td> +    <td><span class='pin-action' onclick='$.get("{% url 'unpin' model_name %}", function(){load_shortcut_menu();});' title="{% trans 'Unpin' %}"> +            <i class="fa fa-times"></i> +    </span></td> +    {% endwith %} +</tr> +{% endfor %} +</table> +</fieldset> +</form> +{% endif %} diff --git a/ishtar_common/templates/ishtar/blocks/window_nav.html b/ishtar_common/templates/ishtar/blocks/window_nav.html index 13069b1eb..4ce316217 100644 --- a/ishtar_common/templates/ishtar/blocks/window_nav.html +++ b/ishtar_common/templates/ishtar/blocks/window_nav.html @@ -42,6 +42,13 @@      <i class="fa fa-pencil fa-stack-1x fa-inverse"></i>    </span>    </a>{% endif %} +  {% if pin_action and item.SLUG %} +  <span class='pin-action' onclick='$.get("{% url 'pin' item.SLUG item.pk %}", function(){load_shortcut_menu(); display_info("{% trans 'Item pined in your shortcut menu.' %}")});' title="{% trans 'Pin' %}"> +  <span class="fa-stack fa-lg"> +    <i class="fa fa-circle fa-stack-2x"></i> +    <i class="fa fa-thumb-tack fa-stack-1x fa-inverse"></i> +  </span> +  </span>{% endif %}    <a class='badge' href='{% url show_url item.pk "odt" %}' title='{% trans "Export as OpenOffice.org file"%}'>ODT</a> <a class='badge' href='{% url show_url item.pk "pdf" %}' title='{% trans "Export as PDF file"%}'>PDF</a>  </div>  <hr class='clear'> diff --git a/ishtar_common/templates/window.html b/ishtar_common/templates/window.html index 8e8eac41e..0748cd4cd 100644 --- a/ishtar_common/templates/window.html +++ b/ishtar_common/templates/window.html @@ -23,7 +23,7 @@  <body>  {% if new_item_label %}  <script type='text/javascript' language='javascript'> -save_and_close_window{% if many %}_many{% endif %}("{{parent_name}}", "{{parent_pk}}", "{{new_item_label}}", "{{new_item_pk}}"); +save_and_close_window{% if many %}_many{% endif %}("{{parent_name}}", "{{parent_pk}}", "{{new_item_label|safe}}", "{{new_item_pk}}");  </script>  {% endif %}  <div id="window_content"> diff --git a/ishtar_common/templatetags/window_header.py b/ishtar_common/templatetags/window_header.py index b137f24a5..5322c4478 100644 --- a/ishtar_common/templatetags/window_header.py +++ b/ishtar_common/templatetags/window_header.py @@ -6,7 +6,7 @@ register = template.Library()  @register.inclusion_tag('ishtar/blocks/window_nav.html')  def window_nav(item, window_id, show_url, modify_url='', histo_url='', -               revert_url='', previous=None, nxt=None): +               revert_url='', previous=None, nxt=None, pin_action=False):      return {          'show_url': show_url,          'modify_url': modify_url, @@ -15,7 +15,8 @@ def window_nav(item, window_id, show_url, modify_url='', histo_url='',          'item': item,          'window_id': window_id,          'previous': previous, -        'next': nxt} +        'next': nxt, +        'pin_action': pin_action}  @register.inclusion_tag('ishtar/blocks/window_file_nav.html') @@ -34,4 +35,5 @@ def window_file_nav(item, window_id, previous=None, nxt=None):          'extra_action': mark_safe(add_operation),          'window_id': window_id,          'previous': previous, -        'next': nxt} +        'next': nxt, +        'pin_action': True} diff --git a/ishtar_common/urls.py b/ishtar_common/urls.py index a6f24beed..049bcaf7b 100644 --- a/ishtar_common/urls.py +++ b/ishtar_common/urls.py @@ -34,6 +34,7 @@ urlpatterns = patterns(      # internationalization      url(r'^i18n/', include('django.conf.urls.i18n')),      # General +    url(r'shortcut_menu/', views.shortcut_menu, name='shortcut-menu'),      url(r'person_search/(?P<step>.+)?$',          check_rights(['add_person'])(              views.person_search_wizard), name='person_search'), @@ -129,6 +130,9 @@ urlpatterns += patterns(          name='dashboard-main-detail'),      url(r'update-current-item/$', 'update_current_item',          name='update-current-item'), +    url(r'pin/(?P<item_type>[a-z-]+)/(?P<pk>\d+)/$', 'update_current_item', +        name='pin'), +    url(r'unpin/(?P<item_type>[a-z-]+)/$', 'unpin', name='unpin'),      url(r'new-person/(?:(?P<parent_name>[^/]+)/)?(?:(?P<limits>[^/]+)/)?$',          'new_person', name='new-person'),      url(r'new-person-noorga/' diff --git a/ishtar_common/views.py b/ishtar_common/views.py index 46a8ceb6a..d55181067 100644 --- a/ishtar_common/views.py +++ b/ishtar_common/views.py @@ -62,7 +62,7 @@ from archaeological_operations.forms import DashboardForm as DashboardFormOpe  from archaeological_files.forms import DashboardForm as DashboardFormFile  from ishtar_common.forms import FinalForm, FinalDeleteForm -from ishtar_common.utils import get_random_item_image_link +from ishtar_common.utils import get_random_item_image_link, shortify  from ishtar_common import forms_common as forms  from ishtar_common import wizards  from ishtar_common.models import HistoryError, PRIVATE_FIELDS, \ @@ -198,11 +198,137 @@ def get_autocomplete_generic(model, extra={'available': True}):      return func -def update_current_item(request): -    if not request.is_ajax() and not request.method == 'POST': -        raise Http404 -    if 'value' in request.POST and 'item' in request.POST: -        request.session[request.POST['item']] = request.POST['value'] +def shortcut_menu(request): +    from archaeological_operations.models import Operation +    from archaeological_files.models import File +    from archaeological_context_records.models import ContextRecord +    from archaeological_finds.models import Find + +    profile = get_current_profile() +    CURRENT_ITEMS = [] +    if profile.files: +        CURRENT_ITEMS.append((_(u"Archaeological file"), File)) +    CURRENT_ITEMS.append((_(u"Operation"), Operation)) +    if profile.context_record: +        CURRENT_ITEMS.append((_(u"Context record"), ContextRecord)) +    if profile.find: +        CURRENT_ITEMS.append((_(u"Find"), Find)) +    dct = {'current_menu': []} +    current_selected_item = None +    for lbl, model in CURRENT_ITEMS: +        new_selected_item = None +        model_name = model.SLUG +        cls = '' +        current = model_name in request.session and request.session[model_name] +        items = [] +        for item in model.get_owns(request.user, +                                   menu_filtr=current_selected_item): +            pk = unicode(item.pk) +            if item.IS_BASKET: +                pk = "basket-" + pk +            selected = pk == current +            if selected: +                cls = item.get_short_menu_class() +                new_selected_item = item +            items.append((pk, shortify(unicode(item), 60), +                          selected, item.get_short_menu_class())) +        # selected is not in owns - add it to the list +        if not new_selected_item and current: +            try: +                item = model.objects.get(pk=int(current)) +                new_selected_item = item +                items.append((item.pk, shortify(unicode(item), 60), +                              True, item.get_short_menu_class())) +            except (model.DoesNotExist, ValueError): +                pass +        if items: +            dct['current_menu'].append((lbl, model_name, cls, items)) +        current_selected_item = new_selected_item +    return render_to_response('ishtar/blocks/shortcut_menu.html', dct, +                              context_instance=RequestContext(request)) + + +def get_current_items(request): +    from archaeological_files.models import File +    from archaeological_operations.models import Operation +    from archaeological_context_records.models import ContextRecord +    from archaeological_finds.models import Find +    currents = {} +    for key, model in (('file', File), +                       ('operation', Operation), +                       ('contextrecord', ContextRecord), +                       ('find', Find)): +        currents[key] = None +        if key in request.session and request.session[key]: +            try: +                currents[key] = model.objects.get(pk=int(request.session[key])) +            except (ValueError, File.DoesNotExist): +                continue +    return currents + + +def unpin(request, item_type): +    request.session['find'] = '' +    if item_type == 'find': +        return HttpResponse('ok') +    request.session['contextrecord'] = '' +    if item_type == 'contextrecord': +        return HttpResponse('ok') +    request.session['operation'] = '' +    if item_type == 'operation': +        return HttpResponse('ok') +    request.session['file'] = '' +    return HttpResponse('ok') + + +def update_current_item(request, item_type=None, pk=None): +    if not item_type or not pk: +        if not request.is_ajax() and not request.method == 'POST': +            raise Http404 +        item_type = request.POST['item'] +        if 'value' in request.POST and 'item' in request.POST: +            request.session[item_type] = request.POST['value'] +    else: +        request.session[item_type] = str(pk) + +    currents = get_current_items(request) +    # reinit when descending item are not relevant +    if item_type == 'file' and currents['file'] and currents['operation'] and \ +            currents['operation'].associated_file != currents['file']: +        request.session["operation"] = '' +        currents['operation'] = None +    if item_type in ('operation', 'file') and currents['contextrecord'] and \ +            (not request.session["operation"] or +             currents['contextrecord'].operation != currents['operation']): +        request.session["contextrecord"] = '' +        currents['contextrecord'] = None +    from archaeological_finds.models import Find +    if item_type in ('contextrecord', 'operation', 'file') and currents['find'] and\ +        (not request.session["contextrecord"] or +         not Find.objects.filter( +             downstream_treatment__isnull=True, +             base_finds__context_record__pk=request.session["contextrecord"], +             pk=currents['find'].pk).count()): +        request.session["find"] = '' +        currents['find'] = None + +    # re-init ascending item with relevant values +    if item_type == "find" and currents['find']: +        from archaeological_context_records.models import ContextRecord +        q = ContextRecord.objects.filter( +            base_finds__find__pk=currents['find'].pk) +        if q.count(): +            currents['contextrecord'] = q.all()[0] +            request.session['contextrecord'] = str( +                currents['contextrecord'].pk) +    if item_type in ("find", 'contextrecord') and currents['contextrecord']: +        currents['operation'] = currents['contextrecord'].operation +        request.session['operation'] = str(currents['operation'].pk) +    if item_type in ("find", 'contextrecord', 'operation') and \ +            currents['operation']: +        currents['file'] = currents['operation'].associated_file +        request.session['file'] = str(currents['file'].pk) if currents['file'] \ +            else None      return HttpResponse('ok') @@ -452,6 +578,8 @@ def get_item(model, func_name, default_name, extra_request_keys=[],                  reqs = reqs | q              and_reqs.append(reqs)          if 'submited' not in request_items: +            # default search +            # an item is selected in the default menu              if default_name in request.session and \                 request.session[default_name]:                  value = request.session[default_name] @@ -460,11 +588,11 @@ def get_item(model, func_name, default_name, extra_request_keys=[],                             request.session[default_name].split('-')[-1]}                  else:                      dct = {"pk": request.session[default_name]} -            elif not dct: -                for name in relative_session_names.keys(): +            elif dct == base_request: +                # a parent item may be selected in the default menu +                for name, key in relative_session_names:                      if name in request.session and request.session[name]: -                        k = relative_session_names[name] -                        dct = {k: request.session[name]} +                        dct.update({key: request.session[name]})                          break              if (not dct or data_type == 'csv') \                      and func_name in request.session:  | 
