# HG changeset patch # User Sverre Rabbelier # Date 1234729629 0 # Node ID 6be502a1bcc6309240757e3457c2e9e3e5b2958a # Parent 3dd1507aa723c9babb6c164234abcb6c213ce291 Be modular when loading the various JS modules Patch by: Sverre Rabbelier diff -r 3dd1507aa723 -r 6be502a1bcc6 app/soc/templates/soc/base.html --- a/app/soc/templates/soc/base.html Sun Feb 15 20:26:15 2009 +0000 +++ b/app/soc/templates/soc/base.html Sun Feb 15 20:27:09 2009 +0000 @@ -17,8 +17,15 @@ {% block stylesheet %} + {% if uses_jq_autocomplete %} + {% endif %} + {% if uses_jq_thickbox %} + {% endif %} + {% if uses_jq_datetimepicker %} + + {% endif %} {% endblock %} {% block page_title %} @@ -29,16 +36,51 @@ {% endif %} {% endblock %} - - - - - - - - - {% block scripts %}{% endblock %} + +{% block scripts %} + {% if uses_jq %} + + {% endif %} + {% if uses_jq_bt %} + + {% endif %} + {% if uses_menu %} + + {% endif %} + {% if uses_jq_bt %} + + {% endif %} + {% if uses_jq_bgiframe %} + + {% endif %} + {% if uses_jq_ajaqQueue %} + + {% endif %} + {% if uses_jq_autocomplete %} + + {% endif %} + {% if uses_jq_thickbox %} + + {% endif %} + {% if uses_tinymce %} + + {% endif %} + {% if uses_jq_progressbar %} + + {% endif %} + {% if uses_orgaccept %} + + {% endif %} + {% if uses_jq_ui_core %} + + {% endif %} + {% if uses_jq_datetimepicker %} + + + {% endif %} +{% endblock %} + {% block body_tag %} {% endblock %} diff -r 3dd1507aa723 -r 6be502a1bcc6 app/soc/templates/soc/models/admin.html --- a/app/soc/templates/soc/models/admin.html Sun Feb 15 20:26:15 2009 +0000 +++ b/app/soc/templates/soc/models/admin.html Sun Feb 15 20:27:09 2009 +0000 @@ -14,8 +14,6 @@ {% endcomment %} {% load forms_helpers %} -{% block scripts %}{% endblock %} - {% block body %}

diff -r 3dd1507aa723 -r 6be502a1bcc6 app/soc/templates/soc/models/edit.html --- a/app/soc/templates/soc/models/edit.html Sun Feb 15 20:26:15 2009 +0000 +++ b/app/soc/templates/soc/models/edit.html Sun Feb 15 20:27:09 2009 +0000 @@ -14,9 +14,6 @@ {% endcomment %} {% load forms_helpers %} -{% block scripts %} - -{% endblock %} {% block header_title %} {{ page_name }} {% if entity %} diff -r 3dd1507aa723 -r 6be502a1bcc6 app/soc/templates/soc/org_app/review_overview.html --- a/app/soc/templates/soc/org_app/review_overview.html Sun Feb 15 20:26:15 2009 +0000 +++ b/app/soc/templates/soc/org_app/review_overview.html Sun Feb 15 20:27:09 2009 +0000 @@ -12,56 +12,9 @@ See the License for the specific language governing permissions and limitations under the License. {% endcomment %} -{% block scripts %} - - -{% endblock %} {% block body %} If you want to accept all pre-accepted organizations please {{ block.super}} + {% endblock %} diff -r 3dd1507aa723 -r 6be502a1bcc6 app/soc/templates/soc/presence/home.html --- a/app/soc/templates/soc/presence/home.html Sun Feb 15 20:26:15 2009 +0000 +++ b/app/soc/templates/soc/presence/home.html Sun Feb 15 20:27:09 2009 +0000 @@ -14,20 +14,11 @@ {% endcomment %} {% block scripts %} +{{ block.super }} {% if entity.feed_url %} - - - + + + {% endif %} {% endblock %} diff -r 3dd1507aa723 -r 6be502a1bcc6 app/soc/templates/soc/request/create.html --- a/app/soc/templates/soc/request/create.html Sun Feb 15 20:26:15 2009 +0000 +++ b/app/soc/templates/soc/request/create.html Sun Feb 15 20:27:09 2009 +0000 @@ -14,9 +14,6 @@ {% endcomment %} {% load forms_helpers %} -{% block scripts %} - -{% endblock %} {% block header_title %} {{ page_name }} {% endblock %} diff -r 3dd1507aa723 -r 6be502a1bcc6 app/soc/templates/soc/role/edit.html --- a/app/soc/templates/soc/role/edit.html Sun Feb 15 20:26:15 2009 +0000 +++ b/app/soc/templates/soc/role/edit.html Sun Feb 15 20:27:09 2009 +0000 @@ -15,7 +15,7 @@ {% load forms_helpers %} {% block scripts %} - +{{ block.super }} {% if gmaps_api_key %} diff -r 3dd1507aa723 -r 6be502a1bcc6 app/soc/templates/soc/timeline/edit.html --- a/app/soc/templates/soc/timeline/edit.html Sun Feb 15 20:26:15 2009 +0000 +++ b/app/soc/templates/soc/timeline/edit.html Sun Feb 15 20:27:09 2009 +0000 @@ -12,17 +12,7 @@ See the License for the specific language governing permissions and limitations under the License. {% endcomment %} -{% block scripts %} - - - - -{% endblock %} + {% block instructions %} {{ block.super }} Note that all times are in UTC. {% endblock %}