Merge branch 'dojo16'

Conflicts:
	gui/locale/fr/LC_MESSAGES/django.po
	gui/locale/pt/LC_MESSAGES/django.po
	gui/templates/system/email_edit.html

gui/templates/404.html

@@ -2,8 +2,8 @@
 {% load i18n %}
 
 {% block content %}
-<div dojoType="dijit.layout.TabContainer" style="width:100%;height:400px;">
-    <div dojoType="dijit.layout.ContentPane" title="404">
+<div data-dojo-type="dijit.layout.TabContainer" style="width:100%;height:400px;">
+    <div data-dojo-type="dijit.layout.ContentPane" title="404">
         <h3>{% trans "Page Not Found" %}</h3>
     </div>
 </div>

gui/templates/account/bsdgroup2user_form.html

 {% load i18n %}
-<form dojoType="dijit.form.Form">
-<script type="dojo/event" event="onSubmit" args="e">
+<form data-dojo-type="dijit.form.Form">
+<script type="dojo/event" data-dojo-event="onSubmit" data-dojo-args="e">
     formSubmit(this, e, '{{ url }}');
 </script>
     <table>
         {{ form }}
     </table>
-    <button class="submitform" dojoType="dijit.form.Button" type="submit">
+    <button class="submitform" data-dojo-type="dijit.form.Button" type="submit" data-dojo-props="type:'submit'">
         {% trans "OK" %}
-        <script type="dojo/method" event="onClick" args="evt">
-            this.set('label', '{% trans "Please wait..."|force_escape %}');
+        <script type="dojo/method" data-dojo-event="onClick" data-dojo-args="evt">
+            this.set('label', '{% trans "Please wait..."|force_escape|force_escape %}');
+        </script>
+    </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>
-    <button dojoType="dijit.form.Button" onClick="cancelDialog(this);">{% trans "Cancel" %}</button>
 </form>

gui/templates/account/bsdgroups.html

@@ -17,29 +17,29 @@
 		{{ g.bsdgrp_group }}
 	    </td>
 	    <td>
-                <button dojoType="dijit.form.Button" type="button">
+                <button data-dojo-type="dijit.form.Button" type="button">
                     {% trans "Members" %}
-                    <script type="dojo/method" event="onClick" args="evt">
-                        editObject('{% trans "Members"|force_escape %}', '{% url account_bsdgroup_members object_id=g.id %}', [this,]);
+                    <script type="dojo/method" data-dojo-event="onClick" data-dojo-args="evt">
+                        editObject('{% trans "Members"|force_escape|force_escape %}', '{% url account_bsdgroup_members object_id=g.id %}', [this,]);
                     </script>
                 </button>
 	    </td>
 	    <td>
 		{% if not g.bsdgrp_builtin %}
-                <button dojoType="dijit.form.Button" type="button">
+                <button data-dojo-type="dijit.form.Button" type="button">
                     {% trans "Modify Group" %}
-                    <script type="dojo/method" event="onClick" args="evt">
-                        editObject('{% trans "Modify Group"|force_escape %}', '{{ g.get_edit_url }}?deletable=false', [this,]);
+                    <script type="dojo/method" data-dojo-event="onClick" data-dojo-args="evt">
+                        editObject('{% trans "Modify Group"|force_escape|force_escape %}', '{{ g.get_edit_url }}?deletable=false', [this,]);
                     </script>
                 </button>
 		{% endif %}
 	    </td>
 	    <td>
 		{% if not g.bsdgrp_builtin %}
-                <button dojoType="dijit.form.Button" type="button">
+                <button data-dojo-type="dijit.form.Button" type="button">
                     {% trans "Delete Group" %}
-                    <script type="dojo/method" event="onClick" args="evt">
-                        editObject('{% trans "Delete Group"|force_escape %}', '{{ g.get_delete_url }}', [this,]);
+                    <script type="dojo/method" data-dojo-event="onClick" data-dojo-args="evt">
+                        editObject('{% trans "Delete Group"|force_escape|force_escape %}', '{{ g.get_delete_url }}', [this,]);
                     </script>
                 </button>
 		{% endif %}
@@ -55,10 +55,10 @@
 	<tr>
 	    <td colspan="5">
                 <div style="padding:12px;">
-                    <button dojoType="dijit.form.Button" type="button">
+                    <button data-dojo-type="dijit.form.Button" type="button">
                         {% trans "Add New Group" %}
-                        <script type="dojo/method" event="onClick" args="evt">
-                            editObject('{% trans "Add New Group"|force_escape %}', '{% url freeadmin_model_add app="account",model="bsdGroups" %}', [this,]);
+                        <script type="dojo/method" data-dojo-event="onClick" data-dojo-args="evt">
+                            editObject('{% trans "Add New Group"|force_escape|force_escape %}', '{% url freeadmin_model_add app="account",model="bsdGroups" %}', [this,]);
                         </script>
                     </button>
                 </div>
