From 202d2af54d0f76a416d9484409980d7f0c94823f Mon Sep 17 00:00:00 2001
From: Tor-Einar Skog <tor-einar.skog@bioforsk.no>
Date: Fri, 29 Jan 2016 13:35:02 +0100
Subject: [PATCH] New basic layout template Finished template for front page
---
VIPSWeb/local_settings_sample.py | 34 +++++++
VIPSWeb/locale/bg/LC_MESSAGES/django.mo | Bin 798 -> 738 bytes
VIPSWeb/locale/bg/LC_MESSAGES/django.po | 88 ++++++++++------
VIPSWeb/locale/bs/LC_MESSAGES/django.mo | Bin 1083 -> 1051 bytes
VIPSWeb/locale/bs/LC_MESSAGES/django.po | 88 ++++++++++------
VIPSWeb/locale/fi/LC_MESSAGES/django.mo | Bin 570 -> 529 bytes
VIPSWeb/locale/fi/LC_MESSAGES/django.po | 88 ++++++++++------
VIPSWeb/locale/nb/LC_MESSAGES/django.mo | Bin 2096 -> 2369 bytes
VIPSWeb/locale/nb/LC_MESSAGES/django.po | 94 ++++++++++-------
VIPSWeb/locale/vi/LC_MESSAGES/django.mo | Bin 2193 -> 1987 bytes
VIPSWeb/locale/vi/LC_MESSAGES/django.po | 104 ++++++++++++-------
VIPSWeb/static/css/vipsweb.css | 129 +++++++++++++++++++-----
VIPSWeb/static/images/logo_vips_new.png | Bin 0 -> 6049 bytes
VIPSWeb/static/js/frontpage.js | 42 ++++++--
VIPSWeb/templates/index.html | 100 +++++++++---------
VIPSWeb/templatetags/template_helper.py | 28 +++++
16 files changed, 544 insertions(+), 251 deletions(-)
create mode 100644 VIPSWeb/static/images/logo_vips_new.png
diff --git a/VIPSWeb/local_settings_sample.py b/VIPSWeb/local_settings_sample.py
index 24dfb546..0ee25778 100644
--- a/VIPSWeb/local_settings_sample.py
+++ b/VIPSWeb/local_settings_sample.py
@@ -157,6 +157,40 @@ CROP_GROUPS=[]
#
MAIN_MENU=[]
+# The columns with links below the map
+# 12 % Number of columns must be 0 (12 needs to be divisible by number of columns)
+FRONTPAGE_MENU=[
+ {
+ "label": "Cereals and oilseeds",
+ "items":[
+ {"url":"/nopage", "label": "Test1"},
+ {"url":"/nopage", "label": "Test2"},
+ ]
+ },
+ {
+ "label": "Potato and vegetables",
+ "items":[
+ {"url":"/nopage", "label": "Test1"},
+ {"url":"/nopage", "label": "Test2"},
+ ]
+ },
+ {
+ "label": "Fruits and berries",
+ "items":[
+ {"url":"/nopage", "label": "Test1"},
+ {"url":"/nopage", "label": "Test2"},
+ ]
+ },
+ {
+ "label": "Other models and services",
+ "items":[
+ {"url":"/nopage", "label": "Test1"},
+ {"url":"/nopage", "label": "Test2"},
+ ]
+ }
+
+]
+
# Text and formatting (HTML) for the footer to be
# shown on all web pages. Language code must be specified
# Language selection is as follows:
diff --git a/VIPSWeb/locale/bg/LC_MESSAGES/django.mo b/VIPSWeb/locale/bg/LC_MESSAGES/django.mo
index ad1d93677c93e2171693a716a124fdfa0661cda5..1345bec99f98e86565fce64275f5c91a43d807a9 100644
GIT binary patch
delta 177
zcmbQo_K3Cqo)F7a1_lNORt5$J83qOh7X}6fb_NE99FQOb149P`0|O@m14AbR1A`I+
z1H)tn1_nU}28L}=btf1Y7%CVU7%ng{FbFU(FnBUCFvKx1FhnsiFbFX)FzjSvU=U?s
zU^v6Xz`zJKlbL~mfdyhGNC^W26G*}>zbG|1vAAU7u0~!nT?0d1BTEHCV=H5$%^r+4
KjFYD`wF3aOs}_3z
delta 236
zcmaFFI*+aXo)F7a1_lNOHU<U;83qOh9|i^nZUzR18jv6Z1H%di1_n+B28NXk3=A9$
z3=EqY7#Nfo7#Q|2Ffa%*FfiO_U|?WpU|{&jz`#(!$iVQEfq_AQfq|ijiGe|gfq|i!
ziGd-Gfq`Kfl>e29fk6~x7Bd3_BLjmq0}Iq57{$cEz`)GFz`zO>067fIbjvSFO-?K>
zDQ56ZEiO(>Pn|fik=In$&`8(NM8VL+%Gi9fJfjVx;KGYt7xrD)c(L=s)(d+t?6}xJ
IIg+Up0JOCy_5c6?
diff --git a/VIPSWeb/locale/bg/LC_MESSAGES/django.po b/VIPSWeb/locale/bg/LC_MESSAGES/django.po
index 669d35f5..a8752d80 100644
--- a/VIPSWeb/locale/bg/LC_MESSAGES/django.po
+++ b/VIPSWeb/locale/bg/LC_MESSAGES/django.po
@@ -19,7 +19,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-14 14:37+0100\n"
+"POT-Creation-Date: 2016-01-29 13:32+0100\n"
"PO-Revision-Date: 2014-05-14 09:31+0200\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -30,8 +30,20 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Poedit 1.6.5\n"
-#: local_settings.py:157
-msgid "Working title"
+#: local_settings.py:167
+msgid "Cereals and oilseeds"
+msgstr ""
+
+#: local_settings.py:174
+msgid "Potato and vegetables"
+msgstr ""
+
+#: local_settings.py:181
+msgid "Fruits and berries"
+msgstr ""
+
+#: local_settings.py:188
+msgid "Other models and services"
msgstr ""
#: templates/404.html:3 templates/404.html.py:5
@@ -52,19 +64,19 @@ msgid ""
"should be back online shortly."
msgstr ""
-#: templates/base.html:54
+#: templates/base.html:56
msgid "Toggle navigation"
msgstr "Навигация"
-#: templates/base.html:72
-msgid "Click to change language"
+#: templates/base.html:83
+msgid "Language"
msgstr ""
-#: templates/base.html:97
+#: templates/base.html:100
msgid "Sign in"
msgstr ""
-#: templates/base.html:109
+#: templates/base.html:117
msgid "This is the default page contents."
msgstr "Това е съдържанието на страницата по подразбиране. "
@@ -72,64 +84,76 @@ msgstr "Това е съдържанието на страницата по по
msgid "Welcome"
msgstr "Добре дошли"
-#: templates/index.html:70
+#: templates/index.html:63
+#, fuzzy
+#| msgid "Messages"
+msgid "Latest messages"
+msgstr "Съобщения"
+
+#: templates/index.html:63
+#, fuzzy
+#| msgid "Messages"
+msgid "All messages"
+msgstr "Съобщения"
+
+#: templates/index.html:69
+msgid "Surveillance"
+msgstr ""
+
+#: templates/index.html:88
+msgid "Crops"
+msgstr ""
+
+#: templates/index.html:105
msgid "High risk of infection"
msgstr ""
-#: templates/index.html:71
+#: templates/index.html:106
msgid "Medium risk of infection"
msgstr ""
-#: templates/index.html:72
+#: templates/index.html:107
msgid "No risk of infection"
msgstr ""
-#: templates/index.html:73
+#: templates/index.html:108
msgid "Missing data"
msgstr ""
-#: templates/index.html:74
+#: templates/index.html:109
msgid "No forecast available"
msgstr ""
-#: templates/index.html:82
-msgid "Crops"
-msgstr ""
+#: templates/index.html:117
+#, fuzzy
+#| msgid "Forecasts"
+msgid "My forecasts"
+msgstr "Прогноза"
-#: templates/index.html:95
+#: templates/index.html:124
msgid "Forecasts"
msgstr "Прогноза"
-#: templates/index.html:96
+#: templates/index.html:125
msgid "Sort by"
msgstr ""
-#: templates/index.html:96
+#: templates/index.html:125
msgid "Weather station"
msgstr ""
-#: templates/index.html:96
+#: templates/index.html:125
msgid "Pest"
msgstr ""
-#: templates/index.html:96
+#: templates/index.html:125
msgid "Model"
msgstr ""
-#: templates/index.html:97
+#: templates/index.html:126
msgid "Select crops or zoom in to see list of forecasts"
msgstr ""
-#: templates/index.html:104
-#, fuzzy
-#| msgid "Forecasts"
-msgid "My forecasts"
-msgstr "Прогноза"
-
-#: templates/index.html:111
-msgid "Messages"
-msgstr "Съобщения"
-
#: templatetags/template_helper.py:74
#, fuzzy
msgid "Information"
diff --git a/VIPSWeb/locale/bs/LC_MESSAGES/django.mo b/VIPSWeb/locale/bs/LC_MESSAGES/django.mo
index b10509aab37c26523412607ca8ae4964aa8848f2..6034ea1979808dbbdac4cd7105a614e4bb9c72dc 100644
GIT binary patch
delta 283
zcmdnZF`J|Qo)F7a1_lNOZUzPh83qQ15(WkaK?VkfGax|*1_l8}1_oA;7$XA%Cj$e6
zI3ojt7y|=?A|nHX1Oo$u1tS9k4+8^3AR_~VC<6mS93umR2*?~p1_mVt28K>Xh<R%m
z85r0Z7#Q|3GB8YKWMDW3;U_V~FhdMZVTKrx$IQSW&cMLX!py)Rz`(#ThZ$nwT4spB
zN0=EH6c`v7ZZb142s1D+{9=YUfRBZNfsp}X3CN)!_p^bBi66xUIY103<^uV4vLvJD
g<ZQ-myk@!vhPp<U3Wmm3#zvd<m^v9J?_;h705|{}$^ZZW
delta 324
zcmbQuv74j*o)F7a1_lNO9tH*m83qQ18U_XiK?VkfJ0L*@1_lL21_o9J1_nh&1_n+B
z1_pIT1_m((1_nb$1_lWR1_lpC1_llW28KjNh#6Uo3=E<S3=HLr3=AR+3=F-D3=B#P
z3=E4HA?6-sWME)tU|_h;$iOg_k)fX9K2)HT8Dc>#GsJ*)W(Edv1_p+?%nS@{3=9lg
znHd-a7#JA#Fhd-0mKkEf6J`bm1qKF&pUeyl!VC-yQY;XM=&>*`Ffu?K#|8Ba$YPLL
zAP=!HFfcGPOnk>B2=W$G0RuNEC?<0<da|b$7bm8t7Ecaf+`((AYiOivXrf?fVr6W;
RS(K@hk-4Zed-5#iMgU3dB02y7
diff --git a/VIPSWeb/locale/bs/LC_MESSAGES/django.po b/VIPSWeb/locale/bs/LC_MESSAGES/django.po
index fb4cae55..e6bc3a82 100644
--- a/VIPSWeb/locale/bs/LC_MESSAGES/django.po
+++ b/VIPSWeb/locale/bs/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-14 14:37+0100\n"
+"POT-Creation-Date: 2016-01-29 13:32+0100\n"
"PO-Revision-Date: 2015-02-13 11:26+0100\n"
"Last-Translator: \n"
"Language-Team: \n"
@@ -19,8 +19,20 @@ msgstr ""
"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
"X-Generator: Poedit 1.7.4\n"
-#: local_settings.py:157
-msgid "Working title"
+#: local_settings.py:167
+msgid "Cereals and oilseeds"
+msgstr ""
+
+#: local_settings.py:174
+msgid "Potato and vegetables"
+msgstr ""
+
+#: local_settings.py:181
+msgid "Fruits and berries"
+msgstr ""
+
+#: local_settings.py:188
+msgid "Other models and services"
msgstr ""
#: templates/404.html:3 templates/404.html.py:5
@@ -41,19 +53,19 @@ msgid ""
"should be back online shortly."
msgstr ""
-#: templates/base.html:54
+#: templates/base.html:56
msgid "Toggle navigation"
msgstr "Prebaci navigaciju "
-#: templates/base.html:72
-msgid "Click to change language"
+#: templates/base.html:83
+msgid "Language"
msgstr ""
-#: templates/base.html:97
+#: templates/base.html:100
msgid "Sign in"
msgstr ""
-#: templates/base.html:109
+#: templates/base.html:117
msgid "This is the default page contents."
msgstr "Ovo je zadani sadržaj stranice "
@@ -61,64 +73,76 @@ msgstr "Ovo je zadani sadržaj stranice "
msgid "Welcome"
msgstr "Dobrodošli "
-#: templates/index.html:70
+#: templates/index.html:63
+#, fuzzy
+#| msgid "Messages"
+msgid "Latest messages"
+msgstr "Poruke"
+
+#: templates/index.html:63
+#, fuzzy
+#| msgid "Messages"
+msgid "All messages"
+msgstr "Poruke"
+
+#: templates/index.html:69
+msgid "Surveillance"
+msgstr ""
+
+#: templates/index.html:88
+msgid "Crops"
+msgstr "Usjevi "
+
+#: templates/index.html:105
msgid "High risk of infection"
msgstr "Visok rizik infekcije"
-#: templates/index.html:71
+#: templates/index.html:106
msgid "Medium risk of infection"
msgstr "Srednji rizik infekcije"
-#: templates/index.html:72
+#: templates/index.html:107
msgid "No risk of infection"
msgstr "Bez rizika infekcije"
-#: templates/index.html:73
+#: templates/index.html:108
msgid "Missing data"
msgstr "Podaci nedostaju"
-#: templates/index.html:74
+#: templates/index.html:109
msgid "No forecast available"
msgstr "Prognoza nije dostupna"
-#: templates/index.html:82
-msgid "Crops"
-msgstr "Usjevi "
+#: templates/index.html:117
+#, fuzzy
+#| msgid "Forecasts"
+msgid "My forecasts"
+msgstr "Prognoze "
-#: templates/index.html:95
+#: templates/index.html:124
msgid "Forecasts"
msgstr "Prognoze "
-#: templates/index.html:96
+#: templates/index.html:125
msgid "Sort by"
msgstr ""
-#: templates/index.html:96
+#: templates/index.html:125
msgid "Weather station"
msgstr ""
-#: templates/index.html:96
+#: templates/index.html:125
msgid "Pest"
msgstr ""
-#: templates/index.html:96
+#: templates/index.html:125
msgid "Model"
msgstr ""
-#: templates/index.html:97
+#: templates/index.html:126
msgid "Select crops or zoom in to see list of forecasts"
msgstr ""
-#: templates/index.html:104
-#, fuzzy
-#| msgid "Forecasts"
-msgid "My forecasts"
-msgstr "Prognoze "
-
-#: templates/index.html:111
-msgid "Messages"
-msgstr "Poruke"
-
#: templatetags/template_helper.py:74
msgid "Information"
msgstr ""
diff --git a/VIPSWeb/locale/fi/LC_MESSAGES/django.mo b/VIPSWeb/locale/fi/LC_MESSAGES/django.mo
index e5652171332f4e3f9d2b40bf79209d8ec7662aa8..95e69dea26a8377a2c65bffe346b43949299a931 100644
GIT binary patch
delta 166
zcmdnRGLfbJo)F7a1_lNO76t|e83qOh8wLgjRt5%!7?2<X1499nU&z3~z{$YCP|m=>
zz|O$H(8$2Rkj==z&<WN1m63sgn}LDh7b61$7Xt$W8xsQqBUBD#6f*+@0~3hhT$Eo>
w%;1(^l$xAaTrzP%G_RSifuXLErGlZcm9f!g4n}!K?vT`?vec5&ocu%v0PPYNfB*mh
delta 207
zcmbQpvWunuo)F7a1_lNORt5$J83qOh7X}6fb_NE99FQOb149Q?u9Ja*fs=uOp`U?)
zfrEj8VJ1}FA_fMAY(@r#RSXOaEDQ_`VoVGS+zbp1(o7I@)R`C<xEL51^qCkK7@=k|
zL1|V721T$YW{`k$QGP)&gIj)4YI0(6Nil<OYH@L5dg{dbXkJrYLnB>769q#PD`WGG
b&*d3~!!lEgOEOCsLQ;#$QcFs6@)H>VtWq9r
diff --git a/VIPSWeb/locale/fi/LC_MESSAGES/django.po b/VIPSWeb/locale/fi/LC_MESSAGES/django.po
index 4a2a408f..32c2c178 100644
--- a/VIPSWeb/locale/fi/LC_MESSAGES/django.po
+++ b/VIPSWeb/locale/fi/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-14 14:37+0100\n"
+"POT-Creation-Date: 2016-01-29 13:32+0100\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"
@@ -18,8 +18,20 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: local_settings.py:157
-msgid "Working title"
+#: local_settings.py:167
+msgid "Cereals and oilseeds"
+msgstr ""
+
+#: local_settings.py:174
+msgid "Potato and vegetables"
+msgstr ""
+
+#: local_settings.py:181
+msgid "Fruits and berries"
+msgstr ""
+
+#: local_settings.py:188
+msgid "Other models and services"
msgstr ""
#: templates/404.html:3 templates/404.html.py:5
@@ -40,19 +52,19 @@ msgid ""
"should be back online shortly."
msgstr ""
-#: templates/base.html:54
+#: templates/base.html:56
msgid "Toggle navigation"
msgstr ""
-#: templates/base.html:72
-msgid "Click to change language"
+#: templates/base.html:83
+msgid "Language"
msgstr ""
-#: templates/base.html:97
+#: templates/base.html:100
msgid "Sign in"
msgstr ""
-#: templates/base.html:109
+#: templates/base.html:117
msgid "This is the default page contents."
msgstr ""
@@ -60,64 +72,76 @@ msgstr ""
msgid "Welcome"
msgstr "Tervetuloa"
-#: templates/index.html:70
+#: templates/index.html:63
+#, fuzzy
+#| msgid "Messages"
+msgid "Latest messages"
+msgstr "Viestit"
+
+#: templates/index.html:63
+#, fuzzy
+#| msgid "Messages"
+msgid "All messages"
+msgstr "Viestit"
+
+#: templates/index.html:69
+msgid "Surveillance"
+msgstr ""
+
+#: templates/index.html:88
+msgid "Crops"
+msgstr "Sato"
+
+#: templates/index.html:105
msgid "High risk of infection"
msgstr ""
-#: templates/index.html:71
+#: templates/index.html:106
msgid "Medium risk of infection"
msgstr ""
-#: templates/index.html:72
+#: templates/index.html:107
msgid "No risk of infection"
msgstr ""
-#: templates/index.html:73
+#: templates/index.html:108
msgid "Missing data"
msgstr ""
-#: templates/index.html:74
+#: templates/index.html:109
msgid "No forecast available"
msgstr ""
-#: templates/index.html:82
-msgid "Crops"
-msgstr "Sato"
+#: templates/index.html:117
+#, fuzzy
+#| msgid "Forecasts"
+msgid "My forecasts"
+msgstr "Hälytykset"
-#: templates/index.html:95
+#: templates/index.html:124
msgid "Forecasts"
msgstr "Hälytykset"
-#: templates/index.html:96
+#: templates/index.html:125
msgid "Sort by"
msgstr ""
-#: templates/index.html:96
+#: templates/index.html:125
msgid "Weather station"
msgstr ""
-#: templates/index.html:96
+#: templates/index.html:125
msgid "Pest"
msgstr ""
-#: templates/index.html:96
+#: templates/index.html:125
msgid "Model"
msgstr ""
-#: templates/index.html:97
+#: templates/index.html:126
msgid "Select crops or zoom in to see list of forecasts"
msgstr ""
-#: templates/index.html:104
-#, fuzzy
-#| msgid "Forecasts"
-msgid "My forecasts"
-msgstr "Hälytykset"
-
-#: templates/index.html:111
-msgid "Messages"
-msgstr "Viestit"
-
#: templatetags/template_helper.py:74
msgid "Information"
msgstr ""
diff --git a/VIPSWeb/locale/nb/LC_MESSAGES/django.mo b/VIPSWeb/locale/nb/LC_MESSAGES/django.mo
index 5b99f74d40678e13b9cfd6f99edd09603c344ffb..fc240afbb1620479524ef9f9ac5e3700e6149ad0 100644
GIT binary patch
delta 1058
zcmdlWa8RiJo)F7a1_lNOc?Jds83qOh5k>|EO$G)A9wv||1H%R;1_mAm28NAH3=AR+
z3=I327#LU?7#J=yF);8kFfiO?VqoB8U|@K`#K0iLz`*c{iGe|kfq{XQnSp^DWF|8M
z0|x^Gg9bAL13v=;gCR2mg9HNugCjH8+<Jy6W{8355CMi<W(EdP1_p*IW{8Com>C!(
z85kIrGBYr+FfcIehsqyeW?(R2U|_h#%)r3Tz`(%G0-=Rjzy>o&voJ6yfGlQVU{GRU
zVDMyNU=U<rV8~%%U@&4}V5nnZU`S=CXJFXK0&$r*E5rbGRtAP5Mg|6bR)`N5u`w_R
zgF=7};*+Cn5cTKSAnNb2F);8lFfcrWihp5)_?(5Efq{*IfkA*BqF$UG;xTo0hy!gw
z^7RZ13|>%yKz4|a<Dd$Q*%=t585kHkq4G=FAwj!|oq@refq~&9JH$bZ91sJ!ptLv#
z1A{ID1A__&1A__!149r8#N2WY1_omW28JFE28K)q28IJ13=H+4xYgo>#GyGS0|O%i
z#MPiU1*HHf5CO%Y_yolzGbnyRamxUS8mKfl4T0F8bRh>yOAHJQ&}0M-K>?5?6w5Mz
zJr@p6G@$qfB^oXU1_p5kNN|DT3gkFYoP!b!NFOMeL2=FCn3JQBn_66)n4Vh9;G9~N
znwV3pkeHXEke``ToSK?aJUNp|LC~$JG_wREo|IZtl$koYok>-~CowO*G%-Du!6&gK
zwYUUs&g9ih(v#0Kd71c^WTX};<mRWOLJciWEh@`QPAz5#NG&d52*@u<EXfDkR+gHc
zT9TNQlUh7kmf49XxU{G&H8UqCF)ulFa~v}V<Kz++PhK-!14CUSO9ew?D`TV0r&wee
zl^k<&QWbJjb5b(%(o>5Vyz`6l6!Oy*@^i9M%Tlw8OHzv_u_<#Gm1dWKgp&?0o2<Yl
zCl*{#ba-htLvUts36k!~wrt{)<Jf#`9rIF(QX$UHNi70tEXhjEO9h$65S*QulA4}%
vct=rc5y%6nB@h+qMTd9f<rODpPu{{7$m3s@T2yv;X?9*_UixMhb~#1>5M!zf
delta 855
zcmX>ov_YW$o)F7a1_lNODFy}x83qQ1Hw+96stgPadl*5Y3=9EG3=9$s3=Dxx3=FIc
z3=COJ3=Dh>3=9QK3=EtM3=H*53=Con3=Ex23=G^13=9jP>enzaFmNz1FdSuKVBle3
zU^oZWe;dkw$i%=P%D_<1@Q#UrL4<*UfrXiYfrWvAL6Vt)!GM8*L5`V$ft`VY!5>P8
zGczzKFfcI0GczzKF)%PRFf%X+GB7YKW@cb8Vqjp{%FMu!%D}+zf|-GVpMinFj|HMX
zj)j4Nmw|yHjfH`sh>?MzgoS}Yl7WHYIV;G4^$ZM*Y!D4xY!D4nP`(ly#79PKV3#u3
zu|a$s!UpkC92)}z8v_GFHk4n)2JuKeRQ(jF_$oFA26F}mhV5)13mF*RL&blvF)--X
zGcYi)vNJHKFfcF}vqKDsU}s=3W?*2*WoKZ>WME)e$PTfPn*-ti2@Z&llsFg|ps@sw
z0#Jm3q6S2RFerLJQ38qvPzZy>1Q;M@fud9h6n&r|1W5>kqJV*cfeFN6fcTgT$_Duo
zls-W54-x_eFDOVsY;guisDaqbpy&fJoO3dhvlUA66_PU&^U_llauV~>OB2&m8Jvsq
z3yK-sGILTD^72a*((-vq^HLbx@{3ZF6N^hGGc&7Bc4U@fPc1G^OiwMI9Lem%5|CP4
zGWjO6(`F48c1E7?{G#m4ymW<<%#xhRx~$&3rn-hkx`rkSh9*|V=9^ntWf>*Cb278D
z71HvH6b>&{NX<(rN>wN>C_20}d-4%BWvj%ZRIprPUV2e#0fT2=T7FS(VsTb}9)oXb
zPG-778k!2<)SQ&ey!6zf$u{i1T*29iDXHmMhj$cBKE@unS%pKEk<YOxDK#^txFoZr
IBsGTt0DRwj(*OVf
diff --git a/VIPSWeb/locale/nb/LC_MESSAGES/django.po b/VIPSWeb/locale/nb/LC_MESSAGES/django.po
index bb606c5f..a1d0b0ad 100644
--- a/VIPSWeb/locale/nb/LC_MESSAGES/django.po
+++ b/VIPSWeb/locale/nb/LC_MESSAGES/django.po
@@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VIPSWeb\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-14 14:37+0100\n"
+"POT-Creation-Date: 2016-01-29 13:32+0100\n"
"PO-Revision-Date: 2013-11-07 20:18+0200\n"
"Last-Translator: Tor-Einar Skog <tor-einar.skog@nibio.no>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -30,11 +30,24 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: local_settings.py:157
-msgid "Working title"
-msgstr "Arbeidstittel"
+#: local_settings.py:167
+msgid "Cereals and oilseeds"
+msgstr "Korn og oljevekster"
-#: templates/404.html:3 templates/404.html.py:5
+#: local_settings.py:174
+msgid "Potato and vegetables"
+msgstr "Poteter og grønnsaker"
+
+#: local_settings.py:181
+msgid "Fruits and berries"
+msgstr "Frukt og bær"
+
+#: local_settings.py:188
+msgid "Other models and services"
+msgstr "Andre modeller og tjenester"
+
+#: templates/404.html:3
+#: templates/404.html.py:5
msgid "File not found"
msgstr "Fil ikke funnet"
@@ -42,7 +55,8 @@ msgstr "Fil ikke funnet"
msgid "We are sorry, but the requested file was not found"
msgstr "Beklager, men den etterspurte filen ble ikke funnet"
-#: templates/503.html:3 templates/503.html.py:5
+#: templates/503.html:3
+#: templates/503.html.py:5
msgid "Temporarily down for maintenance"
msgstr "Midlertidig utilgjengelig grunnet vedlikehold"
@@ -50,23 +64,22 @@ msgstr "Midlertidig utilgjengelig grunnet vedlikehold"
msgid ""
"We are sorry, but the web site is currently underdoing maintenance. We "
"should be back online shortly."
-msgstr ""
-"Vi beklager, men websiden gjennomgår vedlikehold. Vi håper å få den "
+msgstr "Vi beklager, men websiden gjennomgår vedlikehold. Vi håper å få den "
"tilgjengelig så snart som mulig."
-#: templates/base.html:54
+#: templates/base.html:56
msgid "Toggle navigation"
msgstr "Vis/skjul navigasjon"
-#: templates/base.html:72
-msgid "Click to change language"
-msgstr "Klikk for å endre språk"
+#: templates/base.html:83
+msgid "Language"
+msgstr "Språk"
-#: templates/base.html:97
+#: templates/base.html:100
msgid "Sign in"
msgstr "Logg inn"
-#: templates/base.html:109
+#: templates/base.html:117
msgid "This is the default page contents."
msgstr "Dette er standardinnholdet på siden"
@@ -74,62 +87,71 @@ msgstr "Dette er standardinnholdet på siden"
msgid "Welcome"
msgstr "Velkommen"
-#: templates/index.html:70
+#: templates/index.html:63
+msgid "Latest messages"
+msgstr "Siste meldinger"
+
+#: templates/index.html:63
+msgid "All messages"
+msgstr "Alle meldinger"
+
+#: templates/index.html:69
+msgid "Surveillance"
+msgstr "Overvåkning"
+
+#: templates/index.html:88
+msgid "Crops"
+msgstr "Kulturer"
+
+#: templates/index.html:105
msgid "High risk of infection"
msgstr "Fare for angrep"
-#: templates/index.html:71
+#: templates/index.html:106
msgid "Medium risk of infection"
msgstr "Mulig fare for angrep"
-#: templates/index.html:72
+#: templates/index.html:107
msgid "No risk of infection"
msgstr "Ingen fare for angrep"
-#: templates/index.html:73
+#: templates/index.html:108
msgid "Missing data"
msgstr "Data mangler"
-#: templates/index.html:74
+#: templates/index.html:109
msgid "No forecast available"
msgstr "Varsel beregnes ikke"
-#: templates/index.html:82
-msgid "Crops"
-msgstr "Kulturer"
+#: templates/index.html:117
+msgid "My forecasts"
+msgstr "Mine varsler"
-#: templates/index.html:95
+#: templates/index.html:124
msgid "Forecasts"
msgstr "Varsler"
-#: templates/index.html:96
+#: templates/index.html:125
msgid "Sort by"
msgstr "Sorter etter"
-#: templates/index.html:96
+#: templates/index.html:125
msgid "Weather station"
msgstr "Målestasjon"
-#: templates/index.html:96
+#: templates/index.html:125
msgid "Pest"
msgstr "Skadegjører"
-#: templates/index.html:96
+#: templates/index.html:125
msgid "Model"
msgstr "Modell"
-#: templates/index.html:97
+#: templates/index.html:126
msgid "Select crops or zoom in to see list of forecasts"
msgstr "Velg kultur eller zoom inn for å se liste over varsler"
-#: templates/index.html:104
-msgid "My forecasts"
-msgstr "Mine varsler"
-
-#: templates/index.html:111
-msgid "Messages"
-msgstr "Meldinger"
-
#: templatetags/template_helper.py:74
msgid "Information"
msgstr "Informasjon"
+
diff --git a/VIPSWeb/locale/vi/LC_MESSAGES/django.mo b/VIPSWeb/locale/vi/LC_MESSAGES/django.mo
index c76749451feeda93664ffd9702b8c43106e039d8..e0a975ba4a10d7d63d9d6a56e30fb98ac16bffd6 100644
GIT binary patch
delta 552
zcmbOzc$mNbo)F7a1_lNOF$M+(83qQ1GYkw2vJ4CiHH;up28Iue3=FIc3=AI`85sB&
z7#O}YGB9v5Ffgz&LG%bPF)(m5FfgbyF)&ClFfbT1F);8jFfjNqLG(pJ`SDB)45ADS
z3^_~;3?d8+3{6Z73@i)`^$gRQ7#Iu~7#QX-F)*+*Ffg2j(pQ-n7!(*7816DLFbFa*
zF#Ka;U@&4}U=UztU`S<PU~pz;VBlw9U|7iv(YKSCfgy#Ff#D!C!~tro3=HBR2eCpN
z?9Ix+Aj!bM5X#EHz{SA8kk87%pvh3rz)-~s@yQZah{oNl5Eq_cWnhp3Ie-=7kRPlN
zpGvYZFnBO9FsQOIFz_-kFyyf@FbIG`j13ZUy=;(>Sk1=35Xr#6aD<J4p^1TkL5>|_
z?m~8mJ=@qB7#QmrAg&RDgf`emP$oFoK_Mc{0I`UJfq{XU0pbWy6o5hn6qF$Kpr8c>
zJBSU!AP0e>3lyzv3=9lRAVCIjkTWni7v&ceGq`2uq$*5KWeVK9pQ(g#vLj0vhmoa%
Yp|O>*(dPLq?2MDIvDR&lXOm|F0PDXo)&Kwi
delta 746
zcmX@iKT)v$o)F7a1_lNONd^W683qQ1CkzY>stgPaYZyVI3=9rT3=9$s3=ED;3=FIc
z3=C0B3=Dh>3=9cO3=EtM3=H{93=Con3=EY_3=G^13=9*X>gO;qFmNz1Fl=RFVBle3
zVAu!Me;Ufa$i%=P%D_<1aF2<BL4<*U;R_Q30}BHK11B>Bg8>5r10OR313Lo)gFTdX
zXJ%kfU|?YIXJ%j!WME(@U}j)2VqjosVrF1S1zE(*z`)PIz#z>6(WlMAz`)DEz+lY6
zz>vboz~IQjz@X2-z_5%J;-G7+3=HB7^$ZM;Ss_08%?b$xRyGC(E(Qh$c{T<HO$G)A
zEhs;P4dT;yHi!XbY!HVxvoSD8F)%R9V1qbtGaDo%uCOsMcrY+9JYa)3M3bF?L4bjQ
z!JM6eL6(7m!GoQFL86|4fgz2ZfgzHCfuWwAfuV_kf#D`Q#NZeXh((1Q3=BdH3=DM~
z3=Gg%0R<g6en3$HW`IJD0b(&I*kNKI3qipz&Hyn36mlRrVFpNO$1;I<3=j)Jz6NpG
zpy>e=-yl9HSV2JvVuRuu6fGb&GXo@TFgWLACTA;@<SQg+B<7{3D&!>QrI#kAr%wLB
z7|WhoT%4GmTD;ktsf>{)JijPAGcR4CB(o%E@_yzB4g*UC14}Dov(54>?2P(;84q_Y
z%~L2lydYoU$i%~oDiw}Qe7L(=p(G;_!kn6^ke7aVOP)er`orDpC#$m7bA@E)Ddc55
c+_gS$^I}#7CSmW4!&|^M99~rl*51ef0BZbb6951J
diff --git a/VIPSWeb/locale/vi/LC_MESSAGES/django.po b/VIPSWeb/locale/vi/LC_MESSAGES/django.po
index ffa1e73a..637e6c32 100644
--- a/VIPSWeb/locale/vi/LC_MESSAGES/django.po
+++ b/VIPSWeb/locale/vi/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-01-09 09:36+0100\n"
+"POT-Creation-Date: 2016-01-29 13:32+0100\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"
@@ -18,12 +18,23 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: local_settings.py:157
-msgid "Working title"
-msgstr "Không tiêu đề"
+#: local_settings.py:167
+msgid "Cereals and oilseeds"
+msgstr ""
+
+#: local_settings.py:174
+msgid "Potato and vegetables"
+msgstr ""
+
+#: local_settings.py:181
+msgid "Fruits and berries"
+msgstr ""
+
+#: local_settings.py:188
+msgid "Other models and services"
+msgstr ""
-#: templates/404.html:3
-#: templates/404.html.py:5
+#: templates/404.html:3 templates/404.html.py:5
msgid "File not found"
msgstr "File không tìm thấy"
@@ -31,8 +42,7 @@ msgstr "File không tìm thấy"
msgid "We are sorry, but the requested file was not found"
msgstr "Chúng tôi rất xin lỗi, nhưng các tập tin yêu cầu không được tìm thấy"
-#: templates/503.html:3
-#: templates/503.html.py:5
+#: templates/503.html:3 templates/503.html.py:5
msgid "Temporarily down for maintenance"
msgstr "Tạm ngưng để bảo trì"
@@ -40,22 +50,23 @@ msgstr "Tạm ngưng để bảo trì"
msgid ""
"We are sorry, but the web site is currently underdoing maintenance. We "
"should be back online shortly."
-msgstr "Chúng tôi rất xin lỗi, nhưng trang web hiện đang underdoing bảo trì. Chúng tôi"
-"nên trở lại trực tuyến ngay."
+msgstr ""
+"Chúng tôi rất xin lỗi, nhưng trang web hiện đang underdoing bảo trì. Chúng "
+"tôinên trở lại trực tuyến ngay."
-#: templates/base.html:54
+#: templates/base.html:56
msgid "Toggle navigation"
msgstr "chuyển hướng toggle"
-#: templates/base.html:72
-msgid "Click to change language"
-msgstr "Nhấn vào đây để thay đổi ngôn ngữ"
+#: templates/base.html:83
+msgid "Language"
+msgstr ""
-#: templates/base.html:97
+#: templates/base.html:100
msgid "Sign in"
msgstr "Đăng nhập"
-#: templates/base.html:109
+#: templates/base.html:117
msgid "This is the default page contents."
msgstr ""
@@ -63,63 +74,80 @@ msgstr ""
msgid "Welcome"
msgstr "Chào mừng"
-#: templates/index.html:70
+#: templates/index.html:63
+#, fuzzy
+#| msgid "Messages"
+msgid "Latest messages"
+msgstr "Tin nhắn"
+
+#: templates/index.html:63
+#, fuzzy
+#| msgid "Messages"
+msgid "All messages"
+msgstr "Tin nhắn"
+
+#: templates/index.html:69
+msgid "Surveillance"
+msgstr ""
+
+#: templates/index.html:88
+msgid "Crops"
+msgstr "mùa gặt"
+
+#: templates/index.html:105
msgid "High risk of infection"
msgstr "Nguy cơ lây nhiễm cao"
-#: templates/index.html:71
+#: templates/index.html:106
msgid "Medium risk of infection"
msgstr "Rủi ro trung bình của nhiễm trùng"
-#: templates/index.html:72
+#: templates/index.html:107
msgid "No risk of infection"
msgstr "Không có nguy cơ lây nhiễm"
-#: templates/index.html:73
+#: templates/index.html:108
msgid "Missing data"
msgstr "Dữ liệu bị mất"
-#: templates/index.html:74
+#: templates/index.html:109
msgid "No forecast available"
msgstr "Không dự báo có sẵn"
-#: templates/index.html:82
-msgid "Crops"
-msgstr "mùa gặt"
+#: templates/index.html:117
+msgid "My forecasts"
+msgstr "dự báo của tôi"
-#: templates/index.html:95
+#: templates/index.html:124
msgid "Forecasts"
msgstr "dự báo"
-#: templates/index.html:96
+#: templates/index.html:125
msgid "Sort by"
msgstr "Sắp xếp theo"
-#: templates/index.html:96
+#: templates/index.html:125
msgid "Weather station"
msgstr "Trạm thời tiết"
-#: templates/index.html:96
+#: templates/index.html:125
msgid "Pest"
msgstr "côn trùng"
-#: templates/index.html:96
+#: templates/index.html:125
msgid "Model"
msgstr "Kiểu mẫu"
-#: templates/index.html:97
+#: templates/index.html:126
msgid "Select crops or zoom in to see list of forecasts"
msgstr "Chọn cây trồng hoặc phóng to để xem danh sách các dự báo"
-#: templates/index.html:104
-msgid "My forecasts"
-msgstr "dự báo của tôi"
-
-#: templates/index.html:111
-msgid "Messages"
-msgstr "Tin nhắn"
-
#: templatetags/template_helper.py:74
msgid "Information"
msgstr "Thông tin"
+#~ msgid "Working title"
+#~ msgstr "Không tiêu đề"
+
+#~ msgid "Click to change language"
+#~ msgstr "Nhấn vào đây để thay đổi ngôn ngữ"
diff --git a/VIPSWeb/static/css/vipsweb.css b/VIPSWeb/static/css/vipsweb.css
index 2f11d8b7..82c958d8 100644
--- a/VIPSWeb/static/css/vipsweb.css
+++ b/VIPSWeb/static/css/vipsweb.css
@@ -100,6 +100,8 @@
border-top-color: #222222 !important;
}
+
+
.nav a
{
text-decoration: none;
@@ -139,26 +141,26 @@ div.messages_illustration{
* the map so that you can scroll down the page
* Also hide the map legend
*/
-@media (max-height: 800px)
+@media (max-width: 768px) and (max-height: 800px)
{
#map { max-height: 600px !important;}
}
-@media (max-height: 600px)
+@media (max-width: 768px) and (max-height: 600px)
{
#map { max-height: 400px !important;}
#chartContainer {border-right: 15px dotted grey;}
#scrollHelp{display:block !important;}
}
-@media (max-height: 500px)
+@media (max-width: 768px) and (max-height: 500px)
{
#map { max-height: 300px !important; }
#warningLegend {display: none;}
}
-@media (max-height: 400px)
+@media (max-width: 768px) and (max-height: 400px)
{
#map { max-height: 200px !important;}
}
@@ -180,6 +182,60 @@ div.messages_illustration{
#languageSelectorIcon {display: none !important;}
}
+@media (min-width: 992px)
+{
+ #mapContainer{
+ border-left: 15px solid rgba(0, 87, 77, 0.15);
+ padding-left: 0px;
+ padding-right: 0px;
+
+ }
+ #messageColRight{
+ padding-left: 0px;
+ padding-right: 0px;
+ }
+
+
+}
+
+@media (max-width: 992px)
+{
+ #mapContainer{
+ background-color: rgba(0, 87, 77, 0.15);
+ padding-bottom: 15px;
+ }
+
+ /* Moving the crop list out of the map for narrow screens */
+ #cropList {
+ position: inherit !important;
+ z-index: inherit !important;
+ margin: inherit !important;
+
+ top: auto !important;
+ right: auto !important;
+ padding: 15px !important;
+ margin-bottom: 15px !important;
+ border: 0px none !important;
+ background-color: white !important;
+ }
+
+ #cropList h3 {
+ margin-top: 0px;
+ }
+
+ ul.cropList li {
+ float: left !important;
+ padding-right: 10px;
+ }
+
+ ul.cropList {
+
+ display: block !important;
+ margin-bottom 15px !important;
+ }
+
+}
+
#tooltip{
position: absolute;
@@ -356,17 +412,8 @@ p.byline {
}
a {
- color: rgba(19, 159, 181, 1);
- text-decoration: underline;
-}
-
-a:hover {
- color: rgba(49, 171, 110, 1);
- text-decoration: none;
-}
-
-a:visited {
- color: rgba(49, 171, 110, 1);
+ color: #008136;
+ text-decoration: underline;
}
p.lead {
@@ -440,7 +487,7 @@ ul.cropList input[type="radio"]:checked + label span {
background:url("./icons/checkbox_checked.png") left top no-repeat;
}
-ul.cropList{
+ul.cropList, ul.linkList{
list-style: none;
margin-left: 0px;
padding-left: 0px;
@@ -451,6 +498,11 @@ ul.cropList li {
}
+ul.cropList.single li {
+ float: inherit;
+
+}
+
ul.cropList.double li { width: 50%;}
div.messages_illustration {
@@ -472,9 +524,13 @@ div.forecastSummaries {
}
+#frontPageRightCol{
+ overflow-y:auto;
+}
+
#forecastSummariesTable, #myForecastSummariesTable, #forecastSummariesPopoverTable {
- max-height: 210px;
- overflow-y: auto;
+ /*max-height: 210px;*/
+ /*overflow-y: auto;*/
width: 95%;
border-collapse: separate;
border-spacing: 2px;
@@ -544,7 +600,7 @@ tbody.forecastSummaryRowGroup tr:not(:first-child){
cursor: pointer;
}
-#warningLegend
+#warningLegend, #cropList
{
position: absolute;
@@ -560,22 +616,22 @@ tbody.forecastSummaryRowGroup tr:not(:first-child){
}
-.warningLegendPlacement_1 {
+.mapBoxPlacement_1 {
top: 70px;
left: 25px;
}
-.warningLegendPlacement_2 {
+.mapBoxPlacement_2 {
top: 45px;
right: 25px;
}
-.warningLegendPlacement_3 {
+.mapBoxPlacement_3 {
bottom: 10px;
left: 25px;
}
-.warningLegendPlacement_4 {
+.mapBoxPlacement_4 {
bottom: 45px;
right: 25px;
}
@@ -613,7 +669,7 @@ td.tableCellWarningStatus_3 {background-color: #FEDA4D !important;}
td.tableCellWarningStatus_4 {background-color: #F0564D !important;}
td.dateCell {
- min-width: 85px;
+ width: 85px;
}
#emptyForecastSummariesTableInfo{
@@ -654,3 +710,28 @@ td.dateCell {
top: 2px;
}
+#mapAndForecastRow{
+ background-color: white;
+}
+
+
+
+table.messageTable tr, table.messageTable td
+{
+ background-color: white;
+ text-align:left;
+}
+
+#cropList
+{
+ top: 25px;
+ right: 25px;
+ padding: 0px 15px;
+}
+
+.favouriteToggle{
+ color: #008136;
+ cursor:pointer;
+}
+
+
diff --git a/VIPSWeb/static/images/logo_vips_new.png b/VIPSWeb/static/images/logo_vips_new.png
new file mode 100644
index 0000000000000000000000000000000000000000..7ac20433d49ef4d3134952ddda42d50bd2e43e1c
GIT binary patch
literal 6049
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
P1_lOCS3j3^P6<r_zv<PQ
literal 0
HcmV?d00001
diff --git a/VIPSWeb/static/js/frontpage.js b/VIPSWeb/static/js/frontpage.js
index 5568147d..1761a2af 100644
--- a/VIPSWeb/static/js/frontpage.js
+++ b/VIPSWeb/static/js/frontpage.js
@@ -65,7 +65,7 @@ function cacheMessages()
*/
function renderMessages()
{
- for(var i in settings.frontpageMessageTagIds)
+ /*for(var i in settings.frontpageMessageTagIds)
{
var tagId = settings.frontpageMessageTagIds[i];
document.getElementById("tbody_messageTag_" + tagId).innerHTML = "";
@@ -78,9 +78,26 @@ function renderMessages()
'<tr><td class="dateCell">' + tagMessage["datePub"] + '</td><td><a href="/messages/' + tagMessage["messageId"] + '">' + getMessageLocale(tagMessage, settings.currentLanguage,settings.languageCode)["heading"] + '</a></td></tr>';
}
+ }*/
+ var messagesLeftColTBody = document.getElementById("messagesLeftColTBody");
+ messagesLeftColTBody.innerHTML = "";
+
+ for(var i=0;i<Math.min(3,filteredMessages.length);i++) // Max 4 latest messages
+ {
+ var message = filteredMessages[i];
+
+ messagesLeftColTBody.innerHTML += '<tr>\n<td class="dateCell">' + message["datePub"] + '</td><td><a href="/messages/' + message["messageId"] + '">' + getMessageLocale(message, settings.currentLanguage,settings.languageCode)["heading"] + '</a></td>\n</tr>';
}
}
+/**
+ * TODO: implement this
+ */
+function renderObservationMessages()
+{
+
+}
+
/**
* 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
@@ -89,7 +106,7 @@ function filterMessages()
{
var selectedCropIds = getSelectedCropIds();
//console.log(selectedCropIds);
- filteredMessages = {};
+ filteredMessages = [];
for(var tagI in allMessages)
{
//console.log(allMessages[tagI]);
@@ -100,7 +117,8 @@ function filterMessages()
var messageCropOrganismIds = message["messageCropOrganismIds"];
if(messageCropOrganismIds.length == 0)
{
- filteredForTag.push(message);
+ //filteredForTag.push(message);
+ filteredMessages.push(message);
}
else
{
@@ -109,13 +127,14 @@ function filterMessages()
//console.log(messageCropOrganismIds[mCOI]);
if(selectedCropIds.indexOf(messageCropOrganismIds[mCOI]) >= 0)
{
- filteredForTag.push(message);
+ //filteredForTag.push(message);
+ filteredMessages.push(message);
break;
}
}
}
}
- filteredMessages[tagI] = filteredForTag;
+ //filteredMessages[tagI] = filteredForTag;
}
renderMessages();
}
@@ -189,8 +208,9 @@ function renderMyForecastConfigurationSummaries()
//console.log(myForecastConfigurationIds);
if(myForecastConfigurationIds.length == 0)
{
+ $(myForecastSummariesContainer).hide(1000);
myForecastSummariesTable.innerHTML = "";
- myForecastSummariesContainer.style.display = "none";
+ //myForecastSummariesContainer.style.display = "none";
return;
}
var myForecastConfigurations = [];
@@ -208,8 +228,9 @@ function renderMyForecastConfigurationSummaries()
if(myForecastConfigurations.length == 0)
{
+ $(myForecastSummariesContainer).hide(1000);
myForecastSummariesTable.innerHTML = "";
- myForecastSummariesContainer.style.display = "none";
+ //myForecastSummariesContainer.style.display = "none";
return;
}
@@ -217,11 +238,13 @@ function renderMyForecastConfigurationSummaries()
var mySummariesHTML = getforecastSummariesTableHTML(myForecastConfigurations,false, true);
myForecastSummariesTable.innerHTML = mySummariesHTML;
- document.getElementById("myForecastSummariesContainer").style.display = "block";
+ //document.getElementById("myForecastSummariesContainer").style.display = "block";
myForecastSummariesTable.style.display = "block";
+ $(myForecastSummariesContainer).show(1000);
}
+
/**
*
* @param forecastConfigurations
@@ -253,7 +276,8 @@ function getforecastSummariesTableHTML(forecastConfigurations, excludePoiName, i
summariesHTML.push((excludePoiName ? "" : ", ") + getLocalizedOrganismName(forecastConfiguration.cropOrganismId));
summariesHTML.push(", " + getLocalizedOrganismName(forecastConfiguration.pestOrganismId));
summariesHTML.push(", <a href='/forecasts/models/" + forecastConfiguration.modelId + "' target='new'>" + modelLocalNames[forecastConfiguration.modelId] + "</a>");
- summariesHTML.push(" <button type=\"button\" onclick='" + (isFavouritesList ? "removeFrom" : "addTo") + "MyForecastConfigurations(" + forecastConfiguration.forecastConfigurationId + ");'><img src='/static/css/icons/" + (isFavouritesList ? "remove_from" : "add_to") + "_favourites.png' alt='" + (isFavouritesList ? gettext("Remove from my favourites") : gettext("Add to my favourites")) + "'/></button>");
+ //summariesHTML.push(" <button type=\"button\" onclick='" + (isFavouritesList ? "removeFrom" : "addTo") + "MyForecastConfigurations(" + forecastConfiguration.forecastConfigurationId + ");'><img src='/static/css/icons/" + (isFavouritesList ? "remove_from" : "add_to") + "_favourites.png' alt='" + (isFavouritesList ? gettext("Remove from my favourites") : gettext("Add to my favourites")) + "'/></button>");
+ summariesHTML.push(" <span onclick='" + (isFavouritesList ? "removeFrom" : "addTo") + "MyForecastConfigurations(" + forecastConfiguration.forecastConfigurationId + ");' class=\"" + (isFavouritesList ? "fa fa-minus-circle favouriteToggle" : "fa fa-star favouriteToggle") + "\"></span>")
summariesHTML.push("</td></tr>");
// Get correct list of summaries
diff --git a/VIPSWeb/templates/index.html b/VIPSWeb/templates/index.html
index f2eb97f9..aa832560 100644
--- a/VIPSWeb/templates/index.html
+++ b/VIPSWeb/templates/index.html
@@ -21,7 +21,7 @@
*/
{% endcomment %}
-{% load i18n l10n staticfiles forecast_extras %}
+{% load i18n l10n staticfiles forecast_extras template_helper %}
{% block title%}{% trans "Welcome" %}{%endblock%}
{% block customCSS %}
<link rel="stylesheet" href="{% static "css/3rdparty/ol.css" %}" type="text/css">
@@ -59,13 +59,48 @@
{% endblock %}
{% block content %}
<div class="row">
- <!-- Start map container -->
<div class="col-md-8">
+ <h3>{% trans "Latest messages" %} <a href="/messages/" style="font-size: small;">({% trans "All messages" %})</a></h3>
+ <table class="table messageTable left">
+ <tbody id="messagesLeftColTBody"></tbody>
+ </table>
+ </div>
+ <div class="col-md-4" id="messageColRight" >
+ <h3>{% trans "Surveillance" %}</h3>
+ <table class="table messageTable right">
+ <tr>
+ <td>2015-06-22</td>
+ <td>Førstefunn av tørråte på Toten</td>
+ </tr>
+ <tr>
+ <td>2015-06-21</td>
+ <td>Eplevikler snek seg rundt på hyttetomt</td>
+ </tr>
+
+ </table>
+ </div>
+ </div>
+ <div class="row" id="mapAndForecastRow">
+ <!-- Start map container -->
+ <div class="col-md-8" id="mapContainer">
+ <!-- Placed on the map if wide screen, above it if narrow screen -->
+ <div id="cropList" class="mapBoxPlacement_{{settings.MAP_CROP_LIST_PLACEMENT}}">
+ <h3>{% trans "Crops" %}</h3>
+ <ul class="cropList single">
+ {% 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();filterMessages();"/>
+ <label for="cropIds_{{crop_group.crop_ids|slugify}}"><span></span>{{ crop_group.name }}</label>
+ </li>
+ {% endfor %}
+ </ul>
+ <div style="clear: both;"></div>
+ </div>
<div id="map" class="map" style="height: {{settings.MAP_HEIGHT}}px;">
<!-- Info window box -->
<div id="tooltip"></div>
<div id="popover"></div>
- <div id="warningLegend" class="warningLegendPlacement_{{settings.MAP_WARNING_LEGEND_PLACEMENT}}">
+ <div id="warningLegend" class="mapBoxPlacement_{{settings.MAP_WARNING_LEGEND_PLACEMENT}}">
<ul>
<li class="warning_4"><span>{% trans "High risk of infection" %}</span></li>
<li class="warning_3"><span>{% trans "Medium risk of infection" %}</span></li>
@@ -74,60 +109,29 @@
<li class="warning_0"><span>{% trans "No forecast available" %}</span></li>
</ul>
</div>
- </div>
+ </div>
</div><!-- End map container -->
- <div class="col-md-4">
- <div class="row">
- <div class="col-md-12">
- <h1>{% trans "Crops" %}</h1>
- <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();filterMessages();"/>
- <label for="cropIds_{{crop_group.crop_ids|slugify}}"><span></span>{{ crop_group.name }}</label>
- </li>
- {% endfor %}
- </ul>
- </div>
- </div>
- <div class="row">
+ <div class="col-md-4" id="frontPageRightCol" style="height: {{settings.MAP_HEIGHT}}px;">
+ <div class="row" id="myForecastSummariesContainer">
<div class="col-md-12 forecastSummaries">
- <h1>{% trans "Forecasts" %} (<span id="numberOfForecastSummaries">...</span>)</h1>
- <p id="forecastConfigurationSummarySortByForm">{% trans "Sort by" %}: <input type="radio" name="sortBy" value="weatherStationName" checked="checked" onclick="handleSortByClick();"> {% trans "Weather station" %} <input type="radio" name="sortBy" value="pestOrganismId" onclick="handleSortByClick();"> {% trans "Pest" %} <input type="radio" name="sortBy" value="modelId" onclick="handleSortByClick();"> {% trans "Model" %}</p>
- <!--p id="emptyForecastSummariesTableInfo">{% trans "Select crops or zoom in to see list of forecasts" %}</p-->
- <table class="table-responsive" id="forecastSummariesTable">
+ <h3 id="forecastsummariesHeading">{% trans "My forecasts" %}</h3>
+ <table class="table-responsive" id="myForecastSummariesTable">
</table>
</div>
</div>
- <div class="row" id="myForecastSummariesContainer">
+ <div class="row" id="forecastSummariesContainer">
<div class="col-md-12 forecastSummaries">
- <h1>{% trans "My forecasts" %}</h1>
- <table class="table-responsive" id="myForecastSummariesTable">
+ <h3 id="forecastSummariesHeading">{% trans "Forecasts" %} (<span id="numberOfForecastSummaries">...</span>)</h3>
+ <p id="forecastConfigurationSummarySortByForm">{% trans "Sort by" %}: <input type="radio" name="sortBy" value="weatherStationName" checked="checked" onclick="handleSortByClick();"> {% trans "Weather station" %} <input type="radio" name="sortBy" value="pestOrganismId" onclick="handleSortByClick();"> {% trans "Pest" %} <input type="radio" name="sortBy" value="modelId" onclick="handleSortByClick();"> {% trans "Model" %}</p>
+ <!--p id="emptyForecastSummariesTableInfo">{% trans "Select crops or zoom in to see list of forecasts" %}</p-->
+ <table class="table-responsive" id="forecastSummariesTable">
</table>
</div>
</div>
- <div class="row">
- <div class="col-md-12">
- <h1>{% trans "Messages" %}</h1>
- <table class="table table-hover table-condensed table-striped">
- {% for message_tag in message_tags %}
- <thead>
- <tr>
- <th colspan="2">{{message_tag.local_tag_name|default_if_none:message_tag.default_tag_name}}</th>
- </tr>
- </thead>
- <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>
- </div>
- </div>
</div>
</div><!-- End row with sidebar and contents container -->
+ <div class="row"> <!-- Start row with columns of links -->
+ {% generate_frontpage_menu %}
+
+ </div>
{% endblock %}
\ No newline at end of file
diff --git a/VIPSWeb/templatetags/template_helper.py b/VIPSWeb/templatetags/template_helper.py
index c6b6c7b1..5e8eb69a 100644
--- a/VIPSWeb/templatetags/template_helper.py
+++ b/VIPSWeb/templatetags/template_helper.py
@@ -75,6 +75,34 @@ def generate_main_menu(context):
return menu_html
+# Reads the variable local_settings.MAIN_MENU
+# Parses it, returns HTML
+@register.simple_tag(takes_context=True)
+def generate_frontpage_menu(context):
+ # Get the request object
+ try:
+ request = context['request']
+ except KeyError:
+ request = context['view'].request
+
+ if 12 % len(settings.FRONTPAGE_MENU) != 0:
+ return """
+ <div class="alert alert-danger">
+ ERROR IN MENU CONFIGURATION. 12 MUST BE DIVISABLE BY NUMBER OF COLUMNS
+ </div>
+ """
+
+ menu_html = ''
+ col_md = 12/len(settings.FRONTPAGE_MENU)
+ for col in settings.FRONTPAGE_MENU:
+ menu_html += '<div class="col-md-%s"><h3>%s</h3>' % (col_md,_(col["label"]))
+ menu_html += "<ul class='linkList'>"
+ for item in col["items"]:
+ menu_html += '<li><a href="%s">%s</a></li>' % (item["label"], item["label"])
+ menu_html += "</ul>"
+ menu_html += "</div>"
+ return menu_html
+
# Get the footer text in correct language
# REPLACED WITH THE MORE FLEXIBLE get_text_i18(text_dict) BELOW
"""
--
GitLab