Skip to content
This repository
Browse code

Remove dependency to jslibs

  • Loading branch information...
commit 36811a30a634669cfb98d2b1c3733cf5528ecf5b 1 parent 5746fb2
Balázs Reé authored April 11, 2012
1  bottlecap/layouts/popper/__init__.py
... ...
@@ -1,6 +1,5 @@
1 1
 
2 2
 def includeme(config):
3 3
     config.add_static_view('popper-static', 'bottlecap.layouts.popper:static')
4  
-    config.add_static_view('jslibs-static', 'jslibs:')
5 4
     config.scan('bottlecap.layouts.popper.layout')
6 5
     config.scan('bottlecap.layouts.popper.panels')
3  bottlecap/layouts/popper/layout.py
@@ -59,9 +59,6 @@ def popper_static(self, fname):
59 59
         return self.request.static_url(
60 60
             'bottlecap.layouts.popper:static/%s' % fname)
61 61
 
62  
-    def js_static(self, fname):
63  
-        return self.request.static_url('jslibs:/%s' % fname)
64  
-
65 62
     @apply
66 63
     def show_sidebar():
67 64
         def getter(self):
4  bottlecap/layouts/popper/templates/anonymous_layout.pt
@@ -57,8 +57,8 @@
57 57
         window.head_data = ${structure: layout.head_data_json};
58 58
     </script>
59 59
 
60  
-    <script src="${layout.js_static('resources/jquery-ui-1.9m5.min.js')}" defer></script>
61  
-    <link rel="stylesheet" href="${layout.js_static('resources/jquery-ui-1.9m5-smoothness.min.css')}" type="text/css" />
  60
+    <script src="${layout.popper_static('js/jquery-ui-1.9m5.min.js')}" defer></script>
  61
+    <link rel="stylesheet" href="${layout.popper_static('js/jquery-ui-1.9m5-smoothness.min.css')}" type="text/css" />
62 62
     <script src="${layout.popper_static('popper-plugins/popper-livesearch/bc-core/jquery.cookie.js')}" type="text/javascript" defer></script>
63 63
     <script src="${layout.popper_static('popper-plugins/popper-livesearch/bc-core/jquery.ajaxmanager-3.0.7.js')}" type="text/javascript" defer></script>
64 64
     <script src="${layout.popper_static('popper-plugins/popper-livesearch/bc-core/jquery.caret-1.0.2.min.js')}" type="text/javascript" defer></script>
4  bottlecap/layouts/popper/templates/popper_layout.pt
@@ -86,8 +86,6 @@
86 86
     <!-- Footer -->
87 87
     ${panel('popper.footer')}
88 88
 
89  
-    <!-- <script src="${layout.js_static('resources/bottlecap-tail-0.min.js')}" defer></script> -->
90  
-
91 89
     <script src="${layout.popper_static('js/jquery.ui.widget.js')}"
92 90
             type="text/javascript" defer></script>
93 91
     <script src="${layout.popper_static('js/mustache-0.3.0.js')}"
@@ -105,7 +103,7 @@
105 103
         window.head_data = ${structure: layout.head_data_json};
106 104
     </script>
107 105
 
108  
-    <script src="${layout.js_static('resources/jquery-ui-1.9m5.min.js')}" defer></script>
  106
+    <script src="${layout.popper_static('js/jquery-ui-1.9m5.min.js')}" defer></script>
109 107
     <link rel="stylesheet" href="${layout.js_static('resources/jquery-ui-1.9m5-smoothness.min.css')}" type="text/css" />
110 108
     <script src="${layout.popper_static('popper-plugins/popper-livesearch/bc-core/jquery.cookie.js')}" type="text/javascript" defer></script>
111 109
     <script src="${layout.popper_static('popper-plugins/popper-livesearch/bc-core/jquery.ajaxmanager-3.0.7.js')}" type="text/javascript" defer></script>
1  setup.py
@@ -29,7 +29,6 @@
29 29
 install_requires = [
30 30
     'pyramid>=1.1b3', # requires static_view with use_subpath
31 31
     'Sphinx',
32  
-    'jslibs>=0.5',
33 32
     ]
34 33
 tests_require = install_requires + ['coverage', 'nose', 'mock',
35 34
                                     'webtest']

0 notes on commit 36811a3

Please sign in to comment.
Something went wrong with that request. Please try again.