@@ -80,10 +80,10 @@
 		{{ g.bsdgrp_group }}
 	    </td>
 	    <td colspan="3">
-                <button dojoType="dijit.form.Button" type="button">
+                <button data-dojo-type="dijit.form.Button" type="button">
                     {% trans "Members" %}
-                    <script type="dojo/method" event="onClick" args="evt">
-                        editObject('{% trans "Members"|force_escape %}', '{% url account_bsdgroup_members object_id=g.id %}');
+                    <script type="dojo/method" data-dojo-event="onClick" data-dojo-args="evt">
+                        editObject('{% trans "Members"|force_escape|force_escape %}', '{% url account_bsdgroup_members object_id=g.id %}');
                     </script>
                 </button>
 	    </td>

gui/templates/account/bsdusers.html

@@ -29,33 +29,33 @@
 		{{ u.bsdusr_shell }}
 	    </td>
 	    <td>
-                <button dojoType="dijit.form.Button" type="button">
+                <button data-dojo-type="dijit.form.Button" type="button">
                     {% trans "Change Password" %}
-                    <script type="dojo/method" event="onClick" args="evt">
-                        editObject('{% trans "Change Password"|force_escape %}', '{% url freeadmin_model_edit app="account",model="bsdUsers",oid=u.id,mf="bsdUserPasswordForm" %}?deletable=false', [this,]);
+                    <script type="dojo/method" data-dojo-event="onClick" data-dojo-args="evt">
+                        editObject('{% trans "Change Password"|force_escape|force_escape %}', '{% url freeadmin_model_edit app="account",model="bsdUsers",oid=u.id,mf="bsdUserPasswordForm" %}?deletable=false', [this,]);
                     </script>
                 </button>
 	    </td>
 	    <td>
-                <button dojoType="dijit.form.Button" type="button">
+                <button data-dojo-type="dijit.form.Button" type="button">
                     {% trans "Modify User" %}
-                    <script type="dojo/method" event="onClick" args="evt">
-                        editObject('{% trans "Modify User"|force_escape %}', '{{ u.get_edit_url }}?deletable=false', [this,]);
+                    <script type="dojo/method" data-dojo-event="onClick" data-dojo-args="evt">
+                        editObject('{% trans "Modify User"|force_escape|force_escape %}', '{{ u.get_edit_url }}?deletable=false', [this,]);
                     </script>
                 </button>
-                <button dojoType="dijit.form.Button" type="button">
+                <button data-dojo-type="dijit.form.Button" type="button">
                     {% trans "Auxiliary Groups" %}
-                    <script type="dojo/method" event="onClick" args="evt">
-                        editObject('{% trans "Auxiliary Groups"|force_escape %}', '{% url account_bsduser_groups object_id=u.id %}', [this,]);
+                    <script type="dojo/method" data-dojo-event="onClick" data-dojo-args="evt">
+                        editObject('{% trans "Auxiliary Groups"|force_escape|force_escape %}', '{% url account_bsduser_groups object_id=u.id %}', [this,]);
                     </script>
                 </button>
 	    </td>
 	    <td>
 		{% if not u.bsdusr_builtin %}
-                <button dojoType="dijit.form.Button" type="button">
+                <button data-dojo-type="dijit.form.Button" type="button">
                     {% trans "Remove User" %}
-                    <script type="dojo/method" event="onClick" args="evt">
-                        editObject('{% trans "Delete User"|force_escape %}', '{{ u.get_delete_url }}', [this,]);
+                    <script type="dojo/method" data-dojo-event="onClick" data-dojo-args="evt">
+                        editObject('{% trans "Delete User"|force_escape|force_escape %}', '{{ u.get_delete_url }}', [this,]);
                     </script>
                 </button>
 		{% endif %}
@@ -69,10 +69,10 @@
 	<tr>
 	    <td colspan="8">
                 <div style="padding:12px;">
-                    <button dojoType="dijit.form.Button" type="button">
+                    <button data-dojo-type="dijit.form.Button" type="button">
                         {% trans "Add New User" %}
-                        <script type="dojo/method" event="onClick" args="evt">
-                            editObject('{% trans "Add New User"|force_escape %}', '{% url freeadmin_model_add app="account",model="bsdUsers" %}', [this,]);
+                        <script type="dojo/method" data-dojo-event="onClick" data-dojo-args="evt">
+                            editObject('{% trans "Add New User"|force_escape|force_escape %}', '{% url freeadmin_model_add app="account",model="bsdUsers" %}', [this,]);
                         </script>
                     </button>
                 </div>
