Download as
Browse Code »

Commit 27dbb2ab1aa8e997af52204a7cc88d8077f8ed44

Authored by Sergio Oliveira
1 parent c5325846
Exists in master and in 39 other branches 1.12.x, add_requests_as_dep, celery_service, change-passwd-signal, check-port, colab-signals, colab-vcard, colab_search, colab_tag, colab_tag_merge, community_association, detach_super_archives, fix-dashboard, fix-message-preview, fix_app_label, fix_cache_count_spb, fix_header, fixed_gitlab_import, go_to_profile_panel, header_footer, layout-fix, mobile_user_scalable, move_out_plugins, paginate-threads, profile_integration, refactor-data-import, remove-gitlab-plugin, removing_namespace, search_block, search_filters, spb-release/3.0, split_screen, stable, startplugin, timestamp_plugins, translation_review, user_regex, validate-passwd, workin_whoosh_temp

Dropping jquery from jenkins template

Showing 2 changed files with 4 additions and 3 deletions   Show diff stats
src/proxy/diazo/jenkins.xml
  Diff comments   View file @27dbb2a
@@ -3,6 +3,7 @@ @@ -3,6 +3,7 @@
3 xmlns:css="http://namespaces.plone.org/diazo/css" 3 xmlns:css="http://namespaces.plone.org/diazo/css"
4 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"> 4 xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
5 5
  6 + <drop css:theme="script[data-framework='jquery']" />
6 <replace css:theme="#jenkins-css" content="//head/link" /> 7 <replace css:theme="#jenkins-css" content="//head/link" />
7 <replace css:theme="#jenkins-js" content="//head/script" /> 8 <replace css:theme="#jenkins-js" content="//head/script" />
8 <before css:theme-children="#main-content" css:content="#main-table" /> 9 <before css:theme-children="#main-content" css:content="#main-table" />
src/templates/base.html
  Diff comments   View file @27dbb2a
@@ -22,9 +22,9 @@ @@ -22,9 +22,9 @@
22 <link rel="stylesheet" href="{{ STATIC_URL }}css/screen.css" 22 <link rel="stylesheet" href="{{ STATIC_URL }}css/screen.css"
23 type="text/css" media="screen" /> 23 type="text/css" media="screen" />
24 24
25 - <script type="text/javascript" src="{{ STATIC_URL }}third-party/jquery-2.0.3.min.js"></script>  
26 - <script type="text/javascript" src="{{ STATIC_URL }}third-party/jquery.debouncedresize.js"></script>  
27 - <script type="text/javascript" src="{{ STATIC_URL }}third-party/jquery.cookie.js"></script> 25 + <script type="text/javascript" src="{{ STATIC_URL }}third-party/jquery-2.0.3.min.js" data-framework="jquery"></script>
  26 + <script type="text/javascript" src="{{ STATIC_URL }}third-party/jquery.debouncedresize.js" data-framework="jquery"></script>
  27 + <script type="text/javascript" src="{{ STATIC_URL }}third-party/jquery.cookie.js" data-framework="jquery"></script>
28 <script src="{{ STATIC_URL }}third-party/bootstrap/js/bootstrap.min.js"></script> 28 <script src="{{ STATIC_URL }}third-party/bootstrap/js/bootstrap.min.js"></script>
29 29
30 {% block head_js %}{% endblock %} 30 {% block head_js %}{% endblock %}