From 724492f0f7d60296f785b5861b96a5f8932fd097 Mon Sep 17 00:00:00 2001
From: Tor-Einar Skog <tor-einar.skog@bioforsk.no>
Date: Mon, 26 Oct 2015 13:21:41 +0100
Subject: [PATCH] Adding connection between selected crops and which messages
that are shown
---
.../static/css/3rdparty/chosen-bootstrap.css | 148 ++++++++++++++++++
VIPSWeb/static/css/3rdparty/chosen-sprite.png | Bin 0 -> 538 bytes
.../static/css/3rdparty/chosen-sprite@2x.png | Bin 0 -> 738 bytes
VIPSWeb/static/css/3rdparty/chosen.min.css | 3 +
.../static/js/3rdparty/chosen.jquery.min.js | 2 +
VIPSWeb/static/js/frontpage.js | 142 ++++++++++++++++-
VIPSWeb/templates/index.html | 18 +--
VIPSWeb/templates/settings.js | 6 +-
VIPSWeb/views.py | 18 +--
organisms/locale/nb/LC_MESSAGES/django.po | 6 +-
organisms/models.py | 13 ++
vips_messages/locale/bg/LC_MESSAGES/django.mo | Bin 630 -> 630 bytes
vips_messages/locale/bg/LC_MESSAGES/django.po | 22 +--
vips_messages/locale/bs/LC_MESSAGES/django.mo | Bin 657 -> 657 bytes
vips_messages/locale/bs/LC_MESSAGES/django.po | 22 +--
vips_messages/locale/nb/LC_MESSAGES/django.mo | Bin 737 -> 777 bytes
vips_messages/locale/nb/LC_MESSAGES/django.po | 22 +--
vips_messages/models.py | 7 +-
vips_messages/templates/messages/index.html | 59 ++++++-
vips_messages/urls.py | 1 +
vips_messages/views.py | 28 +++-
21 files changed, 451 insertions(+), 66 deletions(-)
create mode 100644 VIPSWeb/static/css/3rdparty/chosen-bootstrap.css
create mode 100644 VIPSWeb/static/css/3rdparty/chosen-sprite.png
create mode 100644 VIPSWeb/static/css/3rdparty/chosen-sprite@2x.png
create mode 100644 VIPSWeb/static/css/3rdparty/chosen.min.css
create mode 100644 VIPSWeb/static/js/3rdparty/chosen.jquery.min.js
diff --git a/VIPSWeb/static/css/3rdparty/chosen-bootstrap.css b/VIPSWeb/static/css/3rdparty/chosen-bootstrap.css
new file mode 100644
index 00000000..631fd82d
--- /dev/null
+++ b/VIPSWeb/static/css/3rdparty/chosen-bootstrap.css
@@ -0,0 +1,148 @@
+select.form-control + .chosen-container.chosen-container-single .chosen-single {
+ display: block;
+ width: 100%;
+ height: 34px;
+ padding: 6px 12px;
+ font-size: 14px;
+ line-height: 1.428571429;
+ color: #555;
+ vertical-align: middle;
+ background-color: #fff;
+ border: 1px solid #ccc;
+ border-radius: 4px;
+ -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,0.075);
+ box-shadow: inset 0 1px 1px rgba(0,0,0,0.075);
+ -webkit-transition: border-color ease-in-out .15s,box-shadow ease-in-out .15s;
+ transition: border-color ease-in-out .15s,box-shadow ease-in-out .15s;
+ background-image:none;
+}
+
+select.form-control + .chosen-container.chosen-container-single .chosen-single div {
+ top:4px;
+ color:#000;
+}
+
+select.form-control + .chosen-container .chosen-drop {
+ background-color: #FFF;
+ border: 1px solid #CCC;
+ border: 1px solid rgba(0, 0, 0, 0.15);
+ border-radius: 4px;
+ -webkit-box-shadow: 0 6px 12px rgba(0, 0, 0, 0.175);
+ box-shadow: 0 6px 12px rgba(0, 0, 0, 0.175);
+ background-clip: padding-box;
+ margin: 2px 0 0;
+
+}
+
+select.form-control + .chosen-container .chosen-search input[type=text] {
+ display: block;
+ width: 100%;
+ height: 34px;
+ padding: 6px 12px;
+ font-size: 14px;
+ line-height: 1.428571429;
+ color: #555;
+ vertical-align: middle;
+ background-color: #FFF;
+ border: 1px solid #CCC;
+ border-radius: 4px;
+ -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+ box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+ -webkit-transition: border-color ease-in-out 0.15s, box-shadow ease-in-out 0.15s;
+ transition: border-color ease-in-out 0.15s, box-shadow ease-in-out 0.15s;
+ background-image:none;
+}
+
+select.form-control + .chosen-container .chosen-results {
+ margin: 2px 0 0;
+ padding: 5px 0;
+ font-size: 14px;
+ list-style: none;
+ background-color: #fff;
+ margin-bottom: 5px;
+}
+
+select.form-control + .chosen-container .chosen-results li ,
+select.form-control + .chosen-container .chosen-results li.active-result {
+ display: block;
+ padding: 3px 20px;
+ clear: both;
+ font-weight: normal;
+ line-height: 1.428571429;
+ color: #333;
+ white-space: nowrap;
+ background-image:none;
+}
+select.form-control + .chosen-container .chosen-results li:hover,
+select.form-control + .chosen-container .chosen-results li.active-result:hover,
+select.form-control + .chosen-container .chosen-results li.highlighted
+{
+ color: #FFF;
+ text-decoration: none;
+ background-color: #428BCA;
+ background-image:none;
+}
+
+select.form-control + .chosen-container-multi .chosen-choices {
+ display: block;
+ width: 100%;
+ min-height: 34px;
+ padding: 6px;
+ font-size: 14px;
+ line-height: 1.428571429;
+ color: #555;
+ vertical-align: middle;
+ background-color: #FFF;
+ border: 1px solid #CCC;
+ border-radius: 4px;
+ -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+ box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+ -webkit-transition: border-color ease-in-out 0.15s, box-shadow ease-in-out 0.15s;
+ transition: border-color ease-in-out 0.15s, box-shadow ease-in-out 0.15s;
+ background-image:none;
+}
+
+select.form-control + .chosen-container-multi .chosen-choices li.search-field input[type="text"] {
+ height:auto;
+ padding:5px 0;
+}
+
+select.form-control + .chosen-container-multi .chosen-choices li.search-choice {
+
+ background-image: none;
+ padding: 3px 24px 3px 5px;
+ margin: 0 6px 0 0;
+ font-size: 14px;
+ font-weight: normal;
+ line-height: 1.428571429;
+ text-align: center;
+ white-space: nowrap;
+ vertical-align: middle;
+ cursor: pointer;
+ border: 1px solid #ccc;
+ border-radius: 4px;
+ color: #333;
+ background-color: #FFF;
+ border-color: #CCC;
+}
+
+select.form-control + .chosen-container-multi .chosen-choices li.search-choice .search-choice-close {
+ top:8px;
+ right:6px;
+}
+
+select.form-control + .chosen-container-multi.chosen-container-active .chosen-choices,
+select.form-control + .chosen-container.chosen-container-single.chosen-container-active .chosen-single,
+select.form-control + .chosen-container .chosen-search input[type=text]:focus{
+ border-color: #66AFE9;
+ outline: 0;
+ -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075),0 0 8px rgba(102, 175, 233, 0.6);
+ box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075),0 0 8px rgba(102, 175, 233, 0.6);
+}
+
+select.form-control + .chosen-container-multi .chosen-results li.result-selected{
+ display: list-item;
+ color: #ccc;
+ cursor: default;
+ background-color: white;
+}
diff --git a/VIPSWeb/static/css/3rdparty/chosen-sprite.png b/VIPSWeb/static/css/3rdparty/chosen-sprite.png
new file mode 100644
index 0000000000000000000000000000000000000000..c57da70b4b5b1e08a6977ddde182677af0e5e1b8
GIT binary patch
literal 538
zcmeAS@N?(olHy`uVBq!ia0y~yU@&1|U{K{?VPIfb{+lU|fr0U%r;B5V$MLt*H)aP1
ziX2<drKiine6Z>0S=&!40xyzU^G~X1XoM{EDBrz;L#yND-?c}T@=6N?SRAK2C<JuW
zI~Ej*ba|;1C<e%Uk!6>E=xexjj^3}mPe0wWet!J8?fb|31Y%rT^&&Us87vT+<51h<
zBF5w^<aVEX%PBjzq`57Ii{$nk;S%nVNq*D8smNk>!mw!F@1$9(?l%vf7UysATr<&2
zqin;=uW4?Tz5a9Na$h;@VdA8a+++BocK4~cM#;@4i~pFq<)3@M!hLbX^_z3cmWDRu
zozd7Aw5RxW!R+nLAIpw?)>_Oo#iCduVCus)Y<slcCV%(88xk0Pbj`|zjal`EfuB8U
zXHMEAa3y5YN$sXBt7>OXx;8aM>ZHE(mPMUDJAIOWx=k>fa(c>X^QJ30mZ$a@dS-jA
z)A*X=mDRGqCwV4Y+=8wuEhUfAw^^EhuJ2#+jp?+Gz0JFxhkEgbJ&Ai>b>2MoNbdWM
zLmMhCa|-JxeXRW*!l8KN^GE5)=Q8E({TG)m<CM)$j`_y8x8vvE$*J{z?Z<wwBwI0k
zw6vTa<1n}Qk3wnG?Bln%3n$O7sVq2@{c2s}#UCf0Kl-uhso8^%PBkal+ddk~@^s&J
zpCI^Au<dAi;YIn<_V*HN7Z-fx)BfM^mnr(WR^_EvOfMN27#KWV{an^LB{Ts5=Og%D
literal 0
HcmV?d00001
diff --git a/VIPSWeb/static/css/3rdparty/chosen-sprite@2x.png b/VIPSWeb/static/css/3rdparty/chosen-sprite@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..6b50545202cb4770039362c55025b0b9824663ad
GIT binary patch
literal 738
zcmeAS@N?(olHy`uVBq!ia0y~yV8~!#VDRE#VPIhRTX<8Pfq`kIr;B4q#=W<*_UB)A
z5IL@VFo3g7VOP_k6VL1wnNwa|X}v34%$8R2sC~aWW6*LhgRRQZ|62aApX^}iSi!74
zZ4KW`{`TjaUq3nbE#Ugwr*q#`2epN(ep~+j?)Q7$mtPxB=1J9Q_A*(JapST2p~#Cy
z6GZ&P_$wbtc&PH(FX@%mpJ*b}^@)kgXGvB|^u?D9oVw>MOg-)tN=^LnNW`PFZSsa=
zg?uMAPAWblvgVc<ON%qRHrq{AgALbyB?N}gjM&09Yt?uEwWiA@t}*f6j<veA|5r=K
z{aZg8JXzB(z1y^C|2cE9MfsTr7O%R_YnZp2Sz$|k_lC5tyLUYD*l(%xzERZOwTYQG
zBa1)d#$4H)b$M$aR(VXGeZ%qlxBM)TzDI#aMcf!&4=<Ay*uK5_w%Efp8Im4c>fP<-
zS2mUOBr8m{IO}nH6{;t0{zza@*<$hdibCP>OqWO9!3wHUeut!vTPhs)I%gPMaAw<F
z>xjGAwK3U#(S7{U{Uv)D&!2{X?AfZnE=m;ta<d7|7VF(zn^Jas(Q@(d{=1iw);_WC
z_Ser-YvF1zDA3e@!n#*1fTJ=^{rnlpy2o2<em(50(XLON>AdOmq!+7`ybHUSHwHV|
zO}k&PYLkfZZSRW_Q*Q;;U3|R$-AU&;>5*N>)-*iPxo!F5=QBsua%+pg-x=q)J>Jg$
zrSl**kN-_W!Owq@ckkQnQ#qf^_2rJ{f@6~=^LVezD6i{i7Y)8~w3BI8;pVr00{&{f
zla?z#b7|YvgR@pOe~oxEt+HBW|LW$_R@L2VQ={asK6xNh|3rOH$F~oX^`GBpoVIv$
zV~*I`mDlF1t4})2zfwZ}Qt!jYu3pn1vj?fU0s9Qjv)RaObX%qC)_;UI^PS8j<@=m#
lCswWV_*&DuKk^^{60fM<7{6ne85kHCJYD@<);T3K0RYcGU^4&!
literal 0
HcmV?d00001
diff --git a/VIPSWeb/static/css/3rdparty/chosen.min.css b/VIPSWeb/static/css/3rdparty/chosen.min.css
new file mode 100644
index 00000000..5ca6159c
--- /dev/null
+++ b/VIPSWeb/static/css/3rdparty/chosen.min.css
@@ -0,0 +1,3 @@
+/* Chosen v1.4.2 | (c) 2011-2015 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;zoom:1;*display:inline;-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(top,#fff 20%,#f6f6f6 50%,#eee 52%,#f4f4f4 100%);background:-moz-linear-gradient(top,#fff 20%,#f6f6f6 50%,#eee 52%,#f4f4f4 100%);background:-o-linear-gradient(top,#fff 20%,#f6f6f6 50%,#eee 52%,#f4f4f4 100%);background:linear-gradient(top,#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!important;height:1%;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(top,#f4f4f4 20%,#f0f0f0 50%,#e8e8e8 52%,#eee 100%);background-image:-moz-linear-gradient(top,#f4f4f4 20%,#f0f0f0 50%,#e8e8e8 52%,#eee 100%);background-image:-o-linear-gradient(top,#f4f4f4 20%,#f0f0f0 50%,#e8e8e8 52%,#eee 100%);background-image:linear-gradient(top,#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/VIPSWeb/static/js/3rdparty/chosen.jquery.min.js b/VIPSWeb/static/js/3rdparty/chosen.jquery.min.js
new file mode 100644
index 00000000..22e38658
--- /dev/null
+++ b/VIPSWeb/static/js/3rdparty/chosen.jquery.min.js
@@ -0,0 +1,2 @@
+/* Chosen v1.4.2 | (c) 2011-2015 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},AbstractChosen.prototype.set_default_text=function(){return this.default_text=this.form_field.getAttribute("data-placeholder")?this.form_field.getAttribute("data-placeholder"):this.is_multiple?this.options.placeholder_text_multiple||this.options.placeholder_text||AbstractChosen.default_multiple_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(){var a=this;if(this.is_multiple){if(!this.active_field)return setTimeout(function(){return a.container_mousedown()},50)}else if(!this.active_field)return this.activate_field()},AbstractChosen.prototype.input_blur=function(){var a=this;return this.mouse_on_container?void 0:(this.active_field=!1,setTimeout(function(){return a.blur_test()},100))},AbstractChosen.prototype.results_option_build=function(a){var b,c,d,e,f;for(b="",f=this.results_data,d=0,e=f.length;e>d;d++)c=f[d],b+=c.group?this.result_add_group(c):this.result_add_option(c),(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)));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(){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;return b=this.search_contains?"":"^",new RegExp(b+a,"i")},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:break;default:return this.results_search()}},AbstractChosen.prototype.clipboard_event_checker=function(){var a=this;return setTimeout(function(){return a.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)?!1:/Android/i.test(window.navigator.userAgent)&&/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(){var c,d;c=a(this),d=c.data("chosen"),"destroy"===b&&d instanceof Chosen?d.destroy():d instanceof Chosen||c.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" tabindex="-1"><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(){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(){var a;return this.form_field.tabIndex?(a=this.form_field.tabIndex,this.form_field.tabIndex=-1,this.search_field[0].tabIndex=a):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.search_field.val(""),(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/VIPSWeb/static/js/frontpage.js b/VIPSWeb/static/js/frontpage.js
index 7b6548ce..78c826b1 100644
--- a/VIPSWeb/static/js/frontpage.js
+++ b/VIPSWeb/static/js/frontpage.js
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014 NIBIO <http://www.nibio.no/>.
+ * Copyright (c) 2015 NIBIO <http://www.nibio.no/>.
*
* This file is part of VIPSWeb.
* VIPSWeb is free software: you can redistribute it and/or modify
@@ -21,7 +21,7 @@
* Interactive stuff on the VIPSWeb front page. Code for
* map is found in ./forecastmap.js
*
- * Depending on /currentLanguage.js
+ * Depending on /currentLanguage.js and /settings.js
*
* @author Tor-Einar Skog <tor-einar.skog@nibio.no>
*/
@@ -45,6 +45,118 @@ function getSelectedCropIds()
return selectedCropIds;
}
+var allMessages;
+var filteredMessages;
+
+/**
+ * Loads messages and caches them
+ */
+function cacheMessages()
+{
+ $.getJSON( "/messages/by_tag/json?messageTagIds=" + settings.frontpageMessageTagIds.join(","), function( json ) {
+ allMessages = json;
+ filterMessages();
+ }
+ );
+}
+
+/**
+ * Rendering the contents of filteredMessages
+ */
+function renderMessages()
+{
+ for(var i in settings.frontpageMessageTagIds)
+ {
+ var tagId = settings.frontpageMessageTagIds[i];
+ document.getElementById("tbody_messageTag_" + tagId).innerHTML = "";
+ tagMessages = filteredMessages[tagId];
+ //console.log(tagMessages);
+ for(var j in tagMessages)
+ {
+ var tagMessage = tagMessages[j];
+ document.getElementById("tbody_messageTag_" + tagId).innerHTML +=
+ '<tr><td class="dateCell">' + tagMessage["datePub"] + '</td><td><a href="/messages/' + tagMessage["messageId"] + '">' + getMessageLocale(tagMessage, settings.currentLanguage,settings.languageCode)["heading"] + '</a></td></tr>';
+
+ }
+ }
+}
+
+/**
+ * Filtering on the crops that the messages are attached to. If no crop ids are attached,
+ * the message is considered universally interesting and is always included
+ */
+function filterMessages()
+{
+ var selectedCropIds = getSelectedCropIds();
+ //console.log(selectedCropIds);
+ filteredMessages = {};
+ for(var tagI in allMessages)
+ {
+ //console.log(allMessages[tagI]);
+ var filteredForTag = [];
+ for(var mI in allMessages[tagI])
+ {
+ var message = allMessages[tagI][mI];
+ var messageCropOrganismIds = message["messageCropOrganismIds"];
+ if(messageCropOrganismIds.length == 0)
+ {
+ filteredForTag.push(message);
+ }
+ else
+ {
+ for(var mCOI in messageCropOrganismIds)
+ {
+ //console.log(messageCropOrganismIds[mCOI]);
+ if(selectedCropIds.indexOf(messageCropOrganismIds[mCOI]) >= 0)
+ {
+ filteredForTag.push(message);
+ break;
+ }
+ }
+ }
+ }
+ filteredMessages[tagI] = filteredForTag;
+ }
+ renderMessages();
+}
+
+/**
+ * Tries to deliver the most relevant language version for a message
+ * Priority is as such: firstLang, secondLang, English, first translation in collection
+ * @param theMessage Message object
+ * @param firstLang Two-letter language code
+ * @param secondLang Two-letter language code
+ * @returns
+ */
+function getMessageLocale(theMessage, firstLang, secondLang)
+{
+ var retValPri1, retValPri2, retValPri3, retValPri4;
+ for(var i in theMessage["messageLocaleSet"])
+ {
+ var messageLocale = theMessage["messageLocaleSet"][i];
+ if(retValPri4 == null)
+ {
+ retValPri4 = messageLocale;
+ }
+ if(messageLocale["messageLocalePK"]["locale"] == firstLang)
+ {
+ retValPri1 = messageLocale;
+ }
+ if(messageLocale["messageLocalePK"]["locale"] == secondLang)
+ {
+ retValPri2 = messageLocale;
+ }
+ if(messageLocale["messageLocalePK"]["locale"] == "en")
+ {
+ retValPri3 = messageLocale;
+ }
+ }
+ return retValPri1 != null ? retValPri1:
+ retValPri2 != null ? retValPri2:
+ retValPri2 != null ? retValPri3:
+ retValPri4;
+}
+
/**
* Converts JSON data of forecast configurations into HTML and
* renders it to the table with id="forecastSummariesTable"
@@ -184,6 +296,9 @@ function getSortedAndFilteredForecastSummaries(allForecastSummaries,firstDay,las
return retVal;
}
+/**
+ * Sorting forecast summaries chronologically
+ */
var sortForecastSummaries = function(a,b){
var momentA = moment(a.forecastSummaryPK.summaryForDate);
var momentB = moment(b.forecastSummaryPK.summaryForDate);
@@ -303,7 +418,9 @@ function cacheForecastSummaries()
}
-
+/**
+ * Collects and caches points of interest
+ */
function cachePois()
{
$.getJSON( "http://" + settings.vipslogicServerName + "/rest/poi/organization/" + settings.vipsOrganizationId, function( json ) {
@@ -321,7 +438,7 @@ function updateForecastSummariesHeading(numberOfForecastSummaries)
}
/**
- *
+ * Updates forecast summary list based on map and crop selection intputs
*/
function updateForecastSummaries()
{
@@ -375,7 +492,7 @@ function updateForecastSummaries()
}
/**
- *
+ * Which forecast summaries are attached to this location?
* @param poiId
* @returns {Array}
*/
@@ -394,6 +511,11 @@ function getForecastSummariesForPoi(poiId)
return retVal;
}
+/**
+ * Are there external resources connected to the location. E.g. RIMPro forecasts?
+ * @param poiId
+ * @returns
+ */
function getExternalResourcesForPoi(poiId)
{
for(var i in cachedPois)
@@ -407,11 +529,21 @@ function getExternalResourcesForPoi(poiId)
return null;
}
+/**
+ * Persisting the selected crop Ids locally
+ * TODO: If user logged in, store in user session on server for
+ * global access on clients where the user is logged in
+ */
function storeSelectedCropIds()
{
storeLocalSettings({"selectedCropIds":getSelectedCropIds()});
}
+/**
+ * Getting selected crop Ids from persistence layer
+ * TODO: Add server as persistence layer when login system is
+ * implemented
+ */
function restoreSelectedCropIds()
{
// localStorage only stores strings, so we must recreate as array
diff --git a/VIPSWeb/templates/index.html b/VIPSWeb/templates/index.html
index f5630165..3b48898c 100644
--- a/VIPSWeb/templates/index.html
+++ b/VIPSWeb/templates/index.html
@@ -53,7 +53,7 @@
cacheForecastSummaries();
cachePois();
restoreSelectedCropIds();
-
+ cacheMessages();
});
</script>
{% endblock %}
@@ -83,7 +83,7 @@
<ul class="cropList double">
{% for crop_group in crop_groups %}
<li>
- <input type="checkbox" name="cropIds" id="cropIds_{{crop_group.crop_ids|slugify}}" value="{{crop_group.crop_ids}}" checked="checked" onchange="refreshForecasts({{settings.VIPS_ORGANIZATION_ID}},'{{settings.VIPSLOGIC_SERVER_NAME}}');storeSelectedCropIds();"/>
+ <input type="checkbox" name="cropIds" id="cropIds_{{crop_group.crop_ids|slugify}}" value="{{crop_group.crop_ids}}" checked="checked" onchange="refreshForecasts({{settings.VIPS_ORGANIZATION_ID}},'{{settings.VIPSLOGIC_SERVER_NAME}}');storeSelectedCropIds();filterMessages();"/>
<label for="cropIds_{{crop_group.crop_ids|slugify}}"><span></span>{{ crop_group.name }}</label>
</li>
{% endfor %}
@@ -108,13 +108,13 @@
<th colspan="2">{{message_tag.local_tag_name|default_if_none:message_tag.default_tag_name}}</th>
</tr>
</thead>
- <tbody>
- {% for message in messages_by_tag|lookup:message_tag.message_tag_id %}
- <tr>
- <td class="dateCell">{{ message.date_pub|date:"Y-m-d" }}</td>
- <td><a href="{% url 'vips_messages:detail' message.message_id %}">{{message.heading}}</a></td>
- </tr>
- {% endfor %}
+ <tbody id="tbody_messageTag_{{message_tag.message_tag_id}}">
+
+ <!--tr>
+ <td class="dateCell"> message.date_pub|date:"Y-m-d" </td>
+ <td><a href=" url 'vips_messages:detail' message.message_id ">message.heading</a></td>
+ </tr-->
+
</tbody>
{% endfor %}
</table>
diff --git a/VIPSWeb/templates/settings.js b/VIPSWeb/templates/settings.js
index 13715ed1..b5d53df7 100644
--- a/VIPSWeb/templates/settings.js
+++ b/VIPSWeb/templates/settings.js
@@ -2,7 +2,7 @@
{% get_current_language as CURRENT_LANGUAGE %}
/**
* These are global configuration variables, dynamically generated by
- * Django and made accessible for JavaScript
+ * Django and made accessible to JavaScript
*/
var settings = {
@@ -14,5 +14,7 @@ var settings = {
mapZoomlevel: {{settings.MAP_ZOOMLEVEL}},
- systemTimeOffsetMonths: {{settings.SYSTEM_TIME_OFFSET_MONTHS}}
+ systemTimeOffsetMonths: {{settings.SYSTEM_TIME_OFFSET_MONTHS}},
+
+ frontpageMessageTagIds: {{settings.FRONTPAGE_MESSAGE_TAG_IDS}}
};
diff --git a/VIPSWeb/views.py b/VIPSWeb/views.py
index 218f0f74..c7f37ff6 100644
--- a/VIPSWeb/views.py
+++ b/VIPSWeb/views.py
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2014 NIBIO <http://www.nibio.no/>.
+# Copyright (c) 2015 NIBIO <http://www.nibio.no/>.
#
# This file is part of VIPSWeb.
# VIPSWeb is free software: you can redistribute it and/or modify
@@ -17,6 +17,7 @@
#
# @author: Tor-Einar Skog <tor-einar.skog@nibio.no>
from django.shortcuts import render
+from django.http import HttpResponse
from django.conf import settings
from django.utils import translation
from vips_messages.models import Message, MessageTag
@@ -25,19 +26,9 @@ from organisms.models import CropGroup
def index(request):
# Get front page categories. This is defined in local_settings.py
message_tags = MessageTag.get_message_tags(translation.get_language())
- messages_by_tag = {}
- for message_tag_id in settings.FRONTPAGE_MESSAGE_TAG_IDS:
- messages = Message.get_messages_by_tag(message_tag_id, translation.get_language())
- #print "MESSAGES: %s" % messages
- messages_by_tag[message_tag_id] = messages
- #for message in messages:
- # print message
- #messages_ordered.append(message_tagged)
-
# Last 10 messages
context = {
'message_tags': message_tags,
- 'messages_by_tag': messages_by_tag,
'crop_groups': CropGroup.get_crop_groups(translation.get_language())
}
return render(request, 'index.html', context)
@@ -49,4 +40,7 @@ def settings_js(request):
## TODO: Is this being used???
def resourcebundle(request):
- return render(request, 'resourcebundle.js',content_type="application/javascript")
\ No newline at end of file
+ return render(request, 'resourcebundle.js',content_type="application/javascript")
+
+
+
\ No newline at end of file
diff --git a/organisms/locale/nb/LC_MESSAGES/django.po b/organisms/locale/nb/LC_MESSAGES/django.po
index 229c8f76..42ed1dce 100644
--- a/organisms/locale/nb/LC_MESSAGES/django.po
+++ b/organisms/locale/nb/LC_MESSAGES/django.po
@@ -18,7 +18,8 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: templates/organisms/index.html:3 templates/organisms/index.html.py:5
+#: templates/organisms/index.html:3
+#: templates/organisms/index.html.py:5
msgid "Organisms"
msgstr "Organismer"
@@ -29,4 +30,5 @@ msgstr "Kulturer"
#: templates/organisms/index.html:6
#, fuzzy
msgid "Crop"
-msgstr "Kulturer"
+msgstr "Kultur"
+
diff --git a/organisms/models.py b/organisms/models.py
index 1374b67c..40bf8e77 100644
--- a/organisms/models.py
+++ b/organisms/models.py
@@ -81,3 +81,16 @@ class Organism:
theDict["hierarchyCategoryId"],
local_name
)
+
+ @staticmethod
+ def get_all_crops():
+ crops = []
+ for item in Organism.get_all_crops_from_vipslogic():
+ crop = Organism.get_instance_from_dict(item)
+ crops.append(crop)
+ return crops
+
+ @staticmethod
+ def get_all_crops_from_vipslogic():
+ request_result = requests.get("http://%s/rest/organism/crop/list" % (settings.VIPSLOGIC_SERVER_NAME))
+ return request_result.json()
diff --git a/vips_messages/locale/bg/LC_MESSAGES/django.mo b/vips_messages/locale/bg/LC_MESSAGES/django.mo
index 2e3f7d2a149f9ae9b9e4b4d2c8f5efc5f8095d3c..aa66cd7ed882abce934a2db20a6d7591d3464804 100644
GIT binary patch
delta 22
dcmeyy@{MJ}XKq6ST_ZyULsKggla2o>7y(~m2gCpX
delta 22
dcmeyy@{MJ}XKn)vT|-L+14}DI<Bk6+7y)1p2hjik
diff --git a/vips_messages/locale/bg/LC_MESSAGES/django.po b/vips_messages/locale/bg/LC_MESSAGES/django.po
index 287a0dc8..9604e3eb 100644
--- a/vips_messages/locale/bg/LC_MESSAGES/django.po
+++ b/vips_messages/locale/bg/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-19 09:13+0200\n"
+"POT-Creation-Date: 2015-10-21 15:44+0200\n"
"PO-Revision-Date: 2014-05-14 09:25+0200\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,35 +18,39 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Poedit 1.6.5\n"
-#: templates/messages/index.html:3 templates/messages/index.html.py:5
+#: templates/messages/index.html:3 templates/messages/index.html.py:9
msgid "Messages"
msgstr "Съобщения"
-#: templates/messages/index.html:10
+#: templates/messages/index.html:14
msgid "Text search"
msgstr ""
-#: templates/messages/index.html:17
+#: templates/messages/index.html:20
+msgid "All crops"
+msgstr ""
+
+#: templates/messages/index.html:31
msgid "From"
msgstr ""
-#: templates/messages/index.html:22
+#: templates/messages/index.html:36
msgid "To"
msgstr ""
-#: templates/messages/index.html:24
+#: templates/messages/index.html:38
msgid "Date search"
msgstr ""
-#: templates/messages/index.html:33
+#: templates/messages/index.html:47
msgid "Publish date"
msgstr "Дата на издаване"
-#: templates/messages/index.html:34
+#: templates/messages/index.html:48
msgid "Headline"
msgstr "Заглавие"
-#: templates/messages/index.html:35
+#: templates/messages/index.html:49
msgid "Author"
msgstr "Автор"
diff --git a/vips_messages/locale/bs/LC_MESSAGES/django.mo b/vips_messages/locale/bs/LC_MESSAGES/django.mo
index 2828b6d466f1a0b9c108e0eb9e7b7badc87a86f9..a7a88eb2d626e3125ac62eb8091c8ada1c868ccb 100644
GIT binary patch
delta 23
ecmbQpI+1n4cWy%iT_ZyULsKgglg&(w{fq!o4h9|o
delta 23
ecmbQpI+1n4cWwg<T|-L+14}DI<IPNr{fq!o$ObC_
diff --git a/vips_messages/locale/bs/LC_MESSAGES/django.po b/vips_messages/locale/bs/LC_MESSAGES/django.po
index 7cccbff2..790422e9 100644
--- a/vips_messages/locale/bs/LC_MESSAGES/django.po
+++ b/vips_messages/locale/bs/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VIPS\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-19 09:13+0200\n"
+"POT-Creation-Date: 2015-10-21 15:44+0200\n"
"PO-Revision-Date: 2015-02-13 11:13+0100\n"
"Last-Translator: Vjekoslav vujica <wvjeko@gmail.com>\n"
"Language-Team: \n"
@@ -19,35 +19,39 @@ msgstr ""
"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
"X-Generator: Poedit 1.7.4\n"
-#: templates/messages/index.html:3 templates/messages/index.html.py:5
+#: templates/messages/index.html:3 templates/messages/index.html.py:9
msgid "Messages"
msgstr "Poruke "
-#: templates/messages/index.html:10
+#: templates/messages/index.html:14
msgid "Text search"
msgstr ""
-#: templates/messages/index.html:17
+#: templates/messages/index.html:20
+msgid "All crops"
+msgstr ""
+
+#: templates/messages/index.html:31
msgid "From"
msgstr ""
-#: templates/messages/index.html:22
+#: templates/messages/index.html:36
msgid "To"
msgstr ""
-#: templates/messages/index.html:24
+#: templates/messages/index.html:38
msgid "Date search"
msgstr ""
-#: templates/messages/index.html:33
+#: templates/messages/index.html:47
msgid "Publish date"
msgstr "Datum objave "
-#: templates/messages/index.html:34
+#: templates/messages/index.html:48
msgid "Headline"
msgstr "Naslov "
-#: templates/messages/index.html:35
+#: templates/messages/index.html:49
msgid "Author"
msgstr "Autor "
diff --git a/vips_messages/locale/nb/LC_MESSAGES/django.mo b/vips_messages/locale/nb/LC_MESSAGES/django.mo
index 6ce83fab352d09772438883c0e9191d6919a1c07..00b5fb0e2d9ae0f07754efd668cbaea7f97b42cb 100644
GIT binary patch
delta 298
zcmaFJ+R0XbPl#nI0|NsC7Xt%>3<Cp04g&)NF9QR^9*`gd1H%Uf1_n+B28NFe3=C`x
z3=F>+7#O%27#Nrs85md?7#R2%85lSi7#M`1v<xEy0}lfOgDN9Loe?7g0}}%SgB>FS
zLpCD=gCirv{IyJAbL$y)GeHbE%EZ9H%)r2KjtSzJOArMNcbOO%1Q-|?o-;uV{sC3T
z%FMvP2z4YYlm_VsITGX`kfT8svok;(3Q_{{B!gp4jzV%#enByVV`<66C)2nM4RnnR
i6%0+SOiVVnGV(F<I_Bi0DrA@Dl#~{w7EPYS<PQL!iy_Yd
delta 254
zcmeBVd&pXUPl#nI0|NsCCj$e63<Cp03IhWJF9QR^8jv6Z1H%Ib1_m|;28M?W3=G^1
z3=A(A7#LU>7#O}VFfed1Ffjat(oBpD3_Kt;j1YAaj0_A+3=9k^j0_Cfj0_Cwj1W5}
zGePvtWny4pW?)EUSjNP_z{SA8u!;$yU@H>?g8%~q!+s`+ffpbO8SXMMFfc+L1#$q0
w39^8dfq{V?>Ije+$g#{I2Gmm%f6d}Hu+TNMR4}l#GBn;ipOKGo@@^(S0OnH|Pyhe`
diff --git a/vips_messages/locale/nb/LC_MESSAGES/django.po b/vips_messages/locale/nb/LC_MESSAGES/django.po
index d6b1cc47..cd45e58e 100644
--- a/vips_messages/locale/nb/LC_MESSAGES/django.po
+++ b/vips_messages/locale/nb/LC_MESSAGES/django.po
@@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-19 09:13+0200\n"
+"POT-Creation-Date: 2015-10-21 15:44+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -31,35 +31,39 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: templates/messages/index.html:3
-#: templates/messages/index.html.py:5
+#: templates/messages/index.html.py:9
msgid "Messages"
msgstr "Meldinger"
-#: templates/messages/index.html:10
+#: templates/messages/index.html:14
msgid "Text search"
msgstr "Fritekstsøk"
-#: templates/messages/index.html:17
+#: templates/messages/index.html:20
+msgid "All crops"
+msgstr "Alle kulturer"
+
+#: templates/messages/index.html:31
msgid "From"
msgstr "Fra"
-#: templates/messages/index.html:22
+#: templates/messages/index.html:36
msgid "To"
msgstr "Til"
-#: templates/messages/index.html:24
+#: templates/messages/index.html:38
msgid "Date search"
msgstr "Datosøk"
-#: templates/messages/index.html:33
+#: templates/messages/index.html:47
msgid "Publish date"
msgstr "Publiseringsdato"
-#: templates/messages/index.html:34
+#: templates/messages/index.html:48
msgid "Headline"
msgstr "Overskrift"
-#: templates/messages/index.html:35
+#: templates/messages/index.html:49
msgid "Author"
msgstr "Forfatter"
diff --git a/vips_messages/models.py b/vips_messages/models.py
index 1f48cae1..643dec18 100644
--- a/vips_messages/models.py
+++ b/vips_messages/models.py
@@ -72,7 +72,8 @@ class Message:
date_valid_to,
illustration_file_name,
illustration_caption,
- created_by
+ created_by,
+ message_crop_organism_ids
):
self.message_id = message_id
self.organization_id = organization_id
@@ -84,6 +85,7 @@ class Message:
self.illustration_file_name = illustration_file_name
self.illustration_caption = illustration_caption
self.created_by = created_by
+ self.message_crop_organism_ids = message_crop_organism_ids
def get_illustration_url(self):
return "http://%s/static/images/messages/%s/%s" % (settings.VIPSLOGIC_SERVER_NAME,self.organization_id,self.illustration_file_name)
@@ -154,7 +156,8 @@ class Message:
datetime.strptime(the_dict["dateValidTo"],settings.VIPSLOGIC_DATE_FORMAT),
message_illustration.get("file_name", None),
message_illustration.get("caption", None),
- created_by
+ created_by,
+ the_dict.get("messageCropOrganismIds",[])
)
@staticmethod
diff --git a/vips_messages/templates/messages/index.html b/vips_messages/templates/messages/index.html
index b14f4d7c..6dc6ff4b 100644
--- a/vips_messages/templates/messages/index.html
+++ b/vips_messages/templates/messages/index.html
@@ -1,13 +1,27 @@
{% extends "base_with_date_picker.html" %}
{% load i18n staticfiles %}
{% block title%}{% trans "Messages" %}{%endblock%}
+{% block extendCSS %}
+<link href="{% static "css/3rdparty/chosen.min.css" %}" rel="stylesheet" media="screen" />
+<link href="{% static "css/3rdparty/chosen-bootstrap.css" %}" rel="stylesheet" media="screen" />
+{% endblock %}
{% block content %}
<h1>{% trans "Messages" %}</h1>
<div class="row">
- <div class="col-xs-6">
+ <div class="col-xs-3">
<div class="input-group">
<div class="input-group-addon"><img src="{% static "css/icons/ic_action_search.png" %}" alt="Search icon"/></div>
- <input class="form-control" type="text" placeholder="{% trans "Text search" %}" oninput="search(this);"/>
+ <input class="form-control" type="text" id="textSearchField" placeholder="{% trans "Text search" %}" oninput="search(this);"/>
+ </div>
+ </div>
+ <div class="col-xs-3">
+ <div class="form-group">
+ <select name="cropOrganismIds" class="form-control chosen-select" onchange="cropFilter(this);">
+ <option value="-1">{% trans "All crops" %}</option>
+ {% for crop in crops %}
+ <option value="{{crop.organism_id}}">{{crop.local_name}} ({{crop.latin_name}})</option>
+ {% endfor %}
+ </select>
</div>
</div>
<div class="col-xs-6">
@@ -41,6 +55,9 @@
</div>
+{% endblock %}
+{% block extendJS%}
+<script src="{% static "js/3rdparty/chosen.jquery.min.js" %}"></script>
{% endblock %}
{% block customJS%}
<script type="text/javascript">
@@ -49,10 +66,11 @@
{
datePub:"{{ message.date_pub | date:"Y-m-d"}}",
heading:"{{ message.heading | escapejs }}",
- leadParagraph: "{{ message.lead_paragraph | escapejs }}",
+ leadParagraph:"{{ message.lead_paragraph | escapejs }}",
body: "{{ message.body | escapejs }}",
createdBy:"{{ message.created_by }}",
- url:"{% url 'vips_messages:detail' message.message_id %}"
+ url:"{% url 'vips_messages:detail' message.message_id %}",
+ messageCropOrganismIds:{{message.message_crop_organism_ids}}
} {% if not forloop.last %},{% endif %}
{% endfor %}
];
@@ -106,9 +124,42 @@
renderMessageList();
}
+ /**
+ * Filters messages based on selected crops. Resets the text search
+ */
+ function cropFilter(cropSelectList)
+ {
+ // Reset text search field
+ document.getElementById("textSearchField").value="";
+ var selectedCropOrganismId = parseInt(cropSelectList.options[cropSelectList.selectedIndex].value);
+ if(selectedCropOrganismId == -1)
+ {
+ messageListSubset = messageList;
+ }
+ else
+ {
+ messageListSubset = [];
+ for(var i in messageList)
+ {
+ var message = messageList[i];
+ for(var j in message.messageCropOrganismIds)
+ {
+ if(message.messageCropOrganismIds[j] == selectedCropOrganismId)
+ {
+ messageListSubset.push(message);
+ break;
+ }
+ }
+ }
+ }
+ renderMessageList();
+ }
+
$(document).ready(function() {
messageListSubset = messageList;
renderMessageList();
+ // Activating chosen plugin
+ $(".chosen-select").chosen();
});
</script>
{% endblock %}
diff --git a/vips_messages/urls.py b/vips_messages/urls.py
index 3cdbcb9a..ec6f3154 100644
--- a/vips_messages/urls.py
+++ b/vips_messages/urls.py
@@ -25,4 +25,5 @@ urlpatterns = patterns('',
url(r'^$', views.index, name='index'),
# ex: /messages/5/
url(r'^(?P<message_id>\d+)/$', views.detail, name='detail'),
+ url(r'^by_tag/json', views.messages_by_tag_json, name='messages_by_tag_json'),
)
\ No newline at end of file
diff --git a/vips_messages/views.py b/vips_messages/views.py
index 64b2e228..db691f28 100644
--- a/vips_messages/views.py
+++ b/vips_messages/views.py
@@ -16,11 +16,15 @@
# along with VIPSWeb. If not, see <http://www.nibio.no/licenses/>.
#
+import json
+
from django.shortcuts import render
from django.utils import translation
+from django.http import HttpResponse
from vips_messages.models import Message
from vips_messages.forms import MessagePublishedDateFilterForm
+from organisms.models import Organism
def index(request):
messages = None
@@ -36,10 +40,12 @@ def index(request):
else:
messages = Message.get_messages(translation.get_language())
-
+ crops = Organism.get_all_crops()
+
context = {
'messages' : messages,
- 'form' : form
+ 'form' : form,
+ 'crops' : crops
}
return render(request, 'messages/index.html', context)
@@ -48,4 +54,20 @@ def detail(request, message_id):
#'message' : get_object_or_404(Message, pk=message_id)
'message': Message.get_message(message_id, translation.get_language())
}
- return render(request, 'messages/detail.html', context)
\ No newline at end of file
+ return render(request, 'messages/detail.html', context)
+
+# Send messages as JSON
+# TODO: Skip intermediary Python object, get json directly from VIPSLogic
+def messages_by_tag_json(request):
+ # Get front page categories. This is defined in local_settings.py
+ messages_by_tag = {}
+ try:
+ for message_tag_id in map(int, request.GET.get("messageTagIds","").split(',')):
+ messages = Message.get_messages_by_tag_as_json(message_tag_id)
+ #print "MESSAGES: %s" % messages
+ messages_by_tag[message_tag_id] = messages
+ except ValueError:
+ messages_by_tag = {}
+ #print messages_by_tag
+ the_response = json.dumps(messages_by_tag)
+ return HttpResponse(the_response, content_type='application/json')
\ No newline at end of file
--
GitLab