@@ -108,32 +108,32 @@
 		{{ u.bsdusr_shell }}
 	    </td>
 	    <td>
-                <button dojoType="dijit.form.Button" type="button">
+                <button data-dojo-type="dijit.form.Button" type="button">
                     {% trans "Change Password" %}
-                    <script type="dojo/method" event="onClick" args="evt">
-                        editObject('{% trans "Change Password"|force_escape %}', '{% url freeadmin_model_edit app="account",model="bsdUsers",oid=u.id,mf="bsdUserPasswordForm" %}?deletable=false', [this,]);
+                    <script type="dojo/method" data-dojo-event="onClick" data-dojo-args="evt">
+                        editObject('{% trans "Change Password"|force_escape|force_escape %}', '{% url freeadmin_model_edit app="account",model="bsdUsers",oid=u.id,mf="bsdUserPasswordForm" %}?deletable=false', [this,]);
                     </script>
                 </button>
 	    </td>
 	    <td>
-                <button dojoType="dijit.form.Button" type="button">
+                <button data-dojo-type="dijit.form.Button" type="button">
                     {% trans "Modify User" %}
-                    <script type="dojo/method" event="onClick" args="evt">
-                        editObject('{% trans "Modify User"|force_escape %}', '{{ u.get_edit_url }}?deletable=false', [this,]);
+                    <script type="dojo/method" data-dojo-event="onClick" data-dojo-args="evt">
+                        editObject('{% trans "Modify User"|force_escape|force_escape %}', '{{ u.get_edit_url }}?deletable=false', [this,]);
                     </script>
                 </button>
-                <button dojoType="dijit.form.Button" type="button">
+                <button data-dojo-type="dijit.form.Button" type="button">
                     {% trans "Auxiliary Groups" %}
-                    <script type="dojo/method" event="onClick" args="evt">
-                        editObject('{% trans "Auxiliary Groups"|force_escape %}', '{% url account_bsduser_groups object_id=u.id %}', [this,]);
+                    <script type="dojo/method" data-dojo-event="onClick" data-dojo-args="evt">
+                        editObject('{% trans "Auxiliary Groups"|force_escape|force_escape %}', '{% url account_bsduser_groups object_id=u.id %}', [this,]);
                     </script>
                 </button>
 	    </td>
 	    <td>
-                <button dojoType="dijit.form.Button" type="button">
+                <button data-dojo-type="dijit.form.Button" type="button">
                     {% trans "Change E-mail" %}
-                    <script type="dojo/method" event="onClick" args="evt">
-                        editObject('{% trans "Change E-mail"|force_escape %}', '{% url freeadmin_model_edit app="account",model="bsdUsers",oid=u.id,mf="bsdUserEmailForm" %}?deletable=false', [this,]);
+                    <script type="dojo/method" data-dojo-event="onClick" data-dojo-args="evt">
+                        editObject('{% trans "Change E-mail"|force_escape|force_escape %}', '{% url freeadmin_model_edit app="account",model="bsdUsers",oid=u.id,mf="bsdUserEmailForm" %}?deletable=false', [this,]);
                     </script>
                 </button>
 	    </td>

gui/templates/account/changeform.html

 {% load i18n %}
-<form dojoType="dijit.form.Form">
-<script type="dojo/event" event="onSubmit" args="e">
+<form data-dojo-type="dijit.form.Form">
+<script type="dojo/event" data-dojo-event="onSubmit" data-dojo-args="e">
     formSubmit(this, e, '{% url account_changeform %}');
 </script>
      <table class="config">
@@ -22,11 +22,11 @@
          </tr>
         {% endfor %}
      </table>
-     <button style="margin-top:16px;" dojoType="dijit.form.Button" type="submit" class="submitform">
+     <button style="margin-top:16px;" data-dojo-type="dijit.form.Button" type="submit" data-dojo-props="type:'submit'" class="submitform">
         {% trans "Change Admin User" %}
-         <script type="dojo/method" event="onClick" args="evt">
+         <script type="dojo/method" data-dojo-event="onClick" data-dojo-args="evt">
              dojo.attr(this.domNode, "oldlabel", this.get('label'));
-             this.set('label', '{% trans "Please wait..."|force_escape %}');
+             this.set('label', '{% trans "Please wait..."|force_escape|force_escape %}');
          </script>
      </button>
  </form>

gui/templates/account/index.html

 {% load i18n %}
