[Python-apps-commits] r10456 - in packages/openteacher/trunk/debian/patches (5 files)
cjsmo-guest at users.alioth.debian.org
cjsmo-guest at users.alioth.debian.org
Mon Feb 3 06:41:43 UTC 2014
Date: Monday, February 3, 2014 @ 06:41:42
Author: cjsmo-guest
Revision: 10456
refresh patches
Modified:
packages/openteacher/trunk/debian/patches/06_install_ubuntu_html.patch
packages/openteacher/trunk/debian/patches/07_using_openteacher_2_html.patch
packages/openteacher/trunk/debian/patches/08_base_html.patch
packages/openteacher/trunk/debian/patches/09_download_html.patch
packages/openteacher/trunk/debian/patches/10_index_html.patch
Modified: packages/openteacher/trunk/debian/patches/06_install_ubuntu_html.patch
===================================================================
--- packages/openteacher/trunk/debian/patches/06_install_ubuntu_html.patch 2014-02-02 09:56:01 UTC (rev 10455)
+++ packages/openteacher/trunk/debian/patches/06_install_ubuntu_html.patch 2014-02-03 06:41:42 UTC (rev 10456)
@@ -3,8 +3,8 @@
Index: openteacher_3.2.orig/openteacher/modules/org/openteacher/websiteGenerator/docsTemplates/install-ubuntu.html
===================================================================
---- openteacher_3.2.orig.orig/openteacher/modules/org/openteacher/websiteGenerator/docsTemplates/install-ubuntu.html 2013-03-31 02:46:26.000000000 -0500
-+++ openteacher_3.2.orig/openteacher/modules/org/openteacher/websiteGenerator/docsTemplates/install-ubuntu.html 2014-01-23 18:57:01.295554000 -0600
+--- openteacher_3.2.orig.orig/openteacher/modules/org/openteacher/websiteGenerator/docsTemplates/install-ubuntu.html 2014-02-02 23:34:17.787080868 -0600
++++ openteacher_3.2.orig/openteacher/modules/org/openteacher/websiteGenerator/docsTemplates/install-ubuntu.html 2014-02-02 23:35:42.299078851 -0600
@@ -7,10 +7,10 @@
<ol>
<li>@!tr('Download the Ubuntu .deb file from the Download section of this website.')!@</li>
@@ -15,8 +15,9 @@
<li>@!tr('Click "install" to start the installation.')!@</li>
<li>@!tr('When the installation has finished, you can start OpenTeacher from Applications -> Education -> OpenTeacher.')!@<br />
- <a href="http://www.milanboers.nl/openteacher/images/doc/inst2.png" target="_blank"><img class="docThumb" src="http://www.milanboers.nl/openteacher/images/doc/inst2.png" alt="OpenTeacher" /></a>
-+ <a href="" target="_blank"><img class="docThumb" src="" alt="OpenTeacher" /></a>
- </li>
+- </li>
-</ol>
\ No newline at end of file
-+</ol>
++ <a href="" target="_blank"><img class="docThumb" src="" alt="OpenTeacher" /></a></li></ol>
++
++
Modified: packages/openteacher/trunk/debian/patches/07_using_openteacher_2_html.patch
===================================================================
--- packages/openteacher/trunk/debian/patches/07_using_openteacher_2_html.patch 2014-02-02 09:56:01 UTC (rev 10455)
+++ packages/openteacher/trunk/debian/patches/07_using_openteacher_2_html.patch 2014-02-03 06:41:42 UTC (rev 10456)
@@ -4,8 +4,8 @@
Index: openteacher_3.2.orig/openteacher/modules/org/openteacher/websiteGenerator/docsTemplates/using-openteacher-2.html
===================================================================
--- openteacher_3.2.orig.orig/openteacher/modules/org/openteacher/websiteGenerator/docsTemplates/using-openteacher-2.html 2013-03-31 02:46:26.000000000 -0500
-+++ openteacher_3.2.orig/openteacher/modules/org/openteacher/websiteGenerator/docsTemplates/using-openteacher-2.html 2014-01-23 19:03:45.943555000 -0600
-@@ -9,25 +9,25 @@
++++ openteacher_3.2.orig/openteacher/modules/org/openteacher/websiteGenerator/docsTemplates/using-openteacher-2.html 2014-02-02 23:41:34.923070437 -0600
+@@ -9,25 +9,24 @@
<p>@!tr('The screenshots are all taken in Ubuntu, but this should all work exactly the same in Windows and Mac OS X.')!@</p>
<ol>
<li>@!tr('Start OpenTeacher')!@<br />
@@ -29,13 +29,14 @@
+ <a href="" target="_blank"><img class="docThumb" src="" alt="Ubuntu Software Center" /></a>
<p>@!tr('If you entered the right translation, the next question will be asked to you. If you did not enter the right translation, OpenTeacher will show you the correct answer, and the difference from your answer.')!@</p>
- <a href="http://www.milanboers.nl/openteacher/images/doc/qs5.png" target="_blank"><img class="docThumb" src="http://www.milanboers.nl/openteacher/images/doc/qs5.png" alt="Ubuntu Software Center" /></a>
-+ <a href="" target="_blank"><img class="docThumb" src="" alt="Ubuntu Software Center" /></a>
- </li>
+- </li>
++ <a href="" target="_blank"><img class="docThumb" src="" alt="Ubuntu Software Center" /></a></li>
<li>
<p>@!tr('Once the test is completed, OpenTeacher will tell you if you did well by giving you a "note" (grade).')!@</p>
- <a href="http://www.milanboers.nl/openteacher/images/doc/qs6.png" target="_blank"><img class="docThumb" src="http://www.milanboers.nl/openteacher/images/doc/qs6.png" alt="Ubuntu Software Center" /></a>
-+ <a href="" target="_blank"><img class="docThumb" src="" alt="Ubuntu Software Center" /></a>
- </li>
+- </li>
-</ol>
\ No newline at end of file
-+</ol>
++ <a href="" target="_blank"><img class="docThumb" src="" alt="Ubuntu Software Center" /></a></li></ol>
++
++
Modified: packages/openteacher/trunk/debian/patches/08_base_html.patch
===================================================================
--- packages/openteacher/trunk/debian/patches/08_base_html.patch 2014-02-02 09:56:01 UTC (rev 10455)
+++ packages/openteacher/trunk/debian/patches/08_base_html.patch 2014-02-03 06:41:42 UTC (rev 10456)
@@ -1,12 +1,12 @@
-Description: Removed code which uses google adsense tracking services
+Description: Removed code which uses tracking services
(privacy-breach-google-adsense)
Author: Charlie Smotherman <cjsmo at cableone.net>
Index: openteacher_3.2.orig/openteacher/modules/org/openteacher/websiteGenerator/templates/base.html
===================================================================
---- openteacher_3.2.orig.orig/openteacher/modules/org/openteacher/websiteGenerator/templates/base.html 2014-01-25 11:28:43.956030752 -0600
-+++ openteacher_3.2.orig/openteacher/modules/org/openteacher/websiteGenerator/templates/base.html 2014-01-25 11:31:50.748031362 -0600
-@@ -6,35 +6,25 @@
+--- openteacher_3.2.orig.orig/openteacher/modules/org/openteacher/websiteGenerator/templates/base.html 2013-03-31 02:46:26.000000000 -0500
++++ openteacher_3.2.orig/openteacher/modules/org/openteacher/websiteGenerator/templates/base.html 2014-02-02 23:50:38.883057456 -0600
+@@ -6,35 +6,13 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
@@ -17,31 +17,23 @@
<link href="@!url('../style.css')!@" rel="stylesheet" type="text/css" />
<link rel="shortcut icon" href="openteacher-icon.ico" />
-<link href="https://plus.google.com/110111932125055034719/" rel="publisher" />
-+<link href="" rel="publisher" />
<title>OpenTeacher - @!tr('Free exam training software')!@</title>
--<script src="@!url('../scripts/jquery-1.9.1.min.js')!@" type="text/javascript"></script>
+ <script src="@!url('../scripts/jquery-1.9.1.min.js')!@" type="text/javascript"></script>
-<script src="@!url('../scripts/os.js')!@" type="text/javascript"></script>
-<script src="@!url('../scripts/menuLight.js')!@" type="text/javascript"></script>
-<script src="@!url('../scripts/menuPag.js')!@" type="text/javascript"></script>
-<script src="@!url('../scripts/thumbnails.js')!@" type="text/javascript"></script>
-<script src="@!url('../scripts/downloadButton.js')!@" type="text/javascript"></script>
-<script src="@!url('../scripts/linkToHere.js')!@" type="text/javascript"></script>
-+<script src="" type="text/javascript"></script>
-+<script src="" type="text/javascript"></script>
-+<script src="" type="text/javascript"></script>
-+<script src="" type="text/javascript"></script>
-+<script src="" type="text/javascript"></script>
-+<script src="" type="text/javascript"></script>
-+<script src="" type="text/javascript"></script>
<script type="text/javascript">
- // Set current menu item
- selectedMenuItem = '#@!pageName!@Link';
- </script>
- <script type="text/javascript">
+-// Set current menu item
+-selectedMenuItem = '#@!pageName!@Link';
+-</script>
+-<script type="text/javascript">
-var _gaq = _gaq || [];
-_gaq.push(['_setAccount', 'UA-4568688-9']);
-_gaq.push(['_trackPageview']);
-
+-
-(function() {
- var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
- ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
Modified: packages/openteacher/trunk/debian/patches/09_download_html.patch
===================================================================
--- packages/openteacher/trunk/debian/patches/09_download_html.patch 2014-02-02 09:56:01 UTC (rev 10455)
+++ packages/openteacher/trunk/debian/patches/09_download_html.patch 2014-02-03 06:41:42 UTC (rev 10456)
@@ -1,23 +1,24 @@
-Description: Removed code which uses facebook tracking services
- (privacy-breach-facebook)
+Description: Removed code which uses tracking services
+ (privacy-breach-{generic,facebook})
Author: Charlie Smotherman <cjsmo at cableone.net>
-
Index: openteacher_3.2.orig/openteacher/modules/org/openteacher/websiteGenerator/templates/download.html
===================================================================
--- openteacher_3.2.orig.orig/openteacher/modules/org/openteacher/websiteGenerator/templates/download.html 2013-03-31 02:46:26.000000000 -0500
-+++ openteacher_3.2.orig/openteacher/modules/org/openteacher/websiteGenerator/templates/download.html 2014-01-23 19:10:52.779556000 -0600
-@@ -83,9 +83,9 @@
++++ openteacher_3.2.orig/openteacher/modules/org/openteacher/websiteGenerator/templates/download.html 2014-02-02 23:53:52.395052839 -0600
+@@ -83,9 +83,10 @@
</div>
<div class="center">
-<iframe src="http://www.facebook.com/plugins/likebox.php?href=http%3A%2F%2Fwww.facebook.com%2Fpages%2FOpenTeacher%2F128284743904373&width=292&colorscheme=light&show_faces=false&stream=false&header=false&height=62" scrolling="no" frameborder="0" style="border:none; overflow:hidden; width:292px; height:62px;" allowTransparency="true"></iframe>
+<iframe src=""></iframe>
-+
-<a href="http://twitter.com/share" class="twitter-share-button" data-count="vertical" data-via="openteacher">Tweet</a><script type="text/javascript" src="http://platform.twitter.com/widgets.js"></script>
++<a href="">Tweet</a>
<br />
- <img src="../images/information.png" alt="" style="width:500px" />
+-<img src="../images/information.png" alt="" style="width:500px" />
-</div>
\ No newline at end of file
-+</div>
++<img src="../images/information.png" alt="" style="width:500px" /></div>
++
++
Modified: packages/openteacher/trunk/debian/patches/10_index_html.patch
===================================================================
--- packages/openteacher/trunk/debian/patches/10_index_html.patch 2014-02-02 09:56:01 UTC (rev 10455)
+++ packages/openteacher/trunk/debian/patches/10_index_html.patch 2014-02-03 06:41:42 UTC (rev 10456)
@@ -1,11 +1,12 @@
-Description: Removed code which uses tracking services (privacy-breach-generic)
+Description: Removed code which uses tracking services
+ (privacy-breach-{generic,facebook,google-adsense})
Author: Charlie Smotherman <cjsmo at cableone.net>
Index: openteacher_3.2.orig/openteacher/modules/org/openteacher/websiteGenerator/templates/index.html
===================================================================
--- openteacher_3.2.orig.orig/openteacher/modules/org/openteacher/websiteGenerator/templates/index.html 2013-03-31 02:46:26.000000000 -0500
-+++ openteacher_3.2.orig/openteacher/modules/org/openteacher/websiteGenerator/templates/index.html 2014-01-23 19:21:43.007558000 -0600
-@@ -43,22 +43,22 @@
++++ openteacher_3.2.orig/openteacher/modules/org/openteacher/websiteGenerator/templates/index.html 2014-02-02 23:58:14.955046573 -0600
+@@ -43,22 +43,23 @@
<!-- NOT XHTML STRICT (But not our problem ;D) -->
<!-- Facebook -->
@@ -18,21 +19,22 @@
<!-- Hyves -->
- <iframe src="http://www.hyves.nl/respect/button?url=http%3A%2F%2Fopenteacher.hyves.nl" style="border: medium none; overflow:hidden; width:130px; height:21px;" scrolling="no" frameborder="0" allowTransparency="true" ></iframe>
-+ <iframe src=""></iframe>
++ <iframe src="" ></iframe>
<!-- Stumbleupon -->
- <script src="http://www.stumbleupon.com/hostedbadge.php?s=2"></script>
-+ <script src=""></script>
++
<!-- Google +1 -->
- <g:plusone size="medium"></g:plusone>
-+
++
<!-- Google+ -->
- <a href="https://plus.google.com/110111932125055034719/?prsrc=3" style="text-decoration: none;"><img src="https://ssl.gstatic.com/images/icons/gplus-16.png" width="16" height="16" style="border: 0;"/></a>
-+ <a href=""/></a>
++ <a href=""></a>
</div>
<!-- Google +1 -->
-<script type="text/javascript" src="https://apis.google.com/js/plusone.js"></script>
\ No newline at end of file
-+<script type="text/javascript" src=""></script>
++
++
More information about the Python-apps-commits
mailing list