Revision 9f012dae
b/flowspec/views.py | ||
---|---|---|
322 | 322 |
except: |
323 | 323 |
user_exists = False |
324 | 324 |
user = authenticate(username=username, firstname=firstname, lastname=lastname, mail=mail, authsource='shibboleth') |
325 |
|
|
325 | 326 |
if user is not None: |
326 | 327 |
try: |
327 | 328 |
peer = user.get_profile().peer |
... | ... | |
345 | 346 |
error = _("Something went wrong during user authentication. Contact your administrator") |
346 | 347 |
return render_to_response('error.html', {'error': error,}, |
347 | 348 |
context_instance=RequestContext(request)) |
348 |
except Exception as e:
|
|
349 |
except User.DoesNotExist as e:
|
|
349 | 350 |
error = _("Invalid login procedure. Error: %s" %e) |
350 | 351 |
return render_to_response('error.html', {'error': error,}, |
351 | 352 |
context_instance=RequestContext(request)) |
b/locale/el/LC_MESSAGES/django.po | ||
---|---|---|
8 | 8 |
msgstr "" |
9 | 9 |
"Project-Id-Version: PACKAGE VERSION\n" |
10 | 10 |
"Report-Msgid-Bugs-To: \n" |
11 |
"POT-Creation-Date: 2012-10-31 14:55+0200\n"
|
|
11 |
"POT-Creation-Date: 2013-01-25 17:53+0200\n"
|
|
12 | 12 |
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" |
13 | 13 |
"Last-Translator: Leonidas Poulopoulos <leopoul@grnet.gr>\n" |
14 | 14 |
"Language-Team: LANGUAGE <LL@li.org>\n" |
... | ... | |
26 | 26 |
msgid "English" |
27 | 27 |
msgstr "Αγγλικά" |
28 | 28 |
|
29 |
#: accounts/views.py:22
|
|
29 |
#: accounts/views.py:74
|
|
30 | 30 |
#, python-format |
31 | 31 |
msgid "%sUser account activated" |
32 | 32 |
msgstr "%s Ενεργοποιήθηκε ο λογαριασμός του χρήστη" |
33 | 33 |
|
34 |
#: flowspec/forms.py:60 flowspec/forms.py:89
|
|
34 |
#: flowspec/forms.py:64 flowspec/forms.py:93
|
|
35 | 35 |
msgid "Invalid network address format" |
36 | 36 |
msgstr "Λανθασμένη μορφή διεύθυνσης δικτύου στο πεδίο Πηγή" |
37 | 37 |
|
38 |
#: flowspec/forms.py:62
|
|
38 |
#: flowspec/forms.py:66
|
|
39 | 39 |
msgid "Private addresses not allowed" |
40 | 40 |
msgstr "Δεν επιτρέπονται οι private διευθύνσεις" |
41 | 41 |
|
42 |
#: flowspec/forms.py:64 flowspec/forms.py:93
|
|
42 |
#: flowspec/forms.py:68 flowspec/forms.py:97
|
|
43 | 43 |
msgid "You have no authority on this subnet" |
44 | 44 |
msgstr "Δεν έχετε δικαιώματα σε αυτό το υποδίκτυο" |
45 | 45 |
|
46 |
#: flowspec/forms.py:85
|
|
46 |
#: flowspec/forms.py:89
|
|
47 | 47 |
#, python-format |
48 | 48 |
msgid "Currently no prefix lengths < %s are allowed" |
49 | 49 |
msgstr "Προς το παρόν δεν επιτρέπονται υποδίκτυα <%s" |
50 | 50 |
|
51 |
#: flowspec/forms.py:107
|
|
51 |
#: flowspec/forms.py:111
|
|
52 | 52 |
msgid "Errors in form. Please review and fix them" |
53 | 53 |
msgstr "Σφάλματα στη φόρμα. Παρακαλώ διορθώστε τα" |
54 | 54 |
|
55 |
#: flowspec/forms.py:134
|
|
55 |
#: flowspec/forms.py:138
|
|
56 | 56 |
msgid "" |
57 | 57 |
"Destination address/network should belong to your administrative address " |
58 | 58 |
"space. Check My Profile to review your networks" |
... | ... | |
60 | 60 |
"Η διεύθυνση προορισμού πρέπει να ανήκει στα διαχειριστικά σας δίκτυα. " |
61 | 61 |
"Επισκεφθείτε 'Το Προφίλ μου' για την προβολή των διαχειριστικών σας δικτύων" |
62 | 62 |
|
63 |
#: flowspec/forms.py:136
|
|
63 |
#: flowspec/forms.py:140
|
|
64 | 64 |
msgid "" |
65 | 65 |
"Cannot create rule for source ports and ports at the same time. Select " |
66 | 66 |
"either ports or source ports" |
... | ... | |
68 | 68 |
"Δεν μπορεί να δημιουργηθεί φίλτρο για source ports και ports ταυτόχρονα. " |
69 | 69 |
"Επιλέξτε είτε ports είτε source ports" |
70 | 70 |
|
71 |
#: flowspec/forms.py:138
|
|
71 |
#: flowspec/forms.py:142
|
|
72 | 72 |
msgid "" |
73 | 73 |
"Cannot create rule for destination ports and ports at the same time. Select " |
74 | 74 |
"either ports or destination ports" |
... | ... | |
76 | 76 |
"Δεν μπορεί να δημιουργηθεί φίλτρο για destination ports και ports " |
77 | 77 |
"ταυτόχρονα. Επιλέξτε είτε ports είτε destination ports" |
78 | 78 |
|
79 |
#: flowspec/forms.py:140
|
|
79 |
#: flowspec/forms.py:144
|
|
80 | 80 |
msgid "" |
81 | 81 |
"Once source port is matched, source has to be filled as well. Either " |
82 | 82 |
"deselect source port or fill source address" |
... | ... | |
85 | 85 |
"Είτε απο-επιλέξτε το πεδίο source port είτε συμπληρώστε μια διεύθυνση στο " |
86 | 86 |
"source" |
87 | 87 |
|
88 |
#: flowspec/forms.py:142
|
|
88 |
#: flowspec/forms.py:146
|
|
89 | 89 |
msgid "" |
90 | 90 |
"Once destination port is matched, destination has to be filled as well. " |
91 | 91 |
"Either deselect destination port or fill destination address" |
... | ... | |
94 | 94 |
"συμπληρωθεί. Είτε απο-επιλέξτε το πεδίο destination port είτε συμπληρώστε " |
95 | 95 |
"μια διεύθυνση στο destination" |
96 | 96 |
|
97 |
#: flowspec/forms.py:144
|
|
97 |
#: flowspec/forms.py:148
|
|
98 | 98 |
msgid "Fill at least a Rule Match Condition" |
99 | 99 |
msgstr "Συμπληρώστε τουλάχιστον έναν όρο ταύτισης" |
100 | 100 |
|
101 |
#: flowspec/forms.py:146
|
|
101 |
#: flowspec/forms.py:150
|
|
102 | 102 |
#, python-format |
103 | 103 |
msgid "This action \"%s\" is not permitted" |
104 | 104 |
msgstr "Η ενέργεια %s δεν επιτρέπεται" |
105 | 105 |
|
106 |
#: flowspec/forms.py:198
|
|
106 |
#: flowspec/forms.py:202
|
|
107 | 107 |
msgid "Rate-limiting cannot be < 50kbps" |
108 | 108 |
msgstr "" |
109 | 109 |
|
110 |
#: flowspec/forms.py:201
|
|
110 |
#: flowspec/forms.py:205
|
|
111 | 111 |
msgid "Rate-limiting should be an integer < 50" |
112 | 112 |
msgstr "" |
113 | 113 |
|
114 |
#: flowspec/forms.py:203 flowspec/forms.py:227
|
|
114 |
#: flowspec/forms.py:207 flowspec/forms.py:231
|
|
115 | 115 |
msgid "Cannot be empty" |
116 | 116 |
msgstr "Το πεδίο δεν μπορεί να είναι κενό" |
117 | 117 |
|
118 |
#: flowspec/forms.py:208
|
|
118 |
#: flowspec/forms.py:212
|
|
119 | 119 |
msgid "Cannot select something other than rate-limit" |
120 | 120 |
msgstr "" |
121 | 121 |
|
122 |
#: flowspec/forms.py:225
|
|
122 |
#: flowspec/forms.py:229
|
|
123 | 123 |
msgid "Port should be an integer" |
124 | 124 |
msgstr "Η port θα πρέπει να είναι ένας ακέραιος αριθμός" |
125 | 125 |
|
... | ... | |
205 | 205 |
msgid "Cannot edit a pending rule: %s." |
206 | 206 |
msgstr "Δεν είναι δυνατή η επεξεργασία ενός φίλτρου (%s) σε κατάσταση pending " |
207 | 207 |
|
208 |
#: flowspec/views.py:304
|
|
208 |
#: flowspec/views.py:305
|
|
209 | 209 |
msgid "" |
210 | 210 |
"Your idP should release the HTTP_EPPN attribute towards this service<br>" |
211 | 211 |
msgstr "" |
212 | 212 |
"Ο idP σας θα πρέπει να παρέχει την HTTP_EPPN παράμετερο στην υπηρεσία<br>" |
213 | 213 |
|
214 |
#: flowspec/views.py:306 |
|
215 |
msgid "" |
|
216 |
"Your idP should release the HTTP_SHIB_HOMEORGANIZATION attribute towards " |
|
217 |
"this service<br>" |
|
218 |
msgstr "" |
|
219 |
"Ο idP σας θα πρέπει να παρέχει την HTTP_SHIB_HOMEORGANIZATION παράμετερο " |
|
220 |
"στην υπηρεσία<br>" |
|
221 |
|
|
222 |
#: flowspec/views.py:308 |
|
214 |
#: flowspec/views.py:309 |
|
223 | 215 |
msgid "" |
224 | 216 |
"Your idP should release an appropriate HTTP_SHIB_EP_ENTITLEMENT attribute " |
225 | 217 |
"towards this service<br>" |
... | ... | |
227 | 219 |
"Ο idP σας θα πρέπει να παρέχει την HTTP_SHIB_EP_ENTITLEMENT παράμετερο στην " |
228 | 220 |
"υπηρεσία<br>" |
229 | 221 |
|
230 |
#: flowspec/views.py:310
|
|
222 |
#: flowspec/views.py:311
|
|
231 | 223 |
msgid "" |
232 | 224 |
"Your idP should release the HTTP_SHIB_INETORGPERSON_MAIL attribute towards " |
233 | 225 |
"this service" |
... | ... | |
235 | 227 |
"Ο idP σας θα πρέπει να παρέχει την HTTP_SHIB_INETORGPERSON_MAIL παράμετερο " |
236 | 228 |
"στην υπηρεσία<br>" |
237 | 229 |
|
238 |
#: flowspec/views.py:329 |
|
239 |
msgid "" |
|
240 |
"Your organization's domain name does not match our peers' domain " |
|
241 |
"names<br>Please contact Helpdesk to resolve this issue" |
|
242 |
msgstr "" |
|
243 |
"Το domain name του οργανισμού σας δε βρέθηκε στη βάση φορέων μας." |
|
244 |
"<br>Παρακαλώ επικοινωνήστε με το Helpdesk για τη διευθέτηση του προβλήματος" |
|
245 |
|
|
246 |
#: flowspec/views.py:337 |
|
230 |
#: flowspec/views.py:342 flowspec/views.py:431 |
|
247 | 231 |
#, python-format |
248 | 232 |
msgid "" |
249 | 233 |
"User account <strong>%s</strong> is pending activation. Administrators have " |
... | ... | |
257 | 241 |
"ενεργοποιηθεί για μεγάλο χρονικό διάστημα, επικοινωνήστε με τον τεχνικό σας " |
258 | 242 |
"υπέυθυνο ή το Helpdesk του ΕΔΕΤ." |
259 | 243 |
|
260 |
#: flowspec/views.py:341
|
|
244 |
#: flowspec/views.py:346
|
|
261 | 245 |
msgid "" |
262 | 246 |
"Something went wrong during user authentication. Contact your administrator" |
263 | 247 |
msgstr "" |
264 | 248 |
"Παρουσιάστηκε ένα σφάλμα κατά την είσοδο του χρήστη. Επικοινωνήστε με το " |
265 | 249 |
"διαχειριστή σας" |
266 | 250 |
|
267 |
#: flowspec/views.py:345 |
|
268 |
msgid "Invalid login procedure" |
|
269 |
msgstr "Εσφαλμένη διαδικασία εισόδου" |
|
251 |
#: flowspec/views.py:350 |
|
252 |
#, python-format |
|
253 |
msgid "Invalid login procedure. Error: %s" |
|
254 |
msgstr "Εσφαλμένη διαδικασία εισόδου. Σφάλμα: %s" |
|
255 |
|
|
256 |
#: flowspec/views.py:421 |
|
257 |
msgid "" |
|
258 |
"Violation warning: User account is already associated with an institution." |
|
259 |
"The event has been logged and our administrators will be notified about it" |
|
260 |
msgstr "" |
|
270 | 261 |
|
271 | 262 |
#: monkey_patch/forms.py:11 |
272 | 263 |
#, python-format |
... | ... | |
359 | 350 |
"the parameter selection above. Feel free to include any additional comments." |
360 | 351 |
msgstr "" |
361 | 352 |
|
362 |
#: templates/apply.html:398 |
|
353 |
#: templates/apply.html:398 templates/registration/select_institution.html:37
|
|
363 | 354 |
msgid "Apply" |
364 | 355 |
msgstr "Εφαρμογή" |
365 | 356 |
|
... | ... | |
367 | 358 |
msgid "Add new port" |
368 | 359 |
msgstr "Νέα port" |
369 | 360 |
|
370 |
#: templates/base.html:44 templates/welcome.html:8
|
|
361 |
#: templates/base.html:59 templates/base.html.py:158
|
|
371 | 362 |
msgid "Welcome" |
372 | 363 |
msgstr "Καλωσήρθατε" |
373 | 364 |
|
374 |
#: templates/base.html:58 templates/base.html.py:87 templates/profile.html:4
|
|
365 |
#: templates/base.html:73 templates/base.html.py:102 templates/profile.html:4
|
|
375 | 366 |
#: templates/profile.html.py:5 templates/profile.html:7 |
376 | 367 |
msgid "My profile" |
377 | 368 |
msgstr "Το προφίλ μου" |
378 | 369 |
|
379 |
#: templates/base.html:60 templates/base.html.py:91
|
|
370 |
#: templates/base.html:75 templates/base.html.py:106
|
|
380 | 371 |
msgid "Admin" |
381 | 372 |
msgstr "Διαχειριστής" |
382 | 373 |
|
383 |
#: templates/base.html:62 templates/base.html.py:121
|
|
374 |
#: templates/base.html:77 templates/base.html.py:136
|
|
384 | 375 |
msgid "Logout" |
385 | 376 |
msgstr "Έξοδος" |
386 | 377 |
|
387 |
#: templates/base.html:65 templates/base.html.py:129
|
|
378 |
#: templates/base.html:80 templates/base.html.py:144
|
|
388 | 379 |
msgid "" |
389 | 380 |
"After clicking Retry Login, it is strongly suggested to close your browser " |
390 | 381 |
"and visit the page again" |
... | ... | |
392 | 383 |
"Αφού επιλέξετε Επανάληψη Εισόδου κλείστε τον browser σας και επισκεφθείτε " |
393 | 384 |
"ξανά τη σελίδα" |
394 | 385 |
|
395 |
#: templates/base.html:65 templates/base.html.py:129
|
|
386 |
#: templates/base.html:80 templates/base.html.py:144
|
|
396 | 387 |
msgid "Retry Login" |
397 | 388 |
msgstr "Επανάληψη Εισόδου" |
398 | 389 |
|
399 |
#: templates/base.html:67 templates/base.html.py:126 templates/base.html:132
|
|
390 |
#: templates/base.html:82 templates/base.html.py:141 templates/base.html:147
|
|
400 | 391 |
#: templates/welcome.html:21 |
401 | 392 |
msgid "Shibboleth Login" |
402 | 393 |
msgstr "Είσοδος με Shibboleth" |
403 | 394 |
|
404 |
#: templates/base.html:100
|
|
395 |
#: templates/base.html:115
|
|
405 | 396 |
msgid "Language" |
406 | 397 |
msgstr "Γλώσσα" |
407 | 398 |
|
408 |
#: templates/base.html:142 templates/user_routes.html:214
|
|
399 |
#: templates/base.html:158 templates/user_routes.html:214
|
|
409 | 400 |
#: templates/user_routes.html.py:220 |
410 | 401 |
msgid "My rules" |
411 | 402 |
msgstr "Τα φίλτρα μου" |
... | ... | |
432 | 423 |
msgid "Optional" |
433 | 424 |
msgstr "Προεραιτικά" |
434 | 425 |
|
435 |
#: templates/footer.html:6
|
|
426 |
#: templates/footer.html:7
|
|
436 | 427 |
msgid "" |
437 | 428 |
"If you have any questions or need help, contact GRNET Helpdesk at <a " |
438 | 429 |
"href='mailto:helpdesk@grnet.gr'>helpdesk@grnet.gr</a> or 800-11-47638." |
... | ... | |
441 | 432 |
"ΕΔΕΤ στο <a href='mailto:helpdesk@grnet.gr'>helpdesk@grnet.gr</a> ή " |
442 | 433 |
"τηλεφωνικά στο 800-11-47638." |
443 | 434 |
|
444 |
#: templates/footer.html:8
|
|
435 |
#: templates/footer.html:9
|
|
445 | 436 |
msgid "GRNET" |
446 | 437 |
msgstr "ΕΔΕΤ" |
447 | 438 |
|
448 |
#: templates/footer.html:8
|
|
439 |
#: templates/footer.html:9
|
|
449 | 440 |
msgid "Info" |
450 | 441 |
msgstr "Πληροφορίες" |
451 | 442 |
|
452 |
#: templates/footer.html:8
|
|
443 |
#: templates/footer.html:9 templates/welcome.html:14
|
|
453 | 444 |
msgid "Service Terms" |
454 | 445 |
msgstr "Όροι Χρήσης" |
455 | 446 |
|
... | ... | |
611 | 602 |
msgid "Login" |
612 | 603 |
msgstr "Είσοδος" |
613 | 604 |
|
614 |
#: templates/welcome.html:10
|
|
605 |
#: templates/welcome.html:9
|
|
615 | 606 |
msgid "Welcome to GRNET's FoD service." |
616 | 607 |
msgstr "Καλωσήρθατε στην υπηρεσία FoD του ΕΔΕΤ." |
617 | 608 |
|
618 |
#: templates/welcome.html:11 |
|
619 |
msgid "" |
|
620 |
"If you are new to the service, take some time to read the service description" |
|
621 |
msgstr "" |
|
622 |
"Εάν χρησιμοποιείτε την υπηρεσία για πρώτη φορά, αφιερώστε λίγο χρόνο στην " |
|
623 |
"ανάγνωση της περιγραφής της υπηρεσίας" |
|
609 |
#: templates/welcome.html:12 |
|
610 |
msgid "What" |
|
611 |
msgstr "Τι" |
|
612 |
|
|
613 |
#: templates/welcome.html:13 |
|
614 |
msgid "If you are new to the service, take some time to read the" |
|
615 |
msgstr "Εάν χρησιμοποιείτε την υπηρεσία για πρώτη φορά, δείτε την" |
|
624 | 616 |
|
625 |
#: templates/welcome.html:11
|
|
626 |
msgid "here"
|
|
627 |
msgstr "????"
|
|
617 |
#: templates/welcome.html:13
|
|
618 |
msgid "Service Description"
|
|
619 |
msgstr "?????????? ??? ?????????"
|
|
628 | 620 |
|
629 |
#: templates/welcome.html:12 |
|
630 |
msgid "" |
|
631 |
"If you have properly set your Shibboleth attributes, you can login using the " |
|
632 |
"link on the right" |
|
621 |
#: templates/welcome.html:14 |
|
622 |
msgid "Before asking why? take some time to look at the" |
|
623 |
msgstr "Πριν ρωτήσετε γιατί; διαβάστε την ενότητα" |
|
624 |
|
|
625 |
#: templates/welcome.html:16 |
|
626 |
msgid "How" |
|
627 |
msgstr "Πως" |
|
628 |
|
|
629 |
#: templates/welcome.html:17 |
|
630 |
msgid "If you have properly set your Shibboleth attributes, you may proceed" |
|
633 | 631 |
msgstr "" |
634 | 632 |
"Έαν έχετε ορίσει ορθά τις απαιτούμενες παραμέτρους του Shibboleth, μπορείτε " |
635 |
"να εισέλθετε επιλέγοντας το σύνδεσμο στα δεξιά"
|
|
633 |
"να συνεχίσετε"
|
|
636 | 634 |
|
637 |
#: templates/welcome.html:13 |
|
635 |
#: templates/welcome.html:26 |
|
636 |
msgid "Help" |
|
637 |
msgstr "Βοήθεια" |
|
638 |
|
|
639 |
#: templates/welcome.html:27 |
|
638 | 640 |
msgid "" |
639 | 641 |
"For troubleshooting info and remarks do not hesitate to contact GRNET's " |
640 | 642 |
"Helpdesk." |
... | ... | |
661 | 663 |
msgid "The user has probably been already activated." |
662 | 664 |
msgstr "Ο χρήστης έχει ήδη ενεργοποιηθεί" |
663 | 665 |
|
666 |
#: templates/registration/activate_edit.html:14 |
|
667 |
msgid "Activate User" |
|
668 |
msgstr "Ενεργοποίηση Χρήστη" |
|
669 |
|
|
670 |
#: templates/registration/activate_edit.html:25 |
|
671 |
msgid "User" |
|
672 |
msgstr "" |
|
673 |
|
|
674 |
#: templates/registration/activate_edit.html:33 |
|
675 |
#: templates/registration/select_institution.html:25 |
|
676 |
msgid "Institution" |
|
677 |
msgstr "" |
|
678 |
|
|
679 |
#: templates/registration/activate_edit.html:44 |
|
680 |
msgid "Activate" |
|
681 |
msgstr "Ενεργοποίηση" |
|
682 |
|
|
664 | 683 |
#: templates/registration/activation_complete.html:8 |
665 | 684 |
#: templates/registration/activation_complete.html:23 |
666 | 685 |
msgid "The user will be notified about his/her account activation" |
667 | 686 |
msgstr "Ο χρήστης θα ενημερωθεί για την ενεργοποίηση του λογαριασμού" |
668 | 687 |
|
688 |
#: templates/registration/select_institution.html:14 |
|
689 |
msgid "Select your institution" |
|
690 |
msgstr "" |
|
691 |
|
|
692 |
#~ msgid "" |
|
693 |
#~ "If you are new to the service, take some time to read the service " |
|
694 |
#~ "description" |
|
695 |
#~ msgstr "" |
|
696 |
#~ "Εάν χρησιμοποιείτε την υπηρεσία για πρώτη φορά, αφιερώστε λίγο χρόνο στην " |
|
697 |
#~ "ανάγνωση της περιγραφής της υπηρεσίας" |
|
698 |
|
|
699 |
#~ msgid "here" |
|
700 |
#~ msgstr "εδώ" |
|
701 |
|
|
702 |
#~ msgid "" |
|
703 |
#~ "Your idP should release the HTTP_SHIB_HOMEORGANIZATION attribute towards " |
|
704 |
#~ "this service<br>" |
|
705 |
#~ msgstr "" |
|
706 |
#~ "Ο idP σας θα πρέπει να παρέχει την HTTP_SHIB_HOMEORGANIZATION παράμετερο " |
|
707 |
#~ "στην υπηρεσία<br>" |
|
708 |
|
|
709 |
#~ msgid "" |
|
710 |
#~ "Your organization's domain name does not match our peers' domain " |
|
711 |
#~ "names<br>Please contact Helpdesk to resolve this issue" |
|
712 |
#~ msgstr "" |
|
713 |
#~ "Το domain name του οργανισμού σας δε βρέθηκε στη βάση φορέων μας." |
|
714 |
#~ "<br>Παρακαλώ επικοινωνήστε με το Helpdesk για τη διευθέτηση του " |
|
715 |
#~ "προβλήματος" |
|
716 |
|
|
669 | 717 |
#~ msgid "Intro" |
670 | 718 |
#~ msgstr "Εισαγωγή" |
671 | 719 |
|
b/static/css/base.css | ||
---|---|---|
1 | 1 |
body { |
2 | 2 |
font-size: 13px; |
3 |
background-image: url("/fodstatic/img/bg2.gif"); |
|
4 |
background-attachment: fixed; |
|
5 |
background-color: #131516; |
|
6 |
background-position: left 40px; |
|
7 |
background-repeat: repeat; |
|
3 |
/*background-image: url("/fodstatic/img/bg2.gif");*/ |
|
4 |
|
|
8 | 5 |
padding-bottom: 10px; |
9 | 6 |
} |
10 | 7 |
|
8 |
.footer { |
|
9 |
background-color: #F5F5F5; |
|
10 |
border-top: 1px solid #E5E5E5; |
|
11 |
margin-top: 30px; |
|
12 |
padding: 30px 0; |
|
13 |
text-align: center; |
|
14 |
} |
|
11 | 15 |
.navbar .brand { |
12 | 16 |
max-height: 40px; |
13 | 17 |
overflow: visible; |
... | ... | |
17 | 21 |
label, input, button, select, textarea { |
18 | 22 |
font-size: 13px; |
19 | 23 |
} |
20 |
legend { |
|
21 | 24 |
|
22 |
font-size: 14px; |
|
23 |
line-height: 20px; |
|
25 |
legend { |
|
26 |
font-size: 13px; |
|
27 |
font-weight: bold; |
|
28 |
line-height: 20px; |
|
24 | 29 |
margin-bottom: 0; |
25 | 30 |
} |
26 | 31 |
.form-horizontal .control-group { |
... | ... | |
45 | 50 |
|
46 | 51 |
#footcontainer{ |
47 | 52 |
text-align: center; |
48 |
background-color: white;
|
|
53 |
/*background-color: white;*/
|
|
49 | 54 |
margin-top: 5px; |
50 |
padding: 5px 10px 0 10px;
|
|
51 |
border: 1px solid grey;
|
|
55 |
/*padding: 5px 10px 0 10px;*/
|
|
56 |
/*border: 1px solid grey;*/
|
|
52 | 57 |
} |
53 | 58 |
|
54 | 59 |
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 | 73 |
text-shadow: 0 1px 0 #FFFFFF; |
69 | 74 |
} |
70 | 75 |
|
71 |
#content.container{ |
|
76 |
/*#content.container{
|
|
72 | 77 |
border: 1px solid grey; |
73 | 78 |
padding: 90px 10px 10px; |
74 | 79 |
background: white;" |
75 |
} |
|
80 |
}*/
|
|
76 | 81 |
#routes_table{ |
77 | 82 |
font-size: 12px; |
78 | 83 |
} |
b/templates/apply.html | ||
---|---|---|
395 | 395 |
</fieldset> |
396 | 396 |
<div class="control-group"> |
397 | 397 |
<div class="controls"> |
398 |
<button type="submit" id="applybutton" value="{% trans "Apply" %}" class="btn btn-large btn-primary"/>Apply</button>
|
|
398 |
<button type="submit" id="applybutton" value="{% trans 'Apply' %}" class="btn btn-large btn-primary"/>Apply</button>
|
|
399 | 399 |
</div> |
400 | 400 |
</div> |
401 | 401 |
|
b/templates/base.html | ||
---|---|---|
9 | 9 |
<script src="/fodstatic/js/jquery.min.js" type="text/javascript"></script> |
10 | 10 |
<script src="/fodstatic/js/jquery_csrf_protect.js" type="text/javascript"></script> |
11 | 11 |
<link rel="stylesheet" type="text/css" href="/fodstatic/css/bootstrap.css"> |
12 |
<link rel="stylesheet" type="text/css" href="/fodstatic/css/bootstrap-responsive.css"> |
|
12 | 13 |
<link rel="stylesheet" type="text/css" href="/fodstatic/css/smoothness/jquery-ui-1.8.13.custom.css"> |
13 | 14 |
<link rel="stylesheet" type="text/css" href="/fodstatic/css/base.css"> |
14 | 15 |
|
... | ... | |
23 | 24 |
} |
24 | 25 |
|
25 | 26 |
</script> |
27 |
<style> |
|
28 |
body { |
|
29 |
background-color: #EEEEEE; |
|
30 |
height: 100%; |
|
31 |
overflow-y: scroll; |
|
32 |
} |
|
33 |
#content { |
|
34 |
background-color: #FFFFFF; |
|
35 |
min-height: 100%; |
|
36 |
padding: 20px; |
|
37 |
padding-top: 90px; |
|
38 |
position: relative; |
|
39 |
} |
|
40 |
</style> |
|
26 | 41 |
{% block extrahead %}{% endblock %} |
27 | 42 |
</head> |
28 | 43 |
|
... | ... | |
79 | 94 |
<div class="container"> |
80 | 95 |
|
81 | 96 |
{% block topmenu %} |
82 |
<a class="brand" href="{% url group-routes %}"><img src="/fodstatic/fod_logo.png" /></a>
|
|
97 |
<a class="brand brandimg" href="{% url group-routes %}"><img src="/fodstatic/img/fod_logo_latest.png" /></a>
|
|
83 | 98 |
<ul class="nav"> |
84 | 99 |
{% if user.is_authenticated %} |
85 | 100 |
|
... | ... | |
137 | 152 |
</div> |
138 | 153 |
</div> |
139 | 154 |
</div> |
155 |
{% block contentplaceholder %} |
|
140 | 156 |
<div id="content" class="container"> |
141 | 157 |
{% block brcrmb_container %} |
142 |
<ul class="breadcrumb">{% if user.is_authenticated %}<li><a href="{% url group-routes %}">{% trans "My rules" %}</a></li>{% endif %} |
|
158 |
<ul class="breadcrumb">{% if user.is_authenticated %}<li><a href="{% url group-routes %}">{% trans "My rules" %}</a></li>{% else %}<li><a href="{% url welcome %}">{% trans "Welcome" %}</a></li>{% endif %}
|
|
143 | 159 |
{% block breadcrumbs %}{% endblock %} |
144 | 160 |
</ul> |
161 |
{% endblock %} |
|
145 | 162 |
{% if messages %} |
146 | 163 |
<div id="messages"> |
147 | 164 |
{% for message in messages %} |
... | ... | |
149 | 166 |
{% endfor %} |
150 | 167 |
</div> |
151 | 168 |
{% endif %} |
152 |
{% endblock %} |
|
169 |
|
|
170 |
|
|
153 | 171 |
{% block content %} |
154 | 172 |
{% endblock %} |
155 | 173 |
|
156 | 174 |
</div> |
175 |
{% endblock %} |
|
157 | 176 |
{% block footerblock %} |
158 | 177 |
{% include "footer.html" %} |
159 | 178 |
{% endblock %} |
b/templates/flatpages/default.html | ||
---|---|---|
2 | 2 |
|
3 | 3 |
{% load i18n %} |
4 | 4 |
{% block title %}{{ flatpage.title }}{% endblock %} |
5 |
{% block breadcrumbs %}:: {% trans flatpage.title %}{% endblock %} |
|
6 |
|
|
5 |
{% block breadcrumbs %} |
|
6 |
<li class="active"><span class="divider">/</span> |
|
7 |
|
|
8 |
{% trans flatpage.title %} |
|
9 |
</li> |
|
10 |
{% endblock %} |
|
7 | 11 |
{% block extrahead %} |
8 | 12 |
<META HTTP-EQUIV="Pragma" CONTENT="no-cache"> |
9 | 13 |
<META HTTP-EQUIV="Expires" CONTENT="-1"> |
b/templates/footer.html | ||
---|---|---|
2 | 2 |
|
3 | 3 |
<footer class="footer"> |
4 | 4 |
<div id="footcontainer" class="container"> |
5 |
|
|
5 | 6 |
{% if user.is_authenticated %} |
6 | 7 |
{% trans "If you have any questions or need help, contact GRNET Helpdesk at <a href='mailto:helpdesk@grnet.gr'>helpdesk@grnet.gr</a> or 800-11-47638." %}<br /> |
7 | 8 |
{% endif %} |
8 |
<a href="http://www.grnet.gr">{% trans "GRNET" %} NOC</a> | <a href="/fod/info/{{LANGUAGE_CODE}}/">{% trans "Info" %}</a> | <a href="/fod/tos/{{LANGUAGE_CODE}}/">{% trans "Service Terms" %}</a>
|
|
9 |
<div class="row"><a href="http://www.grnet.gr">{% trans "GRNET" %} NOC</a> | <a href="/fod/info/{{LANGUAGE_CODE}}/">{% trans "Info" %}</a> | <a href="/fod/tos/{{LANGUAGE_CODE}}/">{% trans "Service Terms" %}</a></div>
|
|
9 | 10 |
<p style="text-align: center;"><img width="46" height="40" border="0" class="image image-img_assist_custom-46x40 " src="//noc.grnet.gr/sites/default/files/images/image_PSSYGK.img_assist_custom-46x40.png" alt="Flag ΨΣ" title="Flag ΨΣ"> <img width="49" height="40" border="0" class="image image-img_assist_custom-49x40 " src="//noc.grnet.gr/sites/default/files/images/image_EEflag.img_assist_custom-49x40.png" alt="EU flag" title="EU flag"> <img width="90" height="40" border="0" class="image image-img_assist_custom-90x40 " src="//noc.grnet.gr/sites/default/files/images/image_YPDBMTH.img_assist_custom-90x40.png" alt="Flag ΥΠΔΒΜΘ" title="Flag ΥΠΔΒΜΘ"><img width="67" height="40" border="0" class="image image-img_assist_custom-67x40 " src="//noc.grnet.gr/sites/default/files/images/image_ESPA.img_assist_custom-67x40.png" alt="ESPA" title="ESPA"></p> |
10 | 11 |
</div> |
11 | 12 |
</footer> |
b/templates/welcome.html | ||
---|---|---|
2 | 2 |
{% load i18n %} |
3 | 3 |
{% block title %}{% trans "Login" %}{% endblock %} |
4 | 4 |
{% block brcrmb_container %}{% endblock %} |
5 |
{% block content %}
|
|
6 |
<div class="row">
|
|
7 |
<div class="span6 well">
|
|
8 |
<h3 class="muted">{% trans "Welcome" %}</h3>
|
|
9 |
<hr>
|
|
10 |
<p>{% blocktrans %}Welcome to GRNET's FoD service.{% endblocktrans %}</p>
|
|
11 |
<p>{% blocktrans %}If you are new to the service, take some time to read the service description{% endblocktrans %} <a href="/fod/info/{{LANGUAGE_CODE}}/">{% trans "here" %}</a>.</p>
|
|
12 |
<p>{% blocktrans %}If you have properly set your Shibboleth attributes, you can login using the link on the right{% endblocktrans %}</p>
|
|
13 |
<p>{% blocktrans %}For troubleshooting info and remarks do not hesitate to contact GRNET's Helpdesk.{% endblocktrans %}</p>
|
|
14 |
</div>
|
|
15 |
|
|
16 |
<div class="span5" id="loginform">
|
|
17 |
|
|
18 |
<div style="text-align: center;"> |
|
5 |
{% block contentplaceholder %}
|
|
6 |
<div id="content" class="container">
|
|
7 |
<div class="hero-unit" style="text-align:center"><h2>GRNET - Firewall on Demand</h2>
|
|
8 |
<p><img src="/fodstatic/img/fod_footer_logo.png" /></p>
|
|
9 |
<p>{% blocktrans %}Welcome to GRNET's FoD service.{% endblocktrans %}</p>
|
|
10 |
</div>
|
|
11 |
<div class="row-fluid">
|
|
12 |
<div class="span4 well"><h3>{% trans "What" %}?</h3><hr>
|
|
13 |
<p>{% blocktrans %}If you are new to the service, take some time to read the{% endblocktrans %} <a href="/fod/info/{{LANGUAGE_CODE}}/">{% trans "Service Description" %}</a></p>
|
|
14 |
<p>{% blocktrans %}Before asking why? take some time to look at the{% endblocktrans %} <a href="/fod/tos/{{LANGUAGE_CODE}}/">{% trans "Service Terms" %}</a></p>
|
|
15 |
</div> |
|
16 |
<div class="span4 well"><h3>{% trans "How" %}?</h3><hr>
|
|
17 |
<p>{% blocktrans %}If you have properly set your Shibboleth attributes, you may proceed{% endblocktrans %}</p> |
|
18 |
<div style="text-align: center;">
|
|
19 | 19 |
<a href="{% url login %}"> |
20 | 20 |
<img src="/fodstatic/shib_login.png" style="border:none;"> |
21 | 21 |
<p>{% trans "Shibboleth Login" %}</p> |
22 | 22 |
</a> |
23 | 23 |
|
24 | 24 |
</div> |
25 |
</div> |
|
25 |
</div> |
|
26 |
<div class="span4 well"><h3>{% trans "Help" %}?</h3><hr> |
|
27 |
{% blocktrans %}For troubleshooting info and remarks do not hesitate to contact GRNET's Helpdesk.{% endblocktrans %}</div> |
|
26 | 28 |
</div> |
27 | 29 |
|
28 |
{% endblock %} |
|
30 |
</div> |
|
31 |
{% endblock %} |
Also available in: Unified diff