changeset 96:e7efa40deb17

Fix URLs, Images, Titles to be up with Alex original style.
author Kai T. Ohlhus <k.ohlhus@gmail.com>
date Tue, 01 Nov 2016 02:03:28 +0100
parents 25149c27c794
children 7dd5053fdca1
files README.md _includes/footer.html _includes/header.html bugs.md donate.md download.md get-involved.md index.html license.md missing.md news.md support.md
diffstat 12 files changed, 63 insertions(+), 53 deletions(-) [+]
line wrap: on
line diff
--- a/README.md	Tue Nov 01 02:01:18 2016 +0100
+++ b/README.md	Tue Nov 01 02:03:28 2016 +0100
@@ -73,7 +73,7 @@
 To build the static website, you need to install [Jekyll][6] and a few more
 tools from [Rubygems][7].  Just type
 
-    gem install jekyll jekyll-octicons pygments.rb
+    gem install jekyll pygments.rb
 
 [7]: https://rubygems.org/
 
--- a/_includes/footer.html	Tue Nov 01 02:01:18 2016 +0100
+++ b/_includes/footer.html	Tue Nov 01 02:03:28 2016 +0100
@@ -20,10 +20,10 @@
 				<dd><a href="http://webchat.freenode.net/?channels=octave&uio=MT1mYWxzZSYyPXRydWUmMTI9dHJ1ZQda">{{site.irc_channel}}</a></dd>
 			</div>
 			<div class="columns medium-3">
-				<dt><a href="{{ "/bugs/" | prepend: site.baseurl }}">Reporting Bugs</a></dt>
-				<dt><a href="{{ "/support-expectations/" | prepend: site.baseurl }}">Support Expectations</a></dt>
-				<dt><a href="{{ "/commercial-support/" | prepend: site.baseurl }}">Commercial Support</a></dt>
-				<dt><a href="{{ "/donate/" | prepend: site.baseurl }}">Donate</a></dt>
+				<dt><a href="{{ "/bugs.html" | relative_url }}">Reporting Bugs</a></dt>
+				<dt><a href="{{ "/support-expectations.html" | relative_url }}">Support Expectations</a></dt>
+				<dt><a href="{{ "/commercial-support.html" | relative_url }}">Commercial Support</a></dt>
+				<dt><a href="{{ "/donate.html" | relative_url }}">Donate</a></dt>
 			</div>
 			</div>
 		</dl>
@@ -45,7 +45,7 @@
 	<div class="row">
 		<div class="columns small-12">
 			<div class="text-center">
-				<p>Octave is free software under the <a href="http://www.gnu.org/copyleft/gpl.html">GNU General Public License.</a></p>
+				<p>Octave is free software under the <a href="{{ "license.html" | relative_url }}">GNU General Public License.</a></p>
 				<small>
 					Copyright © 1998-{{ site.time | date: "%Y" }} John W. Eaton.
                                         This work is licensed under a
--- a/_includes/header.html	Tue Nov 01 02:01:18 2016 +0100
+++ b/_includes/header.html	Tue Nov 01 02:03:28 2016 +0100
@@ -4,7 +4,7 @@
       <li class="name">
         <h1>
           <a href="{{ "/" | relative_url }}" style="height:100%">
-            <img src="{{ "/img/logo.png" | relative_url }}" style="width: 32px; height: auto"/>
+            <img src="{{ "/img/octave-logo.svg" | relative_url }}" style="width: 32px; height: auto"/>
             {{ site.title }}
           </a>
         </h1>
@@ -12,7 +12,7 @@
       <!-- Remove the class "menu-icon" to get rid of menu icon. Take out "Menu" to just have icon alone -->
       <li class="toggle-topbar menu-icon"><a href="#"><span></span></a></li>
     </ul>
-  
+
     <section class="top-bar-section">
       <!-- Right Nav Section -->
       <ul class="right">
@@ -24,7 +24,7 @@
           {% endif %}
         {% endfor %}
         <li>
-          <a href="{{site.docs_url}}">Docs</a>  
+          <a href="{{site.docs_url}}">Docs</a>
         </li>
       </ul>
     </section>
--- a/bugs.md	Tue Nov 01 02:01:18 2016 +0100
+++ b/bugs.md	Tue Nov 01 02:03:28 2016 +0100
@@ -1,7 +1,7 @@
 ---
 layout: page
 title: Bugs
-menu: true
+menu: false
 ---
 
 GNU Octave uses the bug tracker at [Savannah][1].
--- a/donate.md	Tue Nov 01 02:01:18 2016 +0100
+++ b/donate.md	Tue Nov 01 02:03:28 2016 +0100
@@ -16,8 +16,6 @@
 </div>
 </div>
 
-- **[Free Software Foundation donation page][1]**
-
 If you are already an Octave user and would like to see it improve more rapidly,
 then please donate so that we can spend more of our time working on Octave.
 If we could raise as little as $300,000/year,
