[Python-apps-commits] r11508 - in packages/fookebox/trunk/debian/patches (1 file)

Sun Nov 2 04:31:09 UTC 2014

Date: Sunday, November 2, 2014 @ 04:31:09
  Author: cockroach-guest
Revision: 11508

Updated javascript patch once more

Modified:
  packages/fookebox/trunk/debian/patches/01_javascript-urls.patch

Modified: packages/fookebox/trunk/debian/patches/01_javascript-urls.patch
===================================================================

--- packages/fookebox/trunk/debian/patches/01_javascript-urls.patch	2014-11-02 03:47:15 UTC (rev 11507)
+++ packages/fookebox/trunk/debian/patches/01_javascript-urls.patch	2014-11-02 04:31:09 UTC (rev 11508)
@@ -1,7 +1,7 @@
 Description: Use Debian's javascript libraries
  This patch modifies fookebox to use Debian's copies of the scriptaculous,
- prototype and jquery javascript libraries instead of the ones
- shipped with fookebox.
+ prototype and jquery-ui javascript libraries instead of the ones shipped with
+ fookebox. It also adjusts the URLs for included libraries.
 Author: Stefan Ott <stefan at ott.net>
 Last-Update: 2014-11-02
 --- a/fookebox/templates/classic/base.tpl
@@ -17,15 +17,56 @@
  % if config.get('lang'):
  		<script type="text/javascript" src="js/fookebox/i18n/${config.get('lang')}.js"></script>
  % endif
+--- a/fookebox/templates/fookstrap/error.tpl
++++ b/fookebox/templates/fookstrap/error.tpl
+@@ -5,9 +5,9 @@
+ 		<title>fookebox: ${ error }</title>
+ 		<meta charset="utf-8" />
+ 		<meta name="viewport" content="width=device-width, initial-scale=1" />
+-		<link rel="stylesheet" href="/css/bootstrap/bootstrap.css" />
+-		<script src="/js/jquery/jquery-1.11.1.js"></script>
+-		<script src="/js/bootstrap/bootstrap.js"></script>
++		<link rel="stylesheet" href="/fookebox/css/bootstrap/bootstrap.css" />
++		<script src="/fookebox/js/jquery/jquery-1.11.1.js"></script>
++		<script src="/fookebox/js/bootstrap/bootstrap.js"></script>
+ 	</head>
+ 	<body>
+ 		<div class="navbar navbar-inverse navbar-fixed-top" role="navigation"></div>
+--- a/fookebox/templates/fookstrap/client.tpl
++++ b/fookebox/templates/fookstrap/client.tpl
+@@ -6,17 +6,17 @@
+ 		<meta charset="utf-8" />
+ 		<meta name="viewport" content="width=device-width, initial-scale=1" />
+ 
+-		<link rel="stylesheet" href="/css/bootstrap/bootstrap.css" />
+-		<link rel="stylesheet" href="/css/fookstrap/fookebox.css" />
++		<link rel="stylesheet" href="/fookebox/css/bootstrap/bootstrap.css" />
++		<link rel="stylesheet" href="/fookebox/css/fookstrap/fookebox.css" />
+ 
+-		<script src="/js/jquery/jquery-1.11.1.js"></script>
+-		<script src="/js/bootstrap/bootstrap.js"></script>
+-		<script src="/js/fookebox/fookstrap/fookebox.js"></script>
+-		<script src="/js/jquery-ui/jquery-ui.js"></script>
++		<script src="/fookebox/js/jquery/jquery-1.11.1.js"></script>
++		<script src="/fookebox/js/bootstrap/bootstrap.js"></script>
++		<script src="/fookebox/js/fookebox/fookstrap/fookebox.js"></script>
++		<script src="/javascript/jquery-ui/jquery-ui.js"></script>
+ % if config.get('lang'):
+-		<script type="text/javascript" src="js/fookebox/i18n/${config.get('lang')}.js"></script>
++		<script type="text/javascript" src="/fookebox/js/fookebox/i18n/${config.get('lang')}.js"></script>
+ % endif
+-		<script type="text/javascript" src="js/fookebox/i18n/i18n.js"></script>
++		<script type="text/javascript" src="/fookebox/js/fookebox/i18n/i18n.js"></script>
+ 	</head>
+ 	<body>
+ 		<div class="navbar navbar-inverse navbar-fixed-top" role="navigation">
 --- a/MANIFEST.in
 +++ b/MANIFEST.in
-@@ -5,3 +5,9 @@
+@@ -5,3 +5,7 @@
  recursive-include fookebox/public *
  recursive-include fookebox/templates *
  exclude *ini
 +exclude fookebox/public/js/prototype/prototype.js
 +exclude fookebox/public/js/scriptaculous/effects.js
 +exclude fookebox/public/js/scriptaculous/scriptaculous.js
-+exclude fookebox/public/js/bootstrap/bootstrap.js
-+exclude fookebox/public/js/jquery/jquery-1.11.1.js
 +exclude fookebox/public/js/jquery-ui/jquery-ui.js


