From 9f012daefcf30b762ad0016bcae851598d53b4c7 Mon Sep 17 00:00:00 2001 From: Leonidas Poulopoulos Date: Fri, 25 Jan 2013 17:54:55 +0200 Subject: [PATCH] New layout and UI in place --- flowspec/views.py | 3 +- locale/el/LC_MESSAGES/django.mo | Bin 14950 -> 14596 bytes locale/el/LC_MESSAGES/django.po | 194 ++++++++++++++++++++++++-------------- static/css/base.css | 31 +++--- static/img/fod_logo_latest.png | Bin 0 -> 114635 bytes templates/apply.html | 2 +- templates/base.html | 25 ++++- templates/flatpages/default.html | 8 +- templates/footer.html | 3 +- templates/welcome.html | 35 +++---- 10 files changed, 191 insertions(+), 110 deletions(-) create mode 100644 static/img/fod_logo_latest.png diff --git a/flowspec/views.py b/flowspec/views.py index ff8f21a..2e68324 100644 --- a/flowspec/views.py +++ b/flowspec/views.py @@ -322,6 +322,7 @@ def user_login(request): except: user_exists = False user = authenticate(username=username, firstname=firstname, lastname=lastname, mail=mail, authsource='shibboleth') + if user is not None: try: peer = user.get_profile().peer @@ -345,7 +346,7 @@ def user_login(request): error = _("Something went wrong during user authentication. Contact your administrator") return render_to_response('error.html', {'error': error,}, context_instance=RequestContext(request)) - except Exception as e: + except User.DoesNotExist as e: error = _("Invalid login procedure. Error: %s" %e) return render_to_response('error.html', {'error': error,}, context_instance=RequestContext(request)) diff --git a/locale/el/LC_MESSAGES/django.mo b/locale/el/LC_MESSAGES/django.mo index f8255a7887844a3867b0e9be474030dab10b2667..e0bbd55f5b5f8f62229be9681ce7c2b9533e2404 100644 GIT binary patch delta 3198 zcmZA332YQq9LMpu6v|ObYg=itAOqztw55oYmP1ZkISVKPa+JEz1=_9Kl>$na0um7K zjqyN|DgqjgQrC(Hhw%V3VOB6=f@f@^q6r>|8ZC+6-_AgYFZu81&6{~|-u&O2X}=F{ z4url=Y5TOH)Dhi@&TWl3fUWKMp&aUDOa?Zgnm)!3coq}!3rxien1WaE224&cCJuX} zuJ4DPF&Eq6D5QVLjHl9#hM8E7D^MM6)D6#~I-JKe{1$uRWz55LMvcc}Ou`vhiHlL= zoyMLxl)GsnrKoY|V-oi_OQ|rH3E*I?Lp{+xOvdB520uY{Ea~D{iX_X-!;ZMfwZc6g zKuvrd4#Evca?C#W{2SPZ`jL9#7ZJLEU&hDpQMbB$nfL z+=&x$AhXwXRk#3aFbkvD8!ut#W-47-uwghHbI^xM)w8GpUPL|N9@GR5p;G>adwdj? z!S_*57)A9zkLuro%D|6qdny}6?cGzz|BY07(XbguU^O1WQXIlMXrK_XjAkopuRQIx zH)0Qt-*k`9p(gMR>cM_;+dHyxG{F?qI5#6nGTCY5UlS;DPn4q8coEXqEJK#vtV6P8 zwqhnehf}Z_SsmkH5Zxddm6`6Sak5Z1%*LCr07-(GjT*-rqM|3R$FcZ34#E7c#uVZb zRH}BMc6|eC!1wS9Mo~99o$l=N&rsK2MrGz7?1LG+!%J~A7Gnd>#n1&RTGMglm3y1p zajnOgg*c7l&zUx>Vfr#%E;R+%7fUf0Yf%&4>-rfgQ*nGuwAs>7nJGZ^pNRc&A<{o& z9-^|7hGx{7%x2n3X*p`302bjUoQcPADkihQTI+>43M;S~cjG=>(9@XJ*xqt7R)-pQ zI}XO@F-!0NNh&jF_!%{`BJ!+FR*nf|Vm)f++jwU*z)MKhO%o~;r(7?(=hJv>Em0O~ zqIsxIydE{-EjS&Y)G_xr-?}G$Mh*NYK8}ejoI37AWnvF%0*6tX>;(GoG+x3H%;p8m z?&pki3cuv|8@v~f@N`=HUIWu+jCHd;Tk|xgoWBVrsEI5>PMKO{`OR)*^~{H^Kj1AKcVy>j0%LN?KW~UxPJ`a}5Hbf7 zM!gO1BKygl!;yFycVTXx^Ll-XNgV%%%9v-UV;btl{ZSJwLG^zWHGz|O2wOu`mQp#8 z@9g5_Vb1qp8fw5}s19dP6OHGfPa7tM%Fu*cjhTe=u`M>>9k?5(;;*;`M~@&Y_yInQ zqY9j*2%V&&l$}FX!i*+55_1Xd?s$UzbFGwKt2q{r@{z$+13G>~FJ# zpoENf+jcH%yw9dRe2ER82rIyuBrtZEuDh{z<^W3eUB{!!7lWH?bp zJV-1gw6uCNMzQ~5-}$w8wPa9PMX=XQ;A$f-Anqb&yKNIuZ-)xo$oPrw1WSIctfZ!o zS~by=C?ZrWVmcAZ=4T9{QtlA@IH;QM9?x^_fo$~H{|d>NN~|Mh68h_=SBm`=+lX_p zhPaK;8xNGgXYsQra zeXGlYUhB>pZy@69lTiI%-LT5lhWZi;TU4@VYf?r1Zmfrhv2qgJ#&x{X%O z+0EE&*%8{Cs5TZ^_Uo$Kui5)!U7IcSr<2`mAB{eu1EMMNcaMAG)1I=A+XwA8IYk#^ zH!$qR@T@-blV7K)k?XGZj`Zrg-V<)=krw%--xHpc9LwGn-D2;z-?5L_P0lk9$ZntA zzfB=tj%l9o@i<>p8#4Zsgp?$Sb+u#mBvDzZKbf>sOxe#e&Jcli2wiq delta 3390 zcmZwId2AGA7{~Fq6pI$2r66_z=};*Zp+KROLqw3Gtxzh5V!>O zQmN>QM--KSN0lOFt%wDQ8jl#A)o5Zof+imEKt)YdGz7oD*{R_V-{k4%op)#6<9Xki zwuHZp#*XFm++irIh#|!BbYpho;a>cqlxG@~ixsG*W!N8Y#T>i?`{BLFqh>drjZfpb zxF65LBiILDM-P60K4W6$M=E--s&{IDg{TLX;sEsGFl@#Qdh~$wi}6hvmH9Z=z2Py}Jy=Qmvv?Q&g*Rdg%h80s z!ln2fUWjF^;(V;bp|}<&;Nv(3KSX7w2m7Vxdt*#1%BG^34ML^Za<2XI0kSTwqiN{iq$xkcXTn{kGJD-)Ic?)Ra+ZChB6^snP$vJ z)Y*!iW*KDNR5Jascr$9o+g)ElrRq59kexzhW*8p}#xO-#h*zMV58_UI47C;0n7uMO z7uC;Fyaem3#C%wVn^6<` z7+It_jlEg1hkR?o1^KDxr{h4q|CLk<_@T!2PWOiWr~!}STznUG7(I-p3FqTHEOM_` zyKY8y(cFjkU>oYWDeRvza5>tz5PxTUlh5d%;J^{72T$PVT=!xbHTX4_V#P(N_kS(c zas35ekL4p%6MYi3l?PBMf5Y`7_xG>xY}!wtGI0`Ps^stz%TcJ6mEjt!LS^7RREM7; zW18KKl^Fp&T5od>iVyJ-7fn-1eShjG4vtVB`fcH;p0x8aPS=_n2*{ zQ{RPbm-)=~6qazE#|hH}79j`UtU=yfvjcUy+mPd8j^Y$NhPyF$T3!SxVh-`O!=UW}6VF0m!;1l2!eV90N&j0TUyq)Mn zloQtyGYHO@i4bFnYNESTQkhQh`7jotZ^a7Y7J}pE9Q4_8%>kd^s_{pB z;Xq?F5DLa0&3d!I=M7r*q1r&uYKjDcwN|vwZ`B8a%dJq*sfPo#bYM#cH4w1^kw}x@)cM1H6K;yn@+|K&zNmOy(S%~F zxMb?YiHR=H9chUbgCFjZxN+!`jJQ4gy6TSPCi{@xnOv7_O>RiG*qxT$Wj}8x?4wq4 zGp%>qM^x2M2kj%4-NE%ih9lyj~&KR9MaEOL>jYMZHJVY-osj;>($P3)M!9LtQc!#AH`xTzrn|N!)_Oy8M z$V(GXUG#HC;?=QVW+a{}{p^3XWBa6NeD&lxF?$dFoSA!#l-y|XXB{)pqBKQDOKxMa z&SW&6Wgp;%cIJK1ewoWu9%!}qau=)LrA)_AO7 z>}*ClWOq0z(`uCVjdb14WDcgfOU){|mS>MLNSD3O=~T_@4a\n" "Language-Team: LANGUAGE \n" @@ -26,33 +26,33 @@ msgstr "Ελληνικά" msgid "English" msgstr "Αγγλικά" -#: accounts/views.py:22 +#: accounts/views.py:74 #, python-format msgid "%sUser account activated" msgstr "%s Ενεργοποιήθηκε ο λογαριασμός του χρήστη" -#: flowspec/forms.py:60 flowspec/forms.py:89 +#: flowspec/forms.py:64 flowspec/forms.py:93 msgid "Invalid network address format" msgstr "Λανθασμένη μορφή διεύθυνσης δικτύου στο πεδίο Πηγή" -#: flowspec/forms.py:62 +#: flowspec/forms.py:66 msgid "Private addresses not allowed" msgstr "Δεν επιτρέπονται οι private διευθύνσεις" -#: flowspec/forms.py:64 flowspec/forms.py:93 +#: flowspec/forms.py:68 flowspec/forms.py:97 msgid "You have no authority on this subnet" msgstr "Δεν έχετε δικαιώματα σε αυτό το υποδίκτυο" -#: flowspec/forms.py:85 +#: flowspec/forms.py:89 #, python-format msgid "Currently no prefix lengths < %s are allowed" msgstr "Προς το παρόν δεν επιτρέπονται υποδίκτυα <%s" -#: flowspec/forms.py:107 +#: flowspec/forms.py:111 msgid "Errors in form. Please review and fix them" msgstr "Σφάλματα στη φόρμα. Παρακαλώ διορθώστε τα" -#: flowspec/forms.py:134 +#: flowspec/forms.py:138 msgid "" "Destination address/network should belong to your administrative address " "space. Check My Profile to review your networks" @@ -60,7 +60,7 @@ msgstr "" "Η διεύθυνση προορισμού πρέπει να ανήκει στα διαχειριστικά σας δίκτυα. " "Επισκεφθείτε 'Το Προφίλ μου' για την προβολή των διαχειριστικών σας δικτύων" -#: flowspec/forms.py:136 +#: flowspec/forms.py:140 msgid "" "Cannot create rule for source ports and ports at the same time. Select " "either ports or source ports" @@ -68,7 +68,7 @@ msgstr "" "Δεν μπορεί να δημιουργηθεί φίλτρο για source ports και ports ταυτόχρονα. " "Επιλέξτε είτε ports είτε source ports" -#: flowspec/forms.py:138 +#: flowspec/forms.py:142 msgid "" "Cannot create rule for destination ports and ports at the same time. Select " "either ports or destination ports" @@ -76,7 +76,7 @@ msgstr "" "Δεν μπορεί να δημιουργηθεί φίλτρο για destination ports και ports " "ταυτόχρονα. Επιλέξτε είτε ports είτε destination ports" -#: flowspec/forms.py:140 +#: flowspec/forms.py:144 msgid "" "Once source port is matched, source has to be filled as well. Either " "deselect source port or fill source address" @@ -85,7 +85,7 @@ msgstr "" "Είτε απο-επιλέξτε το πεδίο source port είτε συμπληρώστε μια διεύθυνση στο " "source" -#: flowspec/forms.py:142 +#: flowspec/forms.py:146 msgid "" "Once destination port is matched, destination has to be filled as well. " "Either deselect destination port or fill destination address" @@ -94,32 +94,32 @@ msgstr "" "συμπληρωθεί. Είτε απο-επιλέξτε το πεδίο destination port είτε συμπληρώστε " "μια διεύθυνση στο destination" -#: flowspec/forms.py:144 +#: flowspec/forms.py:148 msgid "Fill at least a Rule Match Condition" msgstr "Συμπληρώστε τουλάχιστον έναν όρο ταύτισης" -#: flowspec/forms.py:146 +#: flowspec/forms.py:150 #, python-format msgid "This action \"%s\" is not permitted" msgstr "Η ενέργεια %s δεν επιτρέπεται" -#: flowspec/forms.py:198 +#: flowspec/forms.py:202 msgid "Rate-limiting cannot be < 50kbps" msgstr "" -#: flowspec/forms.py:201 +#: flowspec/forms.py:205 msgid "Rate-limiting should be an integer < 50" msgstr "" -#: flowspec/forms.py:203 flowspec/forms.py:227 +#: flowspec/forms.py:207 flowspec/forms.py:231 msgid "Cannot be empty" msgstr "Το πεδίο δεν μπορεί να είναι κενό" -#: flowspec/forms.py:208 +#: flowspec/forms.py:212 msgid "Cannot select something other than rate-limit" msgstr "" -#: flowspec/forms.py:225 +#: flowspec/forms.py:229 msgid "Port should be an integer" msgstr "Η port θα πρέπει να είναι ένας ακέραιος αριθμός" @@ -205,21 +205,13 @@ msgstr "Μη επαρκή δικαιώματα για την επεξεργασ msgid "Cannot edit a pending rule: %s." msgstr "Δεν είναι δυνατή η επεξεργασία ενός φίλτρου (%s) σε κατάσταση pending " -#: flowspec/views.py:304 +#: flowspec/views.py:305 msgid "" "Your idP should release the HTTP_EPPN attribute towards this service
" msgstr "" "Ο idP σας θα πρέπει να παρέχει την HTTP_EPPN παράμετερο στην υπηρεσία
" -#: flowspec/views.py:306 -msgid "" -"Your idP should release the HTTP_SHIB_HOMEORGANIZATION attribute towards " -"this service
" -msgstr "" -"Ο idP σας θα πρέπει να παρέχει την HTTP_SHIB_HOMEORGANIZATION παράμετερο " -"στην υπηρεσία
" - -#: flowspec/views.py:308 +#: flowspec/views.py:309 msgid "" "Your idP should release an appropriate HTTP_SHIB_EP_ENTITLEMENT attribute " "towards this service
" @@ -227,7 +219,7 @@ msgstr "" "Ο idP σας θα πρέπει να παρέχει την HTTP_SHIB_EP_ENTITLEMENT παράμετερο στην " "υπηρεσία
" -#: flowspec/views.py:310 +#: flowspec/views.py:311 msgid "" "Your idP should release the HTTP_SHIB_INETORGPERSON_MAIL attribute towards " "this service" @@ -235,15 +227,7 @@ msgstr "" "Ο idP σας θα πρέπει να παρέχει την HTTP_SHIB_INETORGPERSON_MAIL παράμετερο " "στην υπηρεσία
" -#: flowspec/views.py:329 -msgid "" -"Your organization's domain name does not match our peers' domain " -"names
Please contact Helpdesk to resolve this issue" -msgstr "" -"Το domain name του οργανισμού σας δε βρέθηκε στη βάση φορέων μας." -"
Παρακαλώ επικοινωνήστε με το Helpdesk για τη διευθέτηση του προβλήματος" - -#: flowspec/views.py:337 +#: flowspec/views.py:342 flowspec/views.py:431 #, python-format msgid "" "User account %s is pending activation. Administrators have " @@ -257,16 +241,23 @@ msgstr "" "ενεργοποιηθεί για μεγάλο χρονικό διάστημα, επικοινωνήστε με τον τεχνικό σας " "υπέυθυνο ή το Helpdesk του ΕΔΕΤ." -#: flowspec/views.py:341 +#: flowspec/views.py:346 msgid "" "Something went wrong during user authentication. Contact your administrator" msgstr "" "Παρουσιάστηκε ένα σφάλμα κατά την είσοδο του χρήστη. Επικοινωνήστε με το " "διαχειριστή σας" -#: flowspec/views.py:345 -msgid "Invalid login procedure" -msgstr "Εσφαλμένη διαδικασία εισόδου" +#: flowspec/views.py:350 +#, python-format +msgid "Invalid login procedure. Error: %s" +msgstr "Εσφαλμένη διαδικασία εισόδου. Σφάλμα: %s" + +#: flowspec/views.py:421 +msgid "" +"Violation warning: User account is already associated with an institution." +"The event has been logged and our administrators will be notified about it" +msgstr "" #: monkey_patch/forms.py:11 #, python-format @@ -359,7 +350,7 @@ msgid "" "the parameter selection above. Feel free to include any additional comments." msgstr "" -#: templates/apply.html:398 +#: templates/apply.html:398 templates/registration/select_institution.html:37 msgid "Apply" msgstr "Εφαρμογή" @@ -367,24 +358,24 @@ msgstr "Εφαρμογή" msgid "Add new port" msgstr "Νέα port" -#: templates/base.html:44 templates/welcome.html:8 +#: templates/base.html:59 templates/base.html.py:158 msgid "Welcome" msgstr "Καλωσήρθατε" -#: templates/base.html:58 templates/base.html.py:87 templates/profile.html:4 +#: templates/base.html:73 templates/base.html.py:102 templates/profile.html:4 #: templates/profile.html.py:5 templates/profile.html:7 msgid "My profile" msgstr "Το προφίλ μου" -#: templates/base.html:60 templates/base.html.py:91 +#: templates/base.html:75 templates/base.html.py:106 msgid "Admin" msgstr "Διαχειριστής" -#: templates/base.html:62 templates/base.html.py:121 +#: templates/base.html:77 templates/base.html.py:136 msgid "Logout" msgstr "Έξοδος" -#: templates/base.html:65 templates/base.html.py:129 +#: templates/base.html:80 templates/base.html.py:144 msgid "" "After clicking Retry Login, it is strongly suggested to close your browser " "and visit the page again" @@ -392,20 +383,20 @@ msgstr "" "Αφού επιλέξετε Επανάληψη Εισόδου κλείστε τον browser σας και επισκεφθείτε " "ξανά τη σελίδα" -#: templates/base.html:65 templates/base.html.py:129 +#: templates/base.html:80 templates/base.html.py:144 msgid "Retry Login" msgstr "Επανάληψη Εισόδου" -#: templates/base.html:67 templates/base.html.py:126 templates/base.html:132 +#: templates/base.html:82 templates/base.html.py:141 templates/base.html:147 #: templates/welcome.html:21 msgid "Shibboleth Login" msgstr "Είσοδος με Shibboleth" -#: templates/base.html:100 +#: templates/base.html:115 msgid "Language" msgstr "Γλώσσα" -#: templates/base.html:142 templates/user_routes.html:214 +#: templates/base.html:158 templates/user_routes.html:214 #: templates/user_routes.html.py:220 msgid "My rules" msgstr "Τα φίλτρα μου" @@ -432,7 +423,7 @@ msgstr "Απαιτούμενα Shibboleth attributes " msgid "Optional" msgstr "Προεραιτικά" -#: templates/footer.html:6 +#: templates/footer.html:7 msgid "" "If you have any questions or need help, contact GRNET Helpdesk at helpdesk@grnet.gr or 800-11-47638." @@ -441,15 +432,15 @@ msgstr "" "ΕΔΕΤ στο helpdesk@grnet.gr ή " "τηλεφωνικά στο 800-11-47638." -#: templates/footer.html:8 +#: templates/footer.html:9 msgid "GRNET" msgstr "ΕΔΕΤ" -#: templates/footer.html:8 +#: templates/footer.html:9 msgid "Info" msgstr "Πληροφορίες" -#: templates/footer.html:8 +#: templates/footer.html:9 templates/welcome.html:14 msgid "Service Terms" msgstr "Όροι Χρήσης" @@ -611,30 +602,41 @@ msgstr "Είστε βέβαιοι ότι επιθυμείτε να συνεχί msgid "Login" msgstr "Είσοδος" -#: templates/welcome.html:10 +#: templates/welcome.html:9 msgid "Welcome to GRNET's FoD service." msgstr "Καλωσήρθατε στην υπηρεσία FoD του ΕΔΕΤ." -#: templates/welcome.html:11 -msgid "" -"If you are new to the service, take some time to read the service description" -msgstr "" -"Εάν χρησιμοποιείτε την υπηρεσία για πρώτη φορά, αφιερώστε λίγο χρόνο στην " -"ανάγνωση της περιγραφής της υπηρεσίας" +#: templates/welcome.html:12 +msgid "What" +msgstr "Τι" + +#: templates/welcome.html:13 +msgid "If you are new to the service, take some time to read the" +msgstr "Εάν χρησιμοποιείτε την υπηρεσία για πρώτη φορά, δείτε την" -#: templates/welcome.html:11 -msgid "here" -msgstr "εδώ" +#: templates/welcome.html:13 +msgid "Service Description" +msgstr "Περιγραφή της Υπηρεσίας" -#: templates/welcome.html:12 -msgid "" -"If you have properly set your Shibboleth attributes, you can login using the " -"link on the right" +#: templates/welcome.html:14 +msgid "Before asking why? take some time to look at the" +msgstr "Πριν ρωτήσετε γιατί; διαβάστε την ενότητα" + +#: templates/welcome.html:16 +msgid "How" +msgstr "Πως" + +#: templates/welcome.html:17 +msgid "If you have properly set your Shibboleth attributes, you may proceed" msgstr "" "Έαν έχετε ορίσει ορθά τις απαιτούμενες παραμέτρους του Shibboleth, μπορείτε " -"να εισέλθετε επιλέγοντας το σύνδεσμο στα δεξιά" +"να συνεχίσετε" -#: templates/welcome.html:13 +#: templates/welcome.html:26 +msgid "Help" +msgstr "Βοήθεια" + +#: templates/welcome.html:27 msgid "" "For troubleshooting info and remarks do not hesitate to contact GRNET's " "Helpdesk." @@ -661,11 +663,57 @@ msgstr "ενεργοποιήθηκε επιτυχώς" msgid "The user has probably been already activated." msgstr "Ο χρήστης έχει ήδη ενεργοποιηθεί" +#: templates/registration/activate_edit.html:14 +msgid "Activate User" +msgstr "Ενεργοποίηση Χρήστη" + +#: templates/registration/activate_edit.html:25 +msgid "User" +msgstr "" + +#: templates/registration/activate_edit.html:33 +#: templates/registration/select_institution.html:25 +msgid "Institution" +msgstr "" + +#: templates/registration/activate_edit.html:44 +msgid "Activate" +msgstr "Ενεργοποίηση" + #: templates/registration/activation_complete.html:8 #: templates/registration/activation_complete.html:23 msgid "The user will be notified about his/her account activation" msgstr "Ο χρήστης θα ενημερωθεί για την ενεργοποίηση του λογαριασμού" +#: templates/registration/select_institution.html:14 +msgid "Select your institution" +msgstr "" + +#~ msgid "" +#~ "If you are new to the service, take some time to read the service " +#~ "description" +#~ msgstr "" +#~ "Εάν χρησιμοποιείτε την υπηρεσία για πρώτη φορά, αφιερώστε λίγο χρόνο στην " +#~ "ανάγνωση της περιγραφής της υπηρεσίας" + +#~ msgid "here" +#~ msgstr "εδώ" + +#~ msgid "" +#~ "Your idP should release the HTTP_SHIB_HOMEORGANIZATION attribute towards " +#~ "this service
" +#~ msgstr "" +#~ "Ο idP σας θα πρέπει να παρέχει την HTTP_SHIB_HOMEORGANIZATION παράμετερο " +#~ "στην υπηρεσία
" + +#~ msgid "" +#~ "Your organization's domain name does not match our peers' domain " +#~ "names
Please contact Helpdesk to resolve this issue" +#~ msgstr "" +#~ "Το domain name του οργανισμού σας δε βρέθηκε στη βάση φορέων μας." +#~ "
Παρακαλώ επικοινωνήστε με το Helpdesk για τη διευθέτηση του " +#~ "προβλήματος" + #~ msgid "Intro" #~ msgstr "Εισαγωγή" diff --git a/static/css/base.css b/static/css/base.css index 1c751ca..4b5497e 100644 --- a/static/css/base.css +++ b/static/css/base.css @@ -1,13 +1,17 @@ body { font-size: 13px; - background-image: url("/fodstatic/img/bg2.gif"); - background-attachment: fixed; - background-color: #131516; - background-position: left 40px; - background-repeat: repeat; + /*background-image: url("/fodstatic/img/bg2.gif");*/ + padding-bottom: 10px; } +.footer { + background-color: #F5F5F5; + border-top: 1px solid #E5E5E5; + margin-top: 30px; + padding: 30px 0; + text-align: center; +} .navbar .brand { max-height: 40px; overflow: visible; @@ -17,10 +21,11 @@ body { label, input, button, select, textarea { font-size: 13px; } -legend { - font-size: 14px; - line-height: 20px; +legend { + font-size: 13px; + font-weight: bold; + line-height: 20px; margin-bottom: 0; } .form-horizontal .control-group { @@ -45,10 +50,10 @@ hr { #footcontainer{ text-align: center; - background-color: white; + /*background-color: white;*/ margin-top: 5px; - padding: 5px 10px 0 10px; - border: 1px solid grey; + /*padding: 5px 10px 0 10px;*/ + /*border: 1px solid grey;*/ } select, textarea, input[type="text"], input[type="password"], input[type="datetime"], input[type="datetime-local"], input[type="date"], input[type="month"], input[type="time"], input[type="week"], input[type="number"], input[type="email"], input[type="url"], input[type="search"], input[type="tel"], input[type="color"], .uneditable-input { @@ -68,11 +73,11 @@ select, textarea, input[type="text"], input[type="password"], input[type="dateti text-shadow: 0 1px 0 #FFFFFF; } -#content.container{ +/*#content.container{ border: 1px solid grey; padding: 90px 10px 10px; background: white;" -} +}*/ #routes_table{ font-size: 12px; } diff --git a/static/img/fod_logo_latest.png b/static/img/fod_logo_latest.png new file mode 100644 index 0000000000000000000000000000000000000000..b6b9f7824d845cce3e6baacc894121a24168d041 GIT binary patch literal 114635 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 D-1pbw literal 0 HcmV?d00001 diff --git a/templates/apply.html b/templates/apply.html index 9cefdf0..5ace1c1 100644 --- a/templates/apply.html +++ b/templates/apply.html @@ -395,7 +395,7 @@
- +
diff --git a/templates/base.html b/templates/base.html index b36c3f6..bb0f83a 100644 --- a/templates/base.html +++ b/templates/base.html @@ -9,6 +9,7 @@ + @@ -23,6 +24,20 @@ } + {% block extrahead %}{% endblock %} @@ -79,7 +94,7 @@
{% block topmenu %} - +
    {% if user.is_authenticated %} @@ -137,11 +152,13 @@