@@ -31,10 +29,9 @@
 Do you expect Octave to improve on a $0 budget
 while the proprietary tools are well-funded by your license fees?
 
-Consider [hiring someone][2] to implement the specific features you need.
-
-Bitcoin donations also accepted at this address: [1E6HchBMX1EfiJQhSUanuF4VYKk552tEHF][3] 
+Consider [hiring someone][1] to implement the specific features you need.
 
-[1]: https://crm.fsf.org/civicrm/contribute/transact?reset=1&id=10
-[2]: {{ "commercial-support.html" | relative_url }}
-[3]: bitcoin:1E6HchBMX1EfiJQhSUanuF4VYKk552tEHF
+Bitcoin donations also accepted at this address: [1E6HchBMX1EfiJQhSUanuF4VYKk552tEHF][2]
+
+[1]: {{ "commercial-support.html" | relative_url }}
+[2]: bitcoin:1E6HchBMX1EfiJQhSUanuF4VYKk552tEHF
--- a/download.md	Tue Nov 01 02:01:18 2016 +0100
+++ b/download.md	Tue Nov 01 02:03:28 2016 +0100
@@ -1,6 +1,6 @@
 ---
 layout: page
-title: Install
+title: Download
 menu: true
 ---
 
--- a/get-involved.md	Tue Nov 01 02:01:18 2016 +0100
+++ b/get-involved.md	Tue Nov 01 02:03:28 2016 +0100
@@ -1,6 +1,6 @@
 ---
 layout: page
-title: Contribute
+title: Get Involved
 menu: true
 ---
 
--- a/index.html	Tue Nov 01 02:01:18 2016 +0100
+++ b/index.html	Tue Nov 01 02:03:28 2016 +0100
@@ -6,12 +6,12 @@
   <div class="row">
     <div class="columns medium-6">
       <a href="#">
-        <img src="{{ "/img/mesh.png" | prepend: site.baseurl }}" />
+        <img src="{{ "/img/example-mesh.png" | relative_url }}" />
       </a>
     </div>
     <div class="columns medium-6">
       <h2 class="home-title">
-        <img src="{{ "/img/logo.png" | prepend: site.baseurl }}" style="float: left; height: 48px; width: auto; padding-right: 0.5rem" />
+        <img src="{{ "/img/octave-logo.svg" | relative_url }}" style="float: left; height: 48px; width: auto; padding-right: 0.5rem" />
         GNU Octave
       </h2>
       <h3>Scientific Programming Language</h3>
@@ -62,19 +62,18 @@
      </div>
      <div class="columns medium-8">
 {% highlight matlab %}
-x = -10:0.1:10 % Create an evenly-spaced vector from -10..10
-y = sin(x)     % y is also a vector
-plot(x,y)
+x = -10:0.1:10 # Create an evenly-spaced vector from -10..10
+y = sin (x)    # y is also a vector
+plot (x, y)
 {% endhighlight %}
       <div class="text-left">
         <a href="#" data-reveal-id="plotModal">
-          <img src="{{ "/img/plot.png" | prepend: site.baseurl }}" style="height: 12rem; width: auto;"/>
+          <img src="{{ "/img/example-plot.png" | relative_url }}" style="height: 12rem; width: auto;"/>
           <span class="label">Expand</span>
         </a>
       </div>
     </div>
   </div>
-  <a class="button" href="{{site.baseurl}}/examples" >More Examples</a>
 </section>
 
 <section id="install">
@@ -85,7 +84,7 @@
     </div>
     <div class="columns medium-4">
       <a href="#" data-reveal-id="guiModal">
-        <img src="https://www.gnu.org/software/octave/images/screenshot-2016-small.png" title="GNU Octave 4.0.3 - Licensed under CC BY-SA 3.0"/>
+        <img src="{{ "/img/screenshot-2016-small.png" | relative_url }}" title="GNU Octave 4.0.3 - Licensed under CC BY-SA 3.0"/>
       </a>
     </div>
   </div>
@@ -112,7 +111,7 @@
 <section id="develop">
   <h3>Development</h3>
   <p>
-    Octave is free software licensed under the <a href="http://www.gnu.org/copyleft/gpl.html">GNU General Public License (GPL)</a>.  Assuming you have Mercurial installed on your machine you may obtain the latest development version of Octave sources with the following command:
+    Octave is free software licensed under the <a href="{{ "license.html" | relative_url }}">GNU General Public License (GPL)</a>.  Assuming you have Mercurial installed on your machine you may obtain the latest development version of Octave sources with the following command:
   </p>
   <p style="margin-left:1rem"><code>hg clone http://www.octave.org/hg/octave</code></p>
   <p>
@@ -126,16 +125,16 @@
       {% assign latest_post = site.posts.first %}
       {% if latest_post %}
         <div class="panel callout">
-          <a class="right" href="{{ "/feed.xml" | prepend: site.baseurl }}">
+          <a class="right" href="{{ "/feed.xml" | relative_url }}">
             <span class="label warning">
               RSS
             </span>
           </a>
           <h3 class="entry-title">
