Revision 33e8f0b8

b/flowspec/views.py
64 64 
    applier_peer_networks = request.user.get_profile().peer.networks.all()
65 65 
    if not applier_peer_networks:
66 66 
         messages.add_message(request, messages.WARNING,
67 
                             "Insufficient rights on administrative networks. Cannot add route. Contact your administrator")
67 
                             "Insufficient rights on administrative networks. Cannot add rule. Contact your administrator")
68 68 
         return HttpResponseRedirect(reverse("group-routes"))
69 69 
    if request.method == "GET":
70 70 
        form = RouteForm()
......
118 118 
    route_edit_applier_peer = route_edit.applier.get_profile().peer
119 119 
    if applier_peer != route_edit_applier_peer:
120 120 
        messages.add_message(request, messages.WARNING,
121 
                             "Insufficient rights to edit route %s" %(route_slug))
121 
                             "Insufficient rights to edit rule %s" %(route_slug))
122 122 
        return HttpResponseRedirect(reverse("group-routes"))
123 123 
    route_original = deepcopy(route_edit)
124 124 
    if request.POST:
b/templates/apply.html
3 3 

  		





  4
  4
  
    
{% block title %}


  		





  5
  5
  
    
	{% if edit %}


  		





  6
  
  
    
		{% trans "Edit Route" %} {{form.data.name}}


  		





  
  6
  
    
		{% trans "Edit Rule" %} {{form.data.name}}


  		





  7
  7
  
    
	{% else %}


  		





  8
  
  
    
		{% trans "Create new Route" %}


  		





  
  8
  
    
		{% trans "Create new Rule" %}


  		





  9
  9
  
    
	{% endif %}


  		





  10
  10
  
    
{% endblock %}


  		





  11
  11
  
    

  		





  12
  12
  
    
{% block breadcrumbs %}:: 


  		





  13
  13
  
    
	{% if edit %}


  		





  14
  
  
    
		{% trans "Edit route" %} {{form.data.name}}


  		





  
  14
  
    
		{% trans "Edit rule" %} {{form.data.name}}


  		





  15
  15
  
    
	{% else %}


  		





  16
  
  
    
	{% trans "Create route" %}


  		





  
  16
  
    
	{% trans "Create rule" %}


  		





  17
  17
  
    
	{% endif %}


  		





  18
  18
  
    
		{% endblock %}


  		





  19
  19
  
    
{% block extrahead %}


  		





  ......




  144
  144
  
    
</style>


  		





  145
  145
  
    
<div align="center">


  		





  146
  146
  
    
	{% if edit %}


  		





  147
  
  
    
	<h3>{% trans "Edit route" %}: {{form.data.name}}</h3>


  		





  
  147
  
    
	<h3>{% trans "Edit rule" %}: {{form.data.name}}</h3>


  		





  148
  148
  
    
	{% else %}


  		





  149
  
  
    
<h3>{% trans "Apply for a new route" %}</h3>


  		





  
  149
  
    
<h3>{% trans "Apply for a new rule" %}</h3>


  		





  150
  150
  
    
{% endif %}


  		





  151
  151
  
    
<form method="POST">


  		





  152
  152
  
    
{% csrf_token %}


  		





  ......




  155
  155
  
    
{% endif %}


  		





  156
  156
  
    

  		





  157
  157
  
    
<fieldset {% if edit %} style="display:none;" {% endif %}>


  		





  158
  
  
    
	<legend>{% trans "Route Basic Info" %}</legend>


  		





  
  158
  
    
	<legend>{% trans "Rule Basic Info" %}</legend>


  		





  159
  159
  
    
<table>


  		





  160
  160
  
    
<tr><th>{{ form.name.label_tag }}</th><td>{{ form.name }}<span class="error">{{ form.name.errors|join:", " }}</span></td></tr>


  		





  161
  161
  
    
<tr class="help"><td></td><td>A unique identifier will be added as a name_suffix</td></tr>


  		





  ......




  163
  163
  
    
</fieldset>


  		





  164
  164
  
    

  		





  165
  165
  
    