+ {% block contentplaceholder %}
{% block brcrmb_container %} -
    {% if user.is_authenticated %}
  • {% trans "My rules" %}
    • {% endif %} + + {% endblock %} {% if messages %}
    {% for message in messages %} @@ -149,11 +166,13 @@ {% endfor %}
    {% endif %} - {% endblock %} + + {% block content %} {% endblock %}
+ {% endblock %} {% block footerblock %} {% include "footer.html" %} {% endblock %} diff --git a/templates/flatpages/default.html b/templates/flatpages/default.html index de7f883..d529df6 100644 --- a/templates/flatpages/default.html +++ b/templates/flatpages/default.html @@ -2,8 +2,12 @@ {% load i18n %} {% block title %}{{ flatpage.title }}{% endblock %} - {% block breadcrumbs %}:: {% trans flatpage.title %}{% endblock %} - + {% block breadcrumbs %} +
  • / + + {% trans flatpage.title %} +
    • +{% endblock %} {% block extrahead %} diff --git a/templates/footer.html b/templates/footer.html index d9964fd..3c9f6b9 100644 --- a/templates/footer.html +++ b/templates/footer.html @@ -2,10 +2,11 @@ \ No newline at end of file diff --git a/templates/welcome.html b/templates/welcome.html index 7a51606..95298fc 100644 --- a/templates/welcome.html +++ b/templates/welcome.html @@ -2,27 +2,30 @@ {% load i18n %} {% block title %}{% trans "Login" %}{% endblock %} {% block brcrmb_container %}{% endblock %} -{% block content %} -
    -
    -

    {% trans "Welcome" %}

    -
    -

    {% blocktrans %}Welcome to GRNET's FoD service.{% endblocktrans %}

    -

    {% blocktrans %}If you are new to the service, take some time to read the service description{% endblocktrans %} {% trans "here" %}.

    -

    {% blocktrans %}If you have properly set your Shibboleth attributes, you can login using the link on the right{% endblocktrans %}

    -

    {% blocktrans %}For troubleshooting info and remarks do not hesitate to contact GRNET's Helpdesk.{% endblocktrans %}

    -
    - -
    - -
    + {% block contentplaceholder %} +
    +

    GRNET - Firewall on Demand

    +

    +

    {% blocktrans %}Welcome to GRNET's FoD service.{% endblocktrans %}

    +
    +
    +

    {% trans "What" %}?

    +

    {% blocktrans %}If you are new to the service, take some time to read the{% endblocktrans %} {% trans "Service Description" %}

    +

    {% blocktrans %}Before asking why? take some time to look at the{% endblocktrans %} {% trans "Service Terms" %}

    +
    +

    {% trans "How" %}?

    +

    {% blocktrans %}If you have properly set your Shibboleth attributes, you may proceed{% endblocktrans %}

    + -
    +
    +

    {% trans "Help" %}?

    + {% blocktrans %}For troubleshooting info and remarks do not hesitate to contact GRNET's Helpdesk.{% endblocktrans %}
    -{% endblock %} +
    + {% endblock %} \ No newline at end of file -- 1.7.10.4