-<div dojoType="dijit.layout.TabContainer" title="{% trans "My Account" %}"  nested="true" style="width:100%;" doLayout="true" id="tab_account">
-        
-    <div dojoType="dijit.layout.ContentPane" title="{% trans "Change Admin User" %}" tab="account.ChangeAdmin" {% if focus_form == "account.ChangeAdmin" %} selected="true"{% endif %} href="{% url account_changeform %}" class="objrefresh">
-        </div>
-
-        <div dojoType="dijit.layout.ContentPane" title="{% trans "Change Password" %}" tab="account.ChangePass" {% if focus_form == "account.ChangePass" %} selected="true"{% endif %} href="{% url account_passform %}" class="objrefresh">
-        </div>
+<div data-dojo-type="dijit.layout.TabContainer" data-dojo-props="title: '{% trans "My Account"|force_escape|force_escape %}', nested: true, doLayout: true" style="width:100%;" id="tab_account">
+    <div data-dojo-type="dijit.layout.ContentPane" data-dojo-props="title: '{% trans "Change Admin User"|force_escape|force_escape %}'
+    {% if focus_form == "account.ChangeAdmin" %}, selected: true{% endif %},
+    href: '{% url account_changeform %}'" class="objrefresh" tab="account.ChangeAdmin">
+    </div>
 
-        <div dojoType="dijit.layout.ContentPane" title="{% trans "Groups" %}" tab="account.bsdGroups.View" {% if focus_form == "account.bsdGroups.View" %}selected="true"{% endif %} class="objrefresh data_account_bsdGroups" href="{% url account_bsdgroup %}" style="overflow-y:scroll;" refreshOnShow="true">
-        </div>
+    <div data-dojo-type="dijit.layout.ContentPane" data-dojo-props="title: '{% trans "Change Password"|force_escape|force_escape %}'
+    {% if focus_form == "account.ChangePass" %}, selected: true{% endif %},
+    href: '{% url account_passform %}'" class="objrefresh" tab="account.ChangePass">
+    </div>
 
-        <div dojoType="dijit.layout.ContentPane" title="{% trans "Users" %}" tab="account.bsdUsers.View" {% if focus_form == "account.bsdUsers.View" %}selected="true"{% endif %} class="objrefresh data_account_bsdUsers" href="{% url account_bsduser %}" style="overflow-y:scroll;" refreshOnShow="true">
-        </div>
+    <div data-dojo-type="dijit.layout.ContentPane" data-dojo-props="title: '{% trans "Groups"|force_escape|force_escape %}'
+    {% if focus_form == "account.bsdGroups.View" %}, selected: true{% endif %},
+    href: '{% url account_bsdgroup %}',
+    refreshOnShow: true" class="objrefresh data_account_bsdGroups" style="overflow-y:scroll;" tab="account.bsdGroups.View">
+    </div>
 
+    <div data-dojo-type="dijit.layout.ContentPane" data-dojo-props="title: '{% trans "Users"|force_escape|force_escape %}'
+    {% if focus_form == "account.bsdUsers.View" %}, selected: true{% endif %},
+    href: '{% url account_bsduser %}',
+    refreshOnShow: true" class="objrefresh data_account_bsdUsers" style="overflow-y:scroll;" tab="account.bsdUsers.View">
     </div>
+
+</div>

gui/templates/account/passform.html

 {% load i18n %}
-<form dojoType="dijit.form.Form">
-<script type="dojo/event" event="onSubmit" args="e">
+<form data-dojo-type="dijit.form.Form">
+<script type="dojo/event" data-dojo-event="onSubmit" data-dojo-args="e">
     formSubmit(this, e, '{% url account_passform %}');
 </script>
     <table class="config">
@@ -22,11 +22,11 @@
         </tr>
     {% endfor %}
     </table>
-    <button style="margin-top:16px;" dojoType="dijit.form.Button" type="submit" class="submitform" >
+    <button style="margin-top:16px;" data-dojo-type="dijit.form.Button" type="submit" data-dojo-props="type:'submit'" class="submitform" >
         {% trans "Change Admin Password" %}
          <script type="dojo/method" event="onClick" args="evt">
              dojo.attr(this.domNode, "oldlabel", this.get('label'));
-             this.set('label', '{% trans "Please wait..."|force_escape %}');
+             this.set('label', '{% trans "Please wait..."|force_escape|force_escape %}');
          </script>
     </button>
 </form>

gui/templates/base.html

@@ -16,8 +16,8 @@
 {% block dojango_header_extra %}{% endblock %}
 </head>
 <body class="{{ DOJANGO.THEME }}">
-    <div dojoType="dijit.layout.BorderContainer" id="outer" style="width:100%; height:100%" gutters="false">
-        <div dojoType="dijit.layout.ContentPane" style="height:125px;overflow:hidden;" region="top">
+    <div data-dojo-type="dijit.layout.BorderContainer" id="outer" style="width:100%; height:100%" data-dojo-props="gutters: false">
+        <div data-dojo-type="dijit.layout.ContentPane" style="height:125px;overflow:hidden;" data-dojo-props="region: 'top'">
             <div id="page-header">
                  <div>
                      <a href="/" title="{{ sw_name }}&trade;"><img src="{{ STATIC_URL }}images/ui/freenas-logo.png" alt="{{ sw_name }}&trade;" style="padding-left:10px;"/></a>