<fieldset>


  		





  166
  
  
    
<legend>{% trans "Route Match Conditions" %}</legend>


  		





  
  166
  
    
<legend>{% trans "Rule Match Conditions" %}</legend>


  		





  167
  167
  
    
<table>


  		





  168
  168
  
    
<input type="hidden" id="id_applier" name="applier" value="{{applier}}"/>


  		





  169
  169
  
    
<tr><th>{{ form.source.label_tag }}</th><td>{{ form.source }}<span class="error">{{ form.source.errors|join:", " }}</span></td></tr>


  		





  ......




  179
  179
  
    
</table>


  		





  180
  180
  
    
</fieldset>


  		





  181
  181
  
    
<fieldset>


  		





  182
  
  
    
<legend>{% trans "Route Actions" %}</legend>


  		





  
  182
  
    
<legend>{% trans "Rule Actions" %}</legend>


  		





  183
  183
  
    
<table>


  		





  184
  184
  
    
<tr><th>{{ form.then.label_tag }}</th><td>{{ form.then }}&nbsp;&nbsp;<button id="new_then_actions">Rate-limit</button><span class="error">{{ form.then.errors|join:", " }}</span></td></tr>


  		





  185
  185
  
    
</table>


  		





  ......




  187
  187
  
    
<fieldset>


  		





  188
  188
  
    
<legend>{% trans "Use/Comments" %}</legend>


  		





  189
  189
  
    
{% blocktrans %}


  		





  190
  
  
    
<p>Give a short description of the intended use of this route, that justifies the parameter selection above. Feel free to include any additional comments.</p>


  		





  
  190
  
    
<p>Give a short description of the intended use of this rule, that justifies the parameter selection above. Feel free to include any additional comments.</p>


  		





  191
  191
  
    
{% endblocktrans %}


  		





  192
  192
  
    
