Revision: 8365
http://freenas.svn.sourceforge.net/freenas/?rev=8365&view=rev
Author: zippybr
Date: 2011-10-20 17:48:33 +0000 (Thu, 20 Oct 2011)
Log Message:
-----------
more html5 dojo compliant in system templates
Modified Paths:
--------------
branches/dojo16/gui/templates/system/config_restore.html
branches/dojo16/gui/templates/system/config_upload.html
branches/dojo16/gui/templates/system/settings_edit.html
Modified: branches/dojo16/gui/templates/system/config_restore.html
===================================================================
--- branches/dojo16/gui/templates/system/config_restore.html 2011-10-20 17:24:01 UTC (rev 8364)
+++ branches/dojo16/gui/templates/system/config_restore.html 2011-10-20 17:48:33 UTC (rev 8365)
@@ -1,6 +1,6 @@
{% load i18n %}
<form data-dojo-type="dijit.form.Form">
-<script type="dojo/event" event="onSubmit" args="e">
+<script type="dojo/event" data-dojo-event="onSubmit" data-dojo-args="e">
formSubmit(this, e, '{% url system_configrestore %}');
</script>
<table>
@@ -9,11 +9,16 @@
<td>
<button id="submitform" data-dojo-type="dijit.form.Button" type="submit" data-dojo-props="type:'submit'">
{% trans "Yes" %}
- <script type="dojo/method" event="onClick" args="evt">
+ <script type="dojo/method" data-dojo-event="onClick" data-dojo-args="evt">
this.set('label', '{% trans "Please wait..."|force_escape %}');
</script>
</button>
- <button data-dojo-type="dijit.form.Button" onClick="cancelDialog(this);">{% trans "Cancel" %}</button>
+ <button data-dojo-type="dijit.form.Button" class="cancelform">
+ {% trans "Cancel" %}
+ <script type="dojo/method" data-dojo-event="onClick" data-dojo-args="evt">
+ cancelDialog(this);
+ </script>
+ </button>
</td>
</tr>
</table>
Modified: branches/dojo16/gui/templates/system/config_upload.html
===================================================================
--- branches/dojo16/gui/templates/system/config_upload.html 2011-10-20 17:24:01 UTC (rev 8364)
+++ branches/dojo16/gui/templates/system/config_upload.html 2011-10-20 17:48:33 UTC (rev 8365)
@@ -1,8 +1,8 @@
{% load i18n %}
-<form data-dojo-type="dijit.form.Form" enctype="multipart/form-data" id="uploadconfigform", name="uploadconfigform" method="post">
- <script type="dojo/event" event="onSubmit" args="e">
- formSubmit(this, e, '{% url system_configupload %}');
- </script>
+<form data-dojo-type="dijit.form.Form" enctype="multipart/form-data" id="uploadconfigform" name="uploadconfigform" method="post">
+<script type="dojo/event" data-dojo-event="onSubmit" data-dojo-args="e">
+ formSubmit(this, e, '{% url system_configupload %}');
+</script>
<table class="config">
{% if form.non_field_errors %}
<tr>
@@ -12,7 +12,7 @@
</tr>
{% endif %}
{% for field in form %}
- <input data-dojo-type="dijit.form.TextBox" type="hidden" name="csrfmiddlewaretoken" value="{{ csrf_token }}" />
+ <input data-dojo-type="dijit.form.TextBox" type="hidden" data-dojo-props="type: 'hidden'" name="csrfmiddlewaretoken" value="{{ csrf_token }}" />
<tr>
<td>
<label for="{{ field.auto_id }}">
@@ -33,10 +33,15 @@
<p class="btn">
<button class="submitform" data-dojo-type="dijit.form.Button" type="submit" data-dojo-props="type:'submit'">
{% trans "Update" %}
- <script type="dojo/method" event="onClick" args="evt">
+ <script type="dojo/method" data-dojo-event="onClick" data-dojo-args="evt">
this.set('label', '{% trans "Please wait..."|force_escape %}');
</script>
</button>
- <button data-dojo-type="dijit.form.Button" onClick="cancelDialog(this);">{% trans "Cancel" %}</button>
+ <button data-dojo-type="dijit.form.Button" class="cancelform">
+ {% trans "Cancel" %}
+ <script type="dojo/method" data-dojo-event="onClick" data-dojo-args="evt">
+ cancelDialog(this);
+ </script>
+ </button>
</p>
</form>
Modified: branches/dojo16/gui/templates/system/settings_edit.html
===================================================================
--- branches/dojo16/gui/templates/system/settings_edit.html 2011-10-20 17:24:01 UTC (rev 8364)
+++ branches/dojo16/gui/templates/system/settings_edit.html 2011-10-20 17:48:33 UTC (rev 8365)
@@ -3,14 +3,19 @@
{% block buttons_extra %}
<button data-dojo-type="dijit.form.Button" type="button">
{% trans "Factory Restore" %}
- <script type="dojo/method" event="onClick" args="evt">
+ <script type="dojo/method" data-dojo-event="onClick" data-dojo-args="evt">
addObject('{% trans "Restore Config"|force_escape %}', '{% url system_configrestore %}');
</script>
</button>
- <button data-dojo-type="dijit.form.Button" onClick="javascript:window.location='{% url system_configsave %}';">{% trans "Save Config" %}</button>
+ <button data-dojo-type="dijit.form.Button">
+ {% trans "Save Config" %}
+ <script type="dojo/method" data-dojo-event="onClick" data-dojo-args="evt">
+ window.location='{% url system_configsave %}';
+ </script>
+ </button>
<button data-dojo-type="dijit.form.Button" type="button">
{% trans "Upload Config" %}
- <script type="dojo/method" event="onClick" args="evt">
+ <script type="dojo/method" data-dojo-event="onClick" data-dojo-args="evt">
addObject('{% trans "Upload Config"|force_escape %}', '{% url system_configupload %}');
</script>
</button>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