@@ -28,20 +28,20 @@
             {% endblock %}
         </div>
 {% block dojango_content %}
-        <div dojoType="dijit.layout.BorderContainer" id="inter" style="width:272px; height:100%" region="left" gutters="false" splitter="true">
-            <div dojoType="dijit.layout.ContentPane" id="colexpand"
-                region="top" style="height:20px;">
+        <div data-dojo-type="dijit.layout.BorderContainer" id="inter" style="width:272px; height:100%" data-dojo-props="region:'left', gutters:false, splitter:true">
+            <div data-dojo-type="dijit.layout.ContentPane" id="colexpand"
+                data-dojo-props="region:'top'" style="height:20px;">
                 <a href="javascript:void(0);" onClick="dijit.byId('mytree').expandAll()">{% trans "expand all" %}</a> &nbsp; 
                 <a href="javascript:void(0);" onClick="dijit.byId('mytree').collapseAll()">{% trans "collapse all" %}</a>
             </div>
-            <div dojoType="dijit.layout.ContentPane" id="menupane"
-                region="center">
+            <div data-dojo-type="dijit.layout.ContentPane" id="menupane"
+                data-dojo-props="region:'center'">
             </div>
         </div>
-        <div dojoType="dijit.layout.TabContainer" region="center" id="content">
+        <div data-dojo-type="dijit.layout.TabContainer" data-dojo-props="region:'center'" id="content">
         </div>
 {% endblock %}
-        <div dojoType="dijit.layout.ContentPane" style="height:80px;width:100%;padding-bottom:0px;" region="bottom">
+        <div data-dojo-type="dijit.layout.ContentPane" style="height:80px;width:100%;padding-bottom:0px;" data-dojo-props="region:'bottom'">
              {% block footer %}
              {% include "footer.html" %}
              {% endblock %}

gui/templates/footer.html

-<div dojoType="dijit.layout.BorderContainer" id="footer" style="width:100%; " gutters="false">
-<div dojoType="dijit.layout.ContentPane" style="color:#ccc;margin-left:10px;margin-top:35px;width:225px;overflow:hidden;" region="left">
+<div data-dojo-type="dijit.layout.BorderContainer" id="footer" style="width:100%; " data-dojo-props="gutters:false">
+<div data-dojo-type="dijit.layout.ContentPane" style="color:#ccc;margin-left:10px;margin-top:35px;width:225px;overflow:hidden;" data-dojo-props="region:'left'">
 {{ sw_name }}&trade; &copy; 2011 <a href="http://www.ixsystems.com" target="_blank" title="iXsystems, Inc.">iXsystems, Inc.</a>
 </div>
-<div dojoType="dijit.layout.ContentPane" style="margin-left:auto;margin-right:auto;display:block;width:80%;overflow:hidden;" region="center">
+<div data-dojo-type="dijit.layout.ContentPane" style="margin-left:auto;margin-right:auto;display:block;width:80%;overflow:hidden;" data-dojo-props="region:'center'">
 {% if consolemsg %}
 <pre class="message" id="msg_output" onClick="dijit.byId('log_dialog').show();"></pre>
 <script type="text/javascript" src="{{ STATIC_URL }}lib/js/msg.js"></script>
 {% endif %}
 </div>
-<div dojoType="dijit.layout.ContentPane" style="width:125px;overflow:hidden;" region="right">
+<div data-dojo-type="dijit.layout.ContentPane" style="width:125px;overflow:hidden;" data-dojo-props="region:'right'">
 <img src="{{ STATIC_URL }}ix/ix_logo.png" border="0" alt="iXsystems, Inc." align="right" style="padding-right:10px;"/></a>
 </div>
 </div>

gui/templates/freeadmin/directory_browser.html

 {% load i18n %}
