From: Yasin Date: Fri, 6 Jun 2014 15:40:55 +0000 (+0200) Subject: F4f Review changes X-Git-Tag: myslice-1.1~73 X-Git-Url: http://git.onelab.eu/?p=unfold.git;a=commitdiff_plain;h=13aebd01514329394c6663834c3dc473ddb969a6 F4f Review changes --- diff --git a/myslice/urls.py b/myslice/urls.py index 2638e4df..2b0049db 100644 --- a/myslice/urls.py +++ b/myslice/urls.py @@ -28,7 +28,8 @@ import portal.sliceresourceview import portal.slicetabexperiment import portal.slicetabinfo import portal.slicetabtestbeds -import portal.slicetabusers +import portal.slicetabusers +import portal.slicetabmeasurements #### high level choices # main entry point (set to the / URL) @@ -87,6 +88,7 @@ urls = [ (r'^slice/(?P[^/]+)/?$', portal.sliceview.SliceView.as_view()), (r'^info/(?P[^/]+)/?$', portal.slicetabinfo.SliceInfoView.as_view()), (r'^testbeds/(?P[^/]+)/?$', portal.slicetabtestbeds.SliceTabTestbeds.as_view()), + (r'^measurements/(?P[^/]+)/?$', portal.slicetabmeasurements.SliceTabMeasurements.as_view()), (r'^experiment/(?P[^/]+)/?$', portal.slicetabexperiment.ExperimentView.as_view()), url(r'^portal/', include('portal.urls')), ] diff --git a/portal/contactview.py b/portal/contactview.py index ac3b9dd9..3da2e052 100644 --- a/portal/contactview.py +++ b/portal/contactview.py @@ -14,13 +14,14 @@ theme = ThemeView() # GET is for displaying the empty form # POST is to process it once filled - or show the form again if anything is missing class ContactView (FreeAccessView, ThemeView): + template_name = 'contact.html' def post (self, request): form = ContactForm(request.POST) # A form bound to the POST data if form.is_valid(): # All validation rules pass # Process the data in form.cleaned_data - first_name = form.cleaned_data['first_name'] - last_name = form.cleaned_data['last_name'] - authority = form.cleaned_data['authority'] + #first_name = form.cleaned_data['first_name'] + #last_name = form.cleaned_data['last_name'] + #authority = form.cleaned_data['authority'] subject = form.cleaned_data['subject'] description = form.cleaned_data['description'] email = form.cleaned_data['email'] # email of the sender @@ -31,7 +32,7 @@ class ContactView (FreeAccessView, ThemeView): #theme.template_name = 'email_support.txt' #recipients = render_to_string(theme.template, form.cleaned_data) #recipients = subject.replace('\n', '') - recipients = ['support@myslice.info'] + recipients = ['support@myslice.info','contact@fed4fire.eu'] if cc_myself: recipients.append(email) #recipients = ['support@myslice.info'] @@ -74,7 +75,7 @@ class ContactView (FreeAccessView, ThemeView): username = request.user.email else : username = None - return render(request, 'contact.html', { + return render(request, self.template, { 'form': form, 'topmenu_items': topmenu_items('Contact', request), 'theme' : self.theme, diff --git a/portal/slicetabmeasurements.py b/portal/slicetabmeasurements.py new file mode 100644 index 00000000..49afc697 --- /dev/null +++ b/portal/slicetabmeasurements.py @@ -0,0 +1,12 @@ +from django.template import RequestContext +from django.shortcuts import render_to_response + +from unfold.loginrequired import LoginRequiredView + +from myslice.theme import ThemeView + +class SliceTabMeasurements (LoginRequiredView, ThemeView): + template_name = "slice-tab-measurement.html" + + def get(self, request, slicename): + return render_to_response(self.template, {"theme": self.theme, "username": request.user, "slice" : slicename, "section":"measurements"}, context_instance=RequestContext(request)) diff --git a/portal/static/img/institutions/fed4fire.atos.gif b/portal/static/img/institutions/fed4fire.atos.gif new file mode 100644 index 00000000..3b62358c Binary files /dev/null and b/portal/static/img/institutions/fed4fire.atos.gif differ diff --git a/portal/static/img/institutions/fed4fire.uth.gif b/portal/static/img/institutions/fed4fire.uth.gif new file mode 100644 index 00000000..b99b489f Binary files /dev/null and b/portal/static/img/institutions/fed4fire.uth.gif differ diff --git a/portal/templates/_widget-slice-sections.html b/portal/templates/_widget-slice-sections.html index b3fde328..a3d5d95a 100644 --- a/portal/templates/_widget-slice-sections.html +++ b/portal/templates/_widget-slice-sections.html @@ -4,8 +4,8 @@
  • Testbeds
  • Resources
  • Users
    • -
  • Statistics
    • -
  • Measurements
    • + +
  • Measurements
  • Experiment
    • {% else %} @@ -14,8 +14,8 @@
  • Testbeds
  • Resources
  • Users
    • -
  • Statistics
    • -
  • Measurements
    • + +
  • Measurements
  • Experiment
    • -{% endif %} \ No newline at end of file +{% endif %} diff --git a/portal/templates/contact_sent.html b/portal/templates/contact_sent.html index 430658c3..2cdeccfa 100644 --- a/portal/templates/contact_sent.html +++ b/portal/templates/contact_sent.html @@ -3,12 +3,12 @@ {% block content %}
    -

    Open a Ticket OneLab Support

    +

    Open a TicketContact us

    -

    Query Received !

    +

    Query received.

    We will study your problem and get back to you as soon as possible.

    diff --git a/portal/templates/contact_support_email.html b/portal/templates/contact_support_email.html index dbccb4b6..97743475 100644 --- a/portal/templates/contact_support_email.html +++ b/portal/templates/contact_support_email.html @@ -2,9 +2,6 @@

    User details


    -First name : {{first_name}} -Last name : {{last_name}} -Authority : {{authority}} Email : {{email}}

    Query details

    diff --git a/portal/templates/contact_support_email.txt b/portal/templates/contact_support_email.txt index 9eb576d6..536d1b2d 100644 --- a/portal/templates/contact_support_email.txt +++ b/portal/templates/contact_support_email.txt @@ -1,9 +1,6 @@ User details: -First name : {{first_name}} -Last name : {{last_name}} email : {{email}} -Authority : {{authority}} Query Details: diff --git a/portal/templates/fed4fire/fed4fire_account-view.html b/portal/templates/fed4fire/fed4fire_account-view.html new file mode 100644 index 00000000..464de454 --- /dev/null +++ b/portal/templates/fed4fire/fed4fire_account-view.html @@ -0,0 +1,339 @@ +{% extends "layout_wide.html" %} +{% block content %} + + +{% if messages %} +
      + {% for message in messages %} + {{ message }} + {% endfor %} +
    +{% endif %} +
    +
    +
    + +
    +
    +
    +
    +
    + +
    + +
    + {% csrf_token %} + + + + + + + + + + + + + + + + + + + + + {%if 'Enabled' in user_status %} + + + + + + + + + + {%if 'N/A' not in user_private_key%} + + + {%else%} + + + {%endif%} + + + {%if 'N/A' not in user_private_key%} + + + {%else%} + + + {%endif%} + + + + + {%endif%} +
    +
    Platform: Myslice
    +
    Email + {{ person.email }} + +
    Password + + ******** + + + + + + + + + + + + +
    Enter password:
    Confirm password: + + +
    +     +
    Full Name + {{ fullname }} + + +
    + + + +     + +
    Authority + {{ authority }} + +
    Generate Keys + +
    Public Key + ******** + + +
    +
    + + +     +
    + + +
    Private Key ******** + + + Private Key ******** + + +
    Identity + + Identity + +
    +

    Tradeoff: Ease-of-use vs Security.
    + Ease-of-use: Automatic account delegation. Don't delete private key.
    + Security: Manual account delegation. Download & Delete private key. +

    +
    + +
    +
    + +
    +
    + +

    Principal Account Account used for delegating credentials

    + + + + + + + + + + {% for row in principal_acc %} + + + + + + + + + {%endfor%} +
    PlatformAccount TypeAccount DelegationUser hrnUser Status
    {{ row.platform_name }} {{ row.account_type }} {{ row.delegation_type }} {{ row.usr_hrn }} {{ row.user_status }}
    + +
    + + + {%if 'Enabled' in user_status %} +
    +

    Credentials Delegated to Principal Account

    + + + + + + + {% for row in my_users %} + + + + + {%endfor%} +
    Delegated User Credential
    Expiration DateDownload
    {{ row.cred_exp }} + +
    +

    + + + + + + + + {% for row in my_slices %} + + + + + + {%endfor%} +
    Delegated Slice Credentials
    Slice NameExpiration DateDownload
    {{ row.slice_name }} {{ row.cred_exp }} + +
    +

    + + + + + + + + {% for row in my_auths %} + + + + + + {%endfor%} +
    Delegated Authority Credentials
    Authority NameExpiration DateDownload
    {{ row.auth_name }} {{ row.cred_exp }} + +
    +

    + {%if '' not in my_users%} +

    + {%else%} +

    + {%endif%} +
    +
    + +
    +
    + +

    Testbed Access Reference Accounts in the following testbeds

    + + + + + + + + {% for row in ref_acc %} + + + + + + + {%endfor%} +
    PlatformAccount TypeReference toRemove Account
    {{ row.platform_name }} {{ row.account_type }} {{ row.account_reference }} + +
    + + +

    Add reference account to the following testbeds

    + + + + + + {% for platform in platform_list %} + + + + + {%endfor%} +
    PlatformsAdd Account
    {{ platform.platform_no_access }} + +
    +
    +{%endif%} +
    + +
    + + + +{% endblock %} diff --git a/portal/templates/fed4fire/fed4fire_contact.html b/portal/templates/fed4fire/fed4fire_contact.html index 600eb4a7..cd2c151d 100644 --- a/portal/templates/fed4fire/fed4fire_contact.html +++ b/portal/templates/fed4fire/fed4fire_contact.html @@ -7,7 +7,7 @@ {% block content %}
    -

    Open a Ticket Fed4Fire Support

    +

    Open a TicketContact us

    @@ -15,13 +15,22 @@
    -

    Please check the documentation

    +

    Please check our documentation. + Most of the basic problems are explained there. +

    +

    + If you have problems using the portal, please check our FAQ section. +

    +

    + If you haven't find your answes in the FAQ, please contact us by filling the form below.
    + You can also e-mail us directly. +

    +
    -
    -
    +
    {% csrf_token %} {% for field in form %} @@ -30,7 +39,7 @@ {{ field.errors }} {{ field }}
    {% endfor %} - +
    diff --git a/portal/templates/fed4fire/fed4fire_contact_support_email.html b/portal/templates/fed4fire/fed4fire_contact_support_email.html new file mode 100644 index 00000000..c50f2eeb --- /dev/null +++ b/portal/templates/fed4fire/fed4fire_contact_support_email.html @@ -0,0 +1,8 @@ + +
    +Email : {{email}} + +

    Query details

    + +Subject : {{subject}} +Query : {{description}} diff --git a/portal/templates/fed4fire/fed4fire_contact_support_email.txt b/portal/templates/fed4fire/fed4fire_contact_support_email.txt new file mode 100644 index 00000000..e6c0534d --- /dev/null +++ b/portal/templates/fed4fire/fed4fire_contact_support_email.txt @@ -0,0 +1,6 @@ +email : {{email}} + +Query Details: + +Subject : {{subject}} +Description : {{description}} diff --git a/portal/templates/fed4fire/fed4fire_contact_support_email_subject.txt b/portal/templates/fed4fire/fed4fire_contact_support_email_subject.txt new file mode 100644 index 00000000..42af99aa --- /dev/null +++ b/portal/templates/fed4fire/fed4fire_contact_support_email_subject.txt @@ -0,0 +1 @@ +Fed4fire support: {{email}} submitted a query. diff --git a/portal/templates/fed4fire/fed4fire_home-view.html b/portal/templates/fed4fire/fed4fire_home-view.html index 0414be91..a3cf9b24 100644 --- a/portal/templates/fed4fire/fed4fire_home-view.html +++ b/portal/templates/fed4fire/fed4fire_home-view.html @@ -1,91 +1,97 @@ -{% extends "layout.html" %} +{% extends "layout_base.html" %} {% load portal_filters %} {% block content %} -
    -{% widget '_widget_news.html' %} -
    -
    - -
    - - - - - - - - - - - - - {% if person %} - - - - -
    ACCOUNTSLICESSUPPORT
    - -
    - {% if person.last_name %} - {{person.first_name}} {{person.last_name}}
    - {% endif %} - Email: {{person.email}} -
    - {% else %} -     		- {% widget '_widget-login-user.html' %} - {% endif %} - - {% if person %} - -
    Loading Slices
    - {% else %} - + +{% if username %} +
    +
    +
    +

    + EXPERIMENT +

    +
    + +
    +
    + +
    +
    +
    Loading Slices
    +
    +
    + +
    +
    + +
    +
    +
    +

    MANAGEMENT

    +
    + +
    +
    + +
    +
    +
    +

    + SUPPORT +

    +
    + +
    +
    + +
    +
    + +
    +

    + ACCOUNT +

    +
    + +
    +
    + +
    +
    + {% if person.last_name %} + {{person.first_name}} {{person.last_name}}
    {% endif %} -
    		- -
    + Email: {{person.email}} +
    +
    -
    - - - - - - - - - - - - - {% if person %} - - - - -
    INSTITUTIONSLICESREQUESTS
    - - {% else %} - - {% widget '_widget-login-manager.html' %} - {% endif %} - - {% if person %} - - {% endif %} - - {% if person %} - - {% endif %} -
    +
    +{% else %} +
    +
    +
    +
    +

    + Your Easy Access to Computer Networking Testbeds. +

    +

    + A wide variety of world class testbeds available through your one account. +

    +
    +
    +
    + {% widget '_widget-login-user.html' %} +
    +
    +
    +{% endif %} + + -{% endif %} \ No newline at end of file +{% endif %} diff --git a/portal/templates/slice-view.html b/portal/templates/slice-view.html index 9238d54f..771edd4e 100644 --- a/portal/templates/slice-view.html +++ b/portal/templates/slice-view.html @@ -20,7 +20,7 @@
    ...
    ...
    - +
    ...
    ...
    {% endblock %}