Merge lp:~zorba-coders/zorba/no_disqus into lp:zorba
- no_disqus
- Merge into trunk
Status: | Merged |
---|---|
Approved by: | Chris Hillery |
Approved revision: | 10938 |
Merged at revision: | 11211 |
Proposed branch: | lp:~zorba-coders/zorba/no_disqus |
Merge into: | lp:zorba |
Diff against target: |
277 lines (+30/-172) 7 files modified
doc/style/footer.html (+0/-19) doc/zorba/xqdoc/templates/main.html (+8/-30) doc/zorba/xqdoc/templates/www.functx.com_index.html (+7/-32) doc/zorba/xqdoc/templates/www.w3.org_2005_xpath-functions.html (+7/-32) doc/zorba/xqdoc/templates/www.w3.org_2005_xpath-functions_math.html (+7/-32) test/rbkt/ExpQueryResults/zorba/string/AnalyzeString/analyze_string13.xml.res (+0/-2) test/rbkt/Queries/zorba/string/AnalyzeString/http-client-doc.htm (+1/-25) |
To merge this branch: | bzr merge lp:~zorba-coders/zorba/no_disqus |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Juan Zacarias | Approve | ||
Chris Hillery | Approve | ||
Review via email: mp+114793@code.launchpad.net |
Commit message
Remove disqus references
Description of the change
Remove disqus references
Chris Hillery (ceejatec) wrote : | # |
William Candillon (wcandillon) wrote : | # |
Currently the website is not using any static content from the zorba repository. We just feed the database with the xml xqdoc and doxygen and then have xquery to render the pages.
The source code of the website is available at https:/
Chris Hillery (ceejatec) : | # |
Juan Zacarias (juan457) : | # |
Zorba Build Bot (zorba-buildbot) wrote : | # |
Attempt to merge into lp:zorba failed due to conflicts:
text conflict in doc/zorba/
text conflict in doc/zorba/
text conflict in doc/zorba/
Zorba Build Bot (zorba-buildbot) wrote : | # |
Validation queue starting for merge proposal.
Log at: http://
Zorba Build Bot (zorba-buildbot) wrote : | # |
The attempt to merge lp:~zorba-coders/zorba/no_disqus into lp:zorba failed. Below is the output from the failed tests.
CMake Error at /home/ceej/
Validation queue job no_disqus-
final status was:
2 tests did not succeed - changes not commited.
Error in read script: /home/ceej/
- 10938. By Chris Hillery
-
Fixing tests that got broken by removal of Disqus HTML.
Zorba Build Bot (zorba-buildbot) wrote : | # |
Validation queue starting for merge proposal.
Log at: http://
Zorba Build Bot (zorba-buildbot) wrote : | # |
Validation queue job no_disqus-
All tests succeeded!
Preview Diff
1 | === modified file 'doc/style/footer.html' |
2 | --- doc/style/footer.html 2012-09-19 21:16:15 +0000 |
3 | +++ doc/style/footer.html 2013-01-30 07:21:23 +0000 |
4 | @@ -2,25 +2,6 @@ |
5 | <!-- footer.html--> |
6 | </div> |
7 | |
8 | -<div id="discuss" > |
9 | - <div id="disqus_thread"></div> |
10 | - <script type="text/javascript"> |
11 | - var disqus_developer = 1; |
12 | - var disqus_shortname = 'zorba'; // required: replace example with your forum shortname |
13 | - var disqus_identifier = location.href; |
14 | - var disqus_url = location.href; |
15 | - //<![CDATA[ |
16 | - /* * * DON'T EDIT BELOW THIS LINE * * */ |
17 | - (function() { |
18 | - var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true; |
19 | - dsq.src = 'http://' + disqus_shortname + '.disqus.com/embed.js'; |
20 | - (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq); |
21 | - })(); |
22 | - //]]></script> |
23 | - <noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript> |
24 | - <a href="http://disqus.com" class="dsq-brlink">blog comments powered by <span class="logo-disqus">Disqus</span></a> |
25 | - </div> |
26 | -</div> |
27 | <div id="footer"> |
28 | <div id="innerfooter"><p>Zorba is supported by the <a href="http://flworfound.org/" target="_blank">FLWOR |
29 | Foundation</a> and distributed under |
30 | |
31 | === modified file 'doc/zorba/xqdoc/templates/main.html' |
32 | --- doc/zorba/xqdoc/templates/main.html 2012-09-19 21:16:15 +0000 |
33 | +++ doc/zorba/xqdoc/templates/main.html 2013-01-30 07:21:23 +0000 |
34 | @@ -83,36 +83,14 @@ |
35 | </div> |
36 | |
37 | <div style="clear:both;"> |
38 | - <div id="discuss" > |
39 | - <div id="disqus_thread"></div> |
40 | - <script type="text/javascript"> |
41 | - var disqus_developer = 1; |
42 | - /* * * CONFIGURATION VARIABLES: EDIT BEFORE PASTING INTO YOUR WEBPAGE * * */ |
43 | - var disqus_shortname = 'zorba'; // required: replace example with your forum shortname |
44 | - var self = location.href; |
45 | - // The following are highly recommended additional parameters. Remove the slashes in front to use. |
46 | - var disqus_identifier = self; |
47 | - var disqus_url = self; |
48 | - |
49 | - /* * * DON'T EDIT BELOW THIS LINE * * */ |
50 | - (function() { |
51 | - var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true; |
52 | - dsq.src = 'http://' + disqus_shortname + '.disqus.com/embed.js'; |
53 | - (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq); |
54 | - })(); |
55 | - </script> |
56 | - <noscript><p>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></p></noscript> |
57 | - <a href="http://disqus.com" class="dsq-brlink">blog comments powered by <span class="logo-disqus">Disqus</span></a> |
58 | - </div> |
59 | - </div> |
60 | - |
61 | - <div id="footer"> |
62 | - <div id="innerfooter"> |
63 | - <p>Zorba is supported by the |
64 | - <a href="http://flworfound.org/" target="_blank">FLWOR Foundation</a> |
65 | - and distributed under |
66 | - <a href="http://www.apache.org/licenses/LICENSE-2.0.html" |
67 | - target="_blank">Apache Licence, Version 2.0</a>.</p> |
68 | + <div id="footer"> |
69 | + <div id="innerfooter"> |
70 | + <p>Zorba is supported by the |
71 | + <a href="http://flworfound.org/" target="_blank">FLWOR Foundation</a> |
72 | + and distributed under |
73 | + <a href="http://www.apache.org/licenses/LICENSE-2.0.html" |
74 | + target="_blank">Apache Licence, Version 2.0</a>.</p> |
75 | + </div> |
76 | </div> |
77 | </div> |
78 | </body> |
79 | |
80 | === modified file 'doc/zorba/xqdoc/templates/www.functx.com_index.html' |
81 | --- doc/zorba/xqdoc/templates/www.functx.com_index.html 2012-10-08 12:09:36 +0000 |
82 | +++ doc/zorba/xqdoc/templates/www.functx.com_index.html 2013-01-30 07:21:23 +0000 |
83 | @@ -7226,38 +7226,13 @@ |
84 | </div> |
85 | </div> |
86 | <div style="clear:both;"> |
87 | - <div id="discuss"> |
88 | - <div id="disqus_thread"></div> |
89 | - <script type="text/javascript"> |
90 | - var disqus_developer = 1; |
91 | - /* * * CONFIGURATION VARIABLES: EDIT BEFORE PASTING INTO YOUR WEBPAGE * * */ |
92 | - var disqus_shortname = 'zorba'; // required: replace example with your forum shortname |
93 | - var self = location.href; |
94 | - // The following are highly recommended additional parameters. Remove the slashes in front to use. |
95 | - var disqus_identifier = self; |
96 | - var disqus_url = self; |
97 | - |
98 | - /* * * DON'T EDIT BELOW THIS LINE * * */ |
99 | - (function() { |
100 | - var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true; |
101 | - dsq.src = 'http://' + disqus_shortname + '.disqus.com/embed.js'; |
102 | - (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq); |
103 | - })(); |
104 | - </script> |
105 | - <noscript> |
106 | - <p>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a> |
107 | - </p> |
108 | - </noscript> |
109 | - <a href="http://disqus.com" class="dsq-brlink">blog comments powered by <span class="logo-disqus">Disqus</span> |
110 | - </a> |
111 | - </div> |
112 | - </div> |
113 | - <div id="footer"> |
114 | - <div id="innerfooter"> |
115 | - <p>Zorba is supported by the |
116 | - <a href="http://flworfound.org/" target="_blank">FLWOR Foundation</a> |
117 | - and distributed under |
118 | - <a href="http://www.apache.org/licenses/LICENSE-2.0.html" target="_blank">Apache Licence, Version 2.0</a>.</p> |
119 | + <div id="footer"> |
120 | + <div id="innerfooter"> |
121 | + <p>Zorba is supported by the |
122 | + <a href="http://flworfound.org/" target="_blank">FLWOR Foundation</a> |
123 | + and distributed under |
124 | + <a href="http://www.apache.org/licenses/LICENSE-2.0.html" target="_blank">Apache Licence, Version 2.0</a>.</p> |
125 | + </div> |
126 | </div> |
127 | </div> |
128 | </body> |
129 | |
130 | === modified file 'doc/zorba/xqdoc/templates/www.w3.org_2005_xpath-functions.html' |
131 | --- doc/zorba/xqdoc/templates/www.w3.org_2005_xpath-functions.html 2012-10-08 12:09:36 +0000 |
132 | +++ doc/zorba/xqdoc/templates/www.w3.org_2005_xpath-functions.html 2013-01-30 07:21:23 +0000 |
133 | @@ -8936,38 +8936,13 @@ |
134 | </div> |
135 | </div> |
136 | <div style="clear:both;"> |
137 | - <div id="discuss"> |
138 | - <div id="disqus_thread"></div> |
139 | - <script type="text/javascript"> |
140 | - var disqus_developer = 1; |
141 | - /* * * CONFIGURATION VARIABLES: EDIT BEFORE PASTING INTO YOUR WEBPAGE * * */ |
142 | - var disqus_shortname = 'zorba'; // required: replace example with your forum shortname |
143 | - var self = location.href; |
144 | - // The following are highly recommended additional parameters. Remove the slashes in front to use. |
145 | - var disqus_identifier = self; |
146 | - var disqus_url = self; |
147 | - |
148 | - /* * * DON'T EDIT BELOW THIS LINE * * */ |
149 | - (function() { |
150 | - var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true; |
151 | - dsq.src = 'http://' + disqus_shortname + '.disqus.com/embed.js'; |
152 | - (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq); |
153 | - })(); |
154 | - </script> |
155 | - <noscript> |
156 | - <p>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a> |
157 | - </p> |
158 | - </noscript> |
159 | - <a href="http://disqus.com" class="dsq-brlink">blog comments powered by <span class="logo-disqus">Disqus</span> |
160 | - </a> |
161 | - </div> |
162 | - </div> |
163 | - <div id="footer"> |
164 | - <div id="innerfooter"> |
165 | - <p>Zorba is supported by the |
166 | - <a href="http://flworfound.org/" target="_blank">FLWOR Foundation</a> |
167 | - and distributed under |
168 | - <a href="http://www.apache.org/licenses/LICENSE-2.0.html" target="_blank">Apache Licence, Version 2.0</a>.</p> |
169 | + <div id="footer"> |
170 | + <div id="innerfooter"> |
171 | + <p>Zorba is supported by the |
172 | + <a href="http://flworfound.org/" target="_blank">FLWOR Foundation</a> |
173 | + and distributed under |
174 | + <a href="http://www.apache.org/licenses/LICENSE-2.0.html" target="_blank">Apache Licence, Version 2.0</a>.</p> |
175 | + </div> |
176 | </div> |
177 | </div> |
178 | </body> |
179 | |
180 | === modified file 'doc/zorba/xqdoc/templates/www.w3.org_2005_xpath-functions_math.html' |
181 | --- doc/zorba/xqdoc/templates/www.w3.org_2005_xpath-functions_math.html 2012-10-08 12:09:36 +0000 |
182 | +++ doc/zorba/xqdoc/templates/www.w3.org_2005_xpath-functions_math.html 2013-01-30 07:21:23 +0000 |
183 | @@ -1430,38 +1430,13 @@ |
184 | </div> |
185 | </div> |
186 | <div style="clear:both;"> |
187 | - <div id="discuss"> |
188 | - <div id="disqus_thread"></div> |
189 | - <script type="text/javascript"> |
190 | - var disqus_developer = 1; |
191 | - /* * * CONFIGURATION VARIABLES: EDIT BEFORE PASTING INTO YOUR WEBPAGE * * */ |
192 | - var disqus_shortname = 'zorba'; // required: replace example with your forum shortname |
193 | - var self = location.href; |
194 | - // The following are highly recommended additional parameters. Remove the slashes in front to use. |
195 | - var disqus_identifier = self; |
196 | - var disqus_url = self; |
197 | - |
198 | - /* * * DON'T EDIT BELOW THIS LINE * * */ |
199 | - (function() { |
200 | - var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true; |
201 | - dsq.src = 'http://' + disqus_shortname + '.disqus.com/embed.js'; |
202 | - (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq); |
203 | - })(); |
204 | - </script> |
205 | - <noscript> |
206 | - <p>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a> |
207 | - </p> |
208 | - </noscript> |
209 | - <a href="http://disqus.com" class="dsq-brlink">blog comments powered by <span class="logo-disqus">Disqus</span> |
210 | - </a> |
211 | - </div> |
212 | - </div> |
213 | - <div id="footer"> |
214 | - <div id="innerfooter"> |
215 | - <p>Zorba is supported by the |
216 | - <a href="http://flworfound.org/" target="_blank">FLWOR Foundation</a> |
217 | - and distributed under |
218 | - <a href="http://www.apache.org/licenses/LICENSE-2.0.html" target="_blank">Apache Licence, Version 2.0</a>.</p> |
219 | + <div id="footer"> |
220 | + <div id="innerfooter"> |
221 | + <p>Zorba is supported by the |
222 | + <a href="http://flworfound.org/" target="_blank">FLWOR Foundation</a> |
223 | + and distributed under |
224 | + <a href="http://www.apache.org/licenses/LICENSE-2.0.html" target="_blank">Apache Licence, Version 2.0</a>.</p> |
225 | + </div> |
226 | </div> |
227 | </div> |
228 | </body> |
229 | |
230 | === modified file 'test/rbkt/ExpQueryResults/zorba/string/AnalyzeString/analyze_string13.xml.res' |
231 | --- test/rbkt/ExpQueryResults/zorba/string/AnalyzeString/analyze_string13.xml.res 2012-09-19 21:16:15 +0000 |
232 | +++ test/rbkt/ExpQueryResults/zorba/string/AnalyzeString/analyze_string13.xml.res 2013-01-30 07:21:23 +0000 |
233 | @@ -281,7 +281,5 @@ |
234 | #function_summary |
235 | images/up.gif |
236 | http://expath.org/modules/http-client.html#d2e483 |
237 | - http://disqus.com/?ref_noscript |
238 | - http://disqus.com |
239 | http://flworfound.org/ |
240 | http://www.apache.org/licenses/LICENSE-2.0.html |
241 | |
242 | === modified file 'test/rbkt/Queries/zorba/string/AnalyzeString/http-client-doc.htm' |
243 | --- test/rbkt/Queries/zorba/string/AnalyzeString/http-client-doc.htm 2012-09-19 21:16:15 +0000 |
244 | +++ test/rbkt/Queries/zorba/string/AnalyzeString/http-client-doc.htm 2013-01-30 07:21:23 +0000 |
245 | @@ -1627,31 +1627,7 @@ |
246 | </div> |
247 | </div> |
248 | <div style="clear:both;"> |
249 | - <div id="discuss"> |
250 | - <div id="disqus_thread"></div> |
251 | - <script type="text/javascript"> |
252 | - var disqus_developer = 1; |
253 | - /* * * CONFIGURATION VARIABLES: EDIT BEFORE PASTING INTO YOUR WEBPAGE * * */ |
254 | - var disqus_shortname = 'zorba'; // required: replace example with your forum shortname |
255 | - var self = location.href; |
256 | - // The following are highly recommended additional parameters. Remove the slashes in front to use. |
257 | - var disqus_identifier = self; |
258 | - var disqus_url = self; |
259 | - |
260 | - /* * * DON'T EDIT BELOW THIS LINE * * */ |
261 | - (function() { |
262 | - var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true; |
263 | - dsq.src = 'http://' + disqus_shortname + '.disqus.com/embed.js'; |
264 | - (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq); |
265 | - })(); |
266 | - </script> |
267 | - <noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a> |
268 | - </noscript> |
269 | - <a href="http://disqus.com" class="dsq-brlink">blog comments powered by <span class="logo-disqus">Disqus</span> |
270 | - </a> |
271 | - </div> |
272 | - </div> |
273 | - <div id="footer"> |
274 | + <div id="footer"> |
275 | <div id="innerfooter"> |
276 | <p>Zorba is supported by the |
277 | <a href="http://flworfound.org/" target="_blank">FLWOR Foundation</a> |
What process will add the Disqus stuff back in when creating the website?