Commits

Francis Irving  committed 33dafec Merge

Merge

  • Participants
  • Parent commits db900ad, a1ac9c1

Comments (0)

Files changed (3)

File web/templates/codewiki/scraper_overview.html

         <h3 class="current_status">Current status</h3>
             {% if scraper.scraper.last_run %}
                 {% if scraper.scraper.run_interval == MAGIC_RUN_INTERVAL %}
-                    <p><span class="running">Will run as soon as possible&hellip;</span></p>
+                    <p><span class="running">In the queue&hellip;</span></p>
                 {% else %}
-                {% if user_owns_it or user_edits_it or user.is_staff %}<a href="{% url run_scraper_now scraper.short_name %}" title="Run this scraper now, without affecting its schedule" class="run" rel="nofollow">Run now</a>{% endif %}
+                {% if user_owns_it or user_edits_it or user.is_staff %}<!--<a href="{% url run_scraper_now scraper.short_name %}" title="Run this scraper now, without affecting its schedule" class="run" rel="nofollow">Run now</a>-->{% endif %}
                 <p>
                     {% if scraper.scraper.run_interval == -1 %}
                         Idle &ndash; not scheduled to run
                 {% endif %}
             {% else %}
                 {% if scraper.scraper.run_interval == -1 %}
-                {% if user_owns_it or user_edits_it or user.is_staff %}<a href="{% url run_scraper_now scraper.short_name %}" title="Run this scraper now, without affecting its schedule" class="run" rel="nofollow">Run now</a>{% endif %}
+                {% if user_owns_it or user_edits_it or user.is_staff %}<!--<a href="{% url run_scraper_now scraper.short_name %}" title="Run this scraper now, without affecting its schedule" class="run" rel="nofollow">Run now</a>-->{% endif %}
                 <p>
                     Idle &ndash; not scheduled to run
                 </p>
                 {% else %}
-                    <p><span class="running">Will run as soon as possible&hellip;</span></p>
+                    <p><span class="running">In the queue&hellip;</span></p>
                 {% endif %}
             {% endif %}
         </p>

File web/templates/contact_form/contact_form.html

             <dl class="postphone">
                 <dt>feedback@scraperwiki.com</dt>
                 <dt>ScraperWiki, ic2<br>Liverpool Science Park<br>146 Brownlow Hill<br>Liverpool L3 5RF</dt>
-                <dt>+44 208 1330541</dt>
+                <dt>+44 (0) 151 3315200</dt>
             </dl>
         </form>
         <br />

File web/templates/documentation/includes/ruby_libraries.html

  <a href="http://www.ruby-doc.org/stdlib-1.9.3/libdoc/open-uri/rdoc/OpenURI.html" target="_new">docs</a>
     </dd>
     <dt>Typhoeus</dt>
-    <dd>Simple HTTP interface, including parallel requests. <a href="https://github.com/dbalatero/typhoeus/blob/master/README.textile" target="_new">docs</a>
+    <dd>Simple HTTP interface, including parallel requests. <a href="https://github.com/typhoeus/typhoeus" target="_new">docs</a>
     </dd>
 </dl>