-            <a href="{{ root_url }}{{ latest_post.url }}">{{ latest_post.title }}</a>
+            <a href="{{ latest_post.url | relative_url }}">{{ latest_post.title }}</a>
           </h3>
           <p class="post-meta">{{ latest_post.date | date: "%b %-d, %Y" }}</p>
-          <div class="entry-content">{{ latest_post.content }}</div>
+          <div class="entry-content">{{ latest_post.excerpt }}</div>
         </div>
       {% endif %}
     </div>
@@ -143,11 +142,11 @@
 </section>
 
 <div id="plotModal" class="reveal-modal" data-reveal aria-hidden="true" role="dialog">
-  <img src="{{ "/img/plot.png" | prepend: site.baseurl }}" />
+  <img src="{{ "/img/example-plot.png" | relative_url }}" />
   <a class="close-reveal-modal" aria-label="Close">&#215;</a>
 </div>
 
 <div id="guiModal" class="reveal-modal" data-reveal aria-hidden="true" role="dialog">
-  <img src="https://upload.wikimedia.org/wikipedia/en/4/48/Octave-4.0.0-rc1-Qt5.4-Linux.png" title="Octave-4.0.0-rc1-Qt5.4-Linux by Qtguy00 - Own work. Licensed under CC BY-SA 3.0 via Wikipedia"/>
+  <img src="{{ "/img/screenshot-2016-small.png" | relative_url }}" title="GNU Octave 4.0.3 - Licensed under CC BY-SA 3.0"/>
   <a class="close-reveal-modal" aria-label="Close">&#215;</a>
 </div>
--- a/license.md	Tue Nov 01 02:01:18 2016 +0100
+++ b/license.md	Tue Nov 01 02:03:28 2016 +0100
@@ -1,5 +1,5 @@
 ---
-layout: default
+layout: page
 title: License
 menu: false
 ---
--- a/missing.md	Tue Nov 01 02:01:18 2016 +0100
+++ b/missing.md	Tue Nov 01 02:03:28 2016 +0100
@@ -1,5 +1,5 @@
 ---
-layout: default
+layout: page
 title: Missing functions
 menu: false
 ---
--- a/news.md	Tue Nov 01 02:01:18 2016 +0100
+++ b/news.md	Tue Nov 01 02:03:28 2016 +0100
@@ -1,10 +1,14 @@
 ---
-layout: default
+layout: page
 title: News
-menu: false
+menu: true
 ---
 
-[**{% octicon rss class:"octicon-rss-octave" %} News feed**][Feed]
+<a class="right" href="{{ "/feed.xml" | relative_url }}">
+  <span class="label warning">
+    RSS
+  </span>
+</a>
 
 {% for post in site.posts %}
 {% if post.title == "News Archive" %}
--- a/support.md	Tue Nov 01 02:01:18 2016 +0100
+++ b/support.md	Tue Nov 01 02:03:28 2016 +0100
@@ -1,6 +1,6 @@
 ---
 layout: page
-title: Help/Support
+title: Support/Help
 menu: true
 ---
 
@@ -57,21 +57,30 @@
 
   You can also [subscribe][9] to `{{ site.help_email }}` or try to search in the
   mailing list archive for an answer:
+  <div class="row">
+  <div class="columns medium-8">
   <form action="http://octave.1599824.n4.nabble.com/template/NamlServlet.jtp">
-  <input type="hidden" name="macro" value="search_page" />
-  <input type="hidden" name="node" value="1599825" />
-  <input id="query" name="query" size="25" />
+  <input name="macro" value="search_page" type="hidden">
+  <input name="node" value="1599825" type="hidden">
+  <div class="row collapse">
+  <div class="columns small-7">
+  <input id="query" name="query" size="25">
+  </div>
+  <div class="columns small-3">
   <select name="days">
-    <option value="0" selected>all dates</option>
-    <option value="1">past 24 hours</option>
-    <option value="7">past week</option>
-    <option value="30">past month</option>
-    <option value="90">past 3 months</option>
-    <option value="180">past 6 months</option>
-    <option value="365">past year</option>
+  <option value="0" selected="">all dates</option>
+  <option value="1">past 24 hours</option>
+  <option value="7">past week</option>
+  <option value="30">past month</option>
+  <option value="90">past 3 months</option>
+  <option value="180">past 6 months</option>
+  <option value="365">past year</option>
   </select>
-  <input type="submit" value="Search" />
-  </form>
+  </div>
+  <div class="columns small-2">
+  <input class="button postfix" value="Search" type="submit">
+  </div>
+  </div>
 
   <div class="row ">
   <div class="columns small-11">
@@ -80,7 +89,8 @@
   <samp>{{ site.help_email }}</samp> mailing list.
   Most Octave users do not want to receive bug reports.
   </div>
-  </p>
+  </div>
+  </div>
 
 - **IRC Chat**:
   Too impatient for email? You can find Octave developers and users on the