-<input dojoType="dijit.form.TextBox" name="{{ name }}" value="{{ value|default_if_none:"" }}" id="{{ attrs.id }}" />
-<button dojoType="dijit.form.Button" label="{% trans "Browse" %}">
-    <script type="dojo/connect" event="onClick">
-    if(this.get('label') == '{% trans "Close"|force_escape %}') {
+<input data-dojo-type="dijit.form.TextBox" data-dojo-props="name: '{{ name|force_escape }}', value: '{{ value|default_if_none:"" }}'" id="{{ attrs.id }}" />
+<button data-dojo-type="dijit.form.Button" data-dojo-props="label: '{% trans "Browse"|force_escape|force_escape %}'">
+    <script type="dojo/connect" data-dojo-event="onClick">
+    if(this.get('label') == '{% trans "Close"|force_escape|force_escape %}') {
         dojo.style('{{ attrs.id }}_container', 'display', 'none');
-        this.set('label', '{% trans "Browse"|force_escape %}');
+        this.set('label', '{% trans "Browse"|force_escape|force_escape %}');
      } else {
         dojo.style('{{ attrs.id }}_container', 'display', 'block');
-        this.set('label', '{% trans "Close"|force_escape %}');
+        this.set('label', '{% trans "Close"|force_escape|force_escape %}');
      }
      </script>
 </button>
 
 <div id="{{ attrs.id }}_container" class="treecontainer" style="display: none">
     <div
-        dojoType="freeadmin.tree.JsonRestStore"
-        target="{% if dirsonly %}{% url system_dirbrowser path="/" %}{% else %}{% url system_filebrowser path="/" %}{% endif %}"
-        labelAttribute="name"
-        jsId="{{ attrs.id }}_store">
+        data-dojo-type="freeadmin.tree.JsonRestStore"
+        data-dojo-props="target: '{% if dirsonly %}{% url system_dirbrowser path="/" %}{% else %}{% url system_filebrowser path="/" %}{% endif %}',
+        labelAttribute: 'name'"
+        data-dojo-id="{{ attrs.id }}_store">
     </div>
+<!--
+    <div data-dojo-type="freeadmin.tree.ForestStoreModel"
+         data-dojo-id="{{ attrs.id }}_model"
+         data-dojo-props="store: {{ attrs.id }}_store,
+         query: {},
+         rootId: 'items',
+         rootLabel: '/mnt',
+         childrenAttrs: 'children',
+         deferItemLoadingUntilExpand: true">-->
     <div dojoType="freeadmin.tree.ForestStoreModel"
          jsId="{{ attrs.id }}_model"
          store="{{ attrs.id }}_store"
@@ -29,11 +38,10 @@
          deferItemLoadingUntilExpand="true">
     </div>
     <div id="{{ attrs.id }}_tree"
-        dojoType="freeadmin.tree.TreeLazy"
-        model="{{ attrs.id }}_model"
-        persist="false"
+        data-dojo-type="freeadmin.tree.TreeLazy"
+        data-dojo-props="model: {{ attrs.id }}_model, persist: false"
         style="height: 250px;">
-        <script type="dojo/connect" event="onClick" args="obj, node, ev">
+        <script type="dojo/connect" data-dojo-event="onClick" data-dojo-args="obj, node, ev">
             if(node.item.path) {
                 dojo.attr('{{ attrs.id }}', 'value', node.item.path);
             } else {

gui/templates/freeadmin/generic_model_add.html

 {% load i18n freeadmin %}
-<form dojoType="dijit.form.Form">
-<script type="dojo/event" event="onSubmit" args="e">
+<form data-dojo-type="dijit.form.Form">
+<script type="dojo/event" data-dojo-event="onSubmit" data-dojo-args="e">
     formSubmit(this, e, '{% url freeadmin_model_add app=app,model=model,mf=mf|default_if_none:"" %}');
 </script>
 <table> 
@@ -23,17 +23,23 @@
     {% endblock %}
     </td></tr>
 <tr><td colspan="2">
-    <button class="submitform" dojoType="dijit.form.Button" type="submit">
+    <button class="submitform" data-dojo-type="dijit.form.Button" data-dojo-props="type: 'submit'">
         <script type="dojo/method">
             {{ extra_js }}
         </script>
         {% trans "OK" %}
-        <script type="dojo/method" event="onClick" args="evt">
+        <script type="dojo/method" data-dojo-event="onClick" data-dojo-args="evt">
             dojo.attr(this.domNode, "oldlabel", this.get('label'));
-            this.set('label', '{% trans "Please wait..."|force_escape %}');
+            this.set('label', '{% trans "Please wait..."|force_escape|force_escape %}');
         </script>
     </button>
-    <button dojoType="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>
 </form>

gui/templates/freeadmin/generic_model_add_ok.html

-{% load i18n %}{{ verbose_name }} {% trans "successfully added" %}

gui/templates/freeadmin/generic_model_datagrid.html

-<div dojoType="dojo.data.ItemFileReadStore" jsId="store1" url="{% url freeadmin_model_datagrid_json app=app,model=model %}?inclusions=&start=0&count=200" >
+<div data-dojo-type="dojo.data.ItemFileReadStore" jsId="store1" url="{% url freeadmin_model_datagrid_json app=app,model=model %}?inclusions=&start=0&count=200" >
     </div>
 </span>
-<table dojoType="dojox.grid.DataGrid" store="store1" 
+<table data-dojo-type="dojox.grid.DataGrid" store="store1" 
 clientSort="true" style="width: 100%; height: 100%;" rowSelector="25px">
     <script type="dojo/method" event="onRowDblClick" args="evt">
   	var item = this.selection.getSelected()[0];

gui/templates/freeadmin/generic_model_delete.html

 {% load i18n %}
-<form dojoType="dijit.form.Form">
-<script type="dojo/event" event="onSubmit" args="e">
+<form data-dojo-type="dijit.form.Form">
+<script type="dojo/event" data-dojo-event="onSubmit" data-dojo-args="e">
     {% block onsubmit %}
     formSubmit(this, e, '{% url freeadmin_model_delete app=app,model=model,oid=oid %}');
     {% endblock %}
@@ -12,14 +12,19 @@
     <tr><td>{% trans "Are you sure you want to delete?" %}</td></tr>
     <tr>
         <td>
-            <button class="submitform" dojoType="dijit.form.Button" type="submit">
+            <button class="submitform" data-dojo-type="dijit.form.Button" data-dojo-props="type: 'submit'">
                 {% trans "Yes" %}
                 <script type="dojo/method" event="onClick" args="evt">
-                    this.set('label', '{% trans "Please wait..."|force_escape %}');
+                    this.set('label', '{% trans "Please wait..."|force_escape|force_escape %}');
                 </script>
             </button>
 
-            <button dojoType="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>

gui/templates/freeadmin/generic_model_delete_ok.html

-{% load i18n %}<p align="center">{{ verbose_name }} {% trans "successfully deleted" %}</p>

gui/templates/freeadmin/generic_model_edit.html

 {% load i18n freeadmin %}
-<form dojoType="dijit.form.Form" encType="multipart/form-data">
-<script type="dojo/event" event="onSubmit" args="e">
-            formSubmit(this, e, '{% url freeadmin_model_edit app=app,model=model,oid=oid,mf=mf|default_if_none:"" %}{% if inline %}?inline=true{% endif %}');
+<form data-dojo-type="dijit.form.Form" encType="multipart/form-data">
+<script type="dojo/event" data-dojo-event="onSubmit" data-dojo-args="e">
+     formSubmit(this, e, '{% url freeadmin_model_edit app=app,model=model,oid=oid,mf=mf|default_if_none:"" %}{% if inline %}?inline=true{% endif %}');
 </script>{% if inline and saved %}<span class="saved">{% trans "Your changes have been successfully updated!" %}</span>{% endif %}
 <table>
     {% block form %}
@@ -26,7 +26,7 @@
     {% block buttons %}
     <tr>
         <td colspan="2">
-            <button class="submitform" dojoType="dijit.form.Button" type="submit">
+            <button class="submitform" data-dojo-type="dijit.form.Button" data-dojo-props="type:'submit'">
                 <script type="dojo/method">
                         {{ extra_js }}
                 </script>
@@ -35,17 +35,22 @@
                 {% else %}
                 {% trans "OK" %}
                 {% endif %}
-                <script type="dojo/method" event="onClick" args="evt">
+                <script type="dojo/method" data-dojo-event="onClick" data-dojo-args="evt">
                     dojo.attr(this.domNode, "oldlabel", this.get('label'));
-                    this.set('label', '{% trans "Please wait..."|force_escape %}');
+                    this.set('label', '{% trans "Please wait..."|force_escape|force_escape %}');
                 </script>
             </button>
             {% if not inline %}
-            <button dojoType="dijit.form.Button" class="cancelform" 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>
             {% endif %}
             {% if deletable == False %}
-            <button dojoType="dijit.form.Button" >
-                <script type="dojo/event" event="onClick" args="e">
+            <button data-dojo-type="dijit.form.Button" >
+                <script type="dojo/event" data-dojo-event="onClick" data-dojo-args="e">
                     try {
                         var form = getForm(this);
                         dojo.query('input[type=button],input[type=submit]', form.domNode).forEach(

gui/templates/freeadmin/generic_model_edit_ok.html

-{% load i18n %}<span id="success" align="center">{{ verbose_name }} {% trans "successfully edited" %}.</a>

gui/templates/freeadmin/index.html

@@ -28,47 +28,58 @@ dojo.addOnLoad(function(){
 
 {% block dojango_content %}
 {{ block.super }}
-<div id="top_dialog" dojoType="dijit.Dialog" title="{% trans "Running Processes" %}" style="min-height:400px;">
-    <script type="dojo/method" event="onShow">
+<div id="top_dialog" data-dojo-type="dijit.Dialog" data-dojo-props="title: '{% trans "Running Processes"|force_escape|force_escape %}'" style="min-height:400px;">
+    <script type="dojo/method" data-dojo-event="onShow">
         ttop.stop();
         ttop.start();
     </script>
     <pre class="ix" id="top_output">{% trans "Loading..." %}</pre>
 </div>
-<div id="log_dialog" dojoType="dijit.Dialog" title="/var/log/messages" style="min-height:400px;background-color:black;">
-    <script type="dojo/method" event="onShow">
-        document.getElementById('msgfull_output').innerHTML = '{% trans "Loading..."|force_escape %}';
+<div id="log_dialog" data-dojo-type="dijit.Dialog" dojo-data-props="title: '/var/log/messages'" style="min-height:400px;background-color:black;">
+    <script type="dojo/method" data-dojo-event="onShow">
+        document.getElementById('msgfull_output').innerHTML = '{% trans "Loading..."|force_escape|force_escape %}';
     t.stop();
     t.start();
     loadlog(true);
     </script>
     <pre class="ix" id="msgfull_output" style="max-height:400px;overflow-y:auto;border:none;word-wrap: break-word;">{% trans "Loading..." %}</pre>
-    <input id="stopmsgrefresh" dojoType="dijit.form.CheckBox" /><label for="stopmsgrefresh" style="color:white;">Stop refresh</label>
+    <input id="stopmsgrefresh" data-dojo-type="dijit.form.CheckBox" /><label for="stopmsgrefresh" style="color:white;">Stop refresh</label>
 </div>
-<div dojoType="dijit.Dialog" id="rebootDialog" title="{% trans "Reboot the System" %}" >
+<div data-dojo-type="dijit.Dialog" id="rebootDialog" data-dojo-props="title: '{% trans "Reboot the System"|force_escape|force_escape %}'" >
     <h3>{% trans "Warning!" %}</h3>
     <p>{% trans "You are about to <strong>REBOOT</strong> the system, what would you like to do?" %}</p>
-                <button dojoType="dijit.form.Button" type="button" onClick="dijit.byId('rebootDialog').hide();">
+                <button data-dojo-type="dijit.form.Button" type="button">
+                    <script type="dojo/method" data-dojo-event="onClick" data-dojo-args="evt">
+                    dijit.byId('rebootDialog').hide();
+                    </script>
                     {% trans "Cancel" %}
                 </button>
-                <button dojoType="dijit.form.Button" type="submit" onClick="window.location='{% url system_reboot %}'">
+                <button data-dojo-type="dijit.form.Button" type="button">
+                    <script type="dojo/method" data-dojo-event="onClick" data-dojo-args="evt">
+                    window.location='{% url system_reboot %}';
+                    </script>
                     {% trans "Reboot" %}
                 </button>
 </div>
-             
-<div dojoType="dijit.Dialog" id="shutdownDialog" title="{% trans "Shutdown the System" %}" >
+
+<div data-dojo-type="dijit.Dialog" id="shutdownDialog" data-dojo-props="title: '{% trans "Shutdown the System"|force_escape|force_escape %}'">
     <h3>{% trans "Warning!" %}</h3>
     <p>{% trans "You are about to <strong>SHUTDOWN</strong> the system, what would you like to do?" %}</p>
-                <button dojoType="dijit.form.Button" type="button"
-                    onClick="dijit.byId('shutdownDialog').hide();">
+                <button data-dojo-type="dijit.form.Button" type="button">
+                    <script type="dojo/method" data-dojo-event="onClick" data-dojo-args="evt">
+                    dijit.byId('shutdownDialog').hide();
+                    </script>
                     {% trans "Cancel" %}
                 </button>
-                <button dojoType="dijit.form.Button" type="button" onClick="window.location='{% url system_shutdown %}'">
+                <button data-dojo-type="dijit.form.Button" type="button">
+                    <script type="dojo/method" data-dojo-event="onClick" data-dojo-args="evt">
+                    window.location='{% url system_shutdown %}';
+                    </script>
                     {% trans "Shutdown" %}
                 </button>
 </div>
 
-<div dojoType="dijit.Dialog" id="helpDialog" title="&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{% trans "Help & Support" %}"  style="background:#fff;width:400px;">
+<div data-dojo-type="dijit.Dialog" id="helpDialog" data-dojo-props="title: '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{% trans "Help & Support"|force_escape|force_escape %}'"  style="background:#fff;width:400px;">
     <img src="{{ STATIC_URL }}images/ui/menu/help.png" style="float:left;position:relative;top:-36px;right:5px;">
     <h2>{{ sw_version }}</h2>
     <div style="float:left;">
@@ -102,7 +113,7 @@ dojo.addOnLoad(function(){
         <li><a href="http://support.freenas.org" title="FreeNAS Bug Tracker" target="_blank">{% trans "Bug Tracker" %}</a></li>
     </ul>
     </div>
-   
+
     <div style="float:left;padding-left:24px;">
     <h3>{% trans "Documentation" %}</h3>
     <ul>