<p>{{ form.comments }}


  		





  193
  193
  
    
{% if form.errors %}<br /><span class="error">{{ form.comments.errors|join:", " }}</span>{% endif %}


  		












  

    
      b/templates/base.html
    
  






  49
  49
  
    
					<img class="logoimg" src="/static/grnet_logo.png">


  		





  50
  50
  
    
				</a>


  		





  51
  51
  
    
				<div id="title">


  		





  52
  
  
    
					<a href="/">Firewall on Demand</a>


  		





  
  52
  
    
					<a href="{% url group-routes %}">Firewall on Demand</a>


  		





  53
  53
  
    
				</div>


  		





  54
  54
  
    
				<div class="loginform">


  		





  55
  55
  
    
					<div id="formcontent">


  		





  ......




  82
  82
  
    
			</div>


  		





  83
  83
  
    
			<div id="content">


  		





  84
  84
  
    
				{% block brcrmb_container %}


  		





  85
  
  
    
				<div class="info_content_title">{% if user.is_authenticated %}<a href="{% url group-routes %}">{% trans "My routes" %}</a>{% endif %}


  		





  
  85
  
    
				<div class="info_content_title">{% if user.is_authenticated %}<a href="{% url group-routes %}">{% trans "My rules" %}</a>{% endif %}


  		





  86
  86
  
    
				{% block breadcrumbs %}{% endblock %}


  		





  87
  87
  
    
				</div>


  		





  88
  88
  
    
				{% if messages %}


  		





  ......




  97
  97
  
    
				{% endblock %}


  		





  98
  98
  
    

  		





  99
  99
  
    
			</div>


  		





  
  100
  
    
			


  		





  100
  101
  
    
			<div id="footer">


  		





  
  102
  
    
				{% comment %}


  		





  101
  103
  
    
			{% if user.is_authenticated %}


  		





  102
  104
  
    
			{% 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 />


  		





  103
  105
  
    
			{% endif %}


  		





  104
  106
  
    
			<a href="http://www.grnet.gr">{% trans "GRNET" %} NOC</a> | <a href="/about/info/">{% trans "Info" %}</a> | <a href="/about/terms-of-service">{% trans "Service Terms" %}</a>


  		





  
  107
  
    
			{% endcomment %}


  		





  105
  108
  
    
			</div>


  		





  106
  109
  
    
	</div>


  		





  107
  110
  
    
</body>


  		












  

    
      b/templates/user_routes.html
    
  






  55
  55
  
    
		$('#routes_table').dataTable( {


  		





  56
  56
  
    
			"bJQueryUI": true,


  		





  57
  57
  
    
			"oLanguage": {


  		





  58
  
  
    
				"sLengthMenu": '{% trans "Display" %} <select><option value="25">25</option><option value="50">50</option><option value="-1">{% trans "All" %}</option></select> routes'


  		





  
  58
  
    
				"sLengthMenu": '{% trans "Display" %} <select><option value="25">25</option><option value="50">50</option><option value="-1">{% trans "All" %}</option></select> rules'


  		





  59
  59
  
    
			},


  		





  60
  60
  
    
			"iDisplayLength": 25,


  		





  61
  61
  
    
	} );


  		





  ......




  113
  113
  
    
	


  		





  114
  114
  
    
</style>


  		





  115
  115
  
    
{% endblock %}


  		





  116
  
  
    
{% block title %}{% trans "My routes" %}{% endblock %}


  		





  
  116
  
    
{% block title %}{% trans "My rules" %}{% endblock %}


  		





  117
  117
  
    
{% block content %}


  		





  118
  118
  
    
<div style="float:left">


  		





  119
  
  
    
	<h3 style="margin-top: 0px;">{% trans "My routes" %}</h3>


  		





  
  119
  
    
	<h3 style="margin-top: 0px;">{% trans "My rules" %}</h3>


  		





  120
  120
  
    
</div>


  		





  121
  121
  
    
<div class='button_place' style="float:right">


  		





  122
  
  
    
	<button id="consolebutton">Console</button> <a href="{% url add-route %}" id="routebutton">Add Route</a>


  		





  
  122
  
    
	<button id="consolebutton">Console</button> <a href="{% url add-route %}" id="routebutton">Add Rule</a>


  		





  123
  123
  
    
</div>


  		





  124
  124
  
    
<table class="display" width="100%" id="routes_table">


  		





  125
  125
  
    
<thead>


  		





  ......




  171
  171
  
    
</table>


  		





  172
  172
  
    

  		





  173
  173
  
    
<div id="dialog" title="Delete Route">


  		





  174
  
  
    
		<p>You are about to delete route <strong><span id="route_to_delete"></span></strong></p>


  		





  175
  
  
    
		<p>Deleting the route will automatically remove the configuration from the network and mark this route as inactive.</p>


  		





  
  174
  
    
		<p>You are about to delete rule <strong><span id="route_to_delete"></span></strong></p>


  		





  
  175
  
    
		<p>Deleting the rule will automatically remove the configuration from the network and mark this route as inactive.</p>


  		





  176
  176
  
    
		<p>Are you sure you want to proceed?</p>


  		





  177
  177
  
    
</div>


  		





  178
  178
  
    
<div id="console" title="Console">


  		












  

    
      b/templates/welcome.html
    
  






  5
  5
  
    
{% block content %}


  		





  6
  6
  
    
<div id="welcome">


  		





  7
  7
  
    
<h3>{% trans "Welcome" %}</h3>


  		





  8
  
  
    
{% blocktrans %}


  		





  9
  8
  
    
<p>Welcome to GRNET's FoD service.</p>


  		





  10
  
  
    
<p>If you are new to the service, take some time to read the service description <a href="/about/info">here</a>.</p>


  		





  
  9
  
    
{% comment %}<p>If you are new to the service, take some time to read the service description <a href="/about/info">here</a>.</p>{% endcomment %}


  		





  11
  10
  
    
<p>For troubleshooting info and remarks do not hesitate to contact GRNET's Helpdesk.</p>


  		





  12
  
  
    
{% endblocktrans %}</p>


  		





  
  11
  
    
</p>


  		





  13
  12
  
    
</div>


  		





  14
  13
  
    

  		





  15
  14
  
    
<div id="loginform">


  		












Also available in:
  Unified diff