Merge pull request #37 from Joe7M/master

Website redesign

Author: chrisws

_build/Makefile

@@ -22,7 +22,6 @@ pandoc_options=--from markdown-tex_math_dollars --to html5 --syntax-definition=s
 pandoc_ide_options=--from markdown-tex_math_dollars --to html5
 bas = $(patsubst layouts/%.html, $(out)/%.bas, $(wildcard layouts/*.html))
 pages = $(patsubst pages/%.markdown, $(out)/pages3/%.html, $(wildcard pages/*.markdown))
-posts = $(patsubst posts/%.markdown, $(out)/posts3/%.html, $(wildcard posts/*.markdown))
 scripts = $(patsubst scripts/%.html, $(out)/scripts2/%.html, $(wildcard scripts/*.html))
 reference = $(patsubst reference/%.markdown, $(out)/reference3/%.html, $(wildcard reference/*.markdown))
 reference_txt = $(patsubst reference/%.markdown, $(out)/reference_txt/%.txt, $(wildcard reference/*.markdown))
@@ -65,18 +64,6 @@ $(out)/pages3/%.html: $(out)/pages2/%.html
 	$(mkdir)
 	$(sbasic) $(out)/sitepage.bas $< > $@
 
-$(out)/posts/%.html: posts/%.markdown
-	$(mkdir)
-	$(pandoc) $(pandoc_options) -o $@ $<
-
-$(out)/posts2/%.html: $(out)/posts/%.html $(bas)
-	$(mkdir)
-	$(sbasic) $(out)/article.bas $< > $@
-
-$(out)/posts3/%.html: $(out)/posts2/%.html
-	$(mkdir)
-	$(sbasic) $(out)/sitepage.bas $< > $@
-
 $(out)/scripts/%.bas: scripts/%.html $(bas) refindex.bas
 	$(mkdir)
 	$(sbasic) mkpage.bas $< > $@
@@ -100,15 +87,12 @@ $(out)/reference_ide/%.html: reference/%.markdown
 all: $(reference) $(reference_ide) $(out)/sbref.txt $(out)/sbasic_ref.csv $(pages) $(posts) $(scripts)
 	@mkdir -p ../reference/ide
 	@mkdir -p ../pages
-	@mkdir -p ../posts
 	@$(sbasic) deploy.bas
 	@cp $(out)/sbref.txt ../reference/
 	@cp $(out)/pages3/*.html ../pages
-	@cp $(out)/posts3/*.html ../posts
 	@cp $(out)/scripts2/*.html ../pages
 	@mv ../pages/index.html ../
 	@cp layouts/index.html ../pages
-	@cp layouts/index.html ../posts
 	@cp layouts/index.html ../samples
 	@cp layouts/index.html ../reference
 	@cp layouts/index.html ../reference/ide

_build/includes/footer.html

@@ -4,7 +4,6 @@
       <a href="https://en.wikipedia.org/wiki/Markdown" target="_blank" rel="nofollow">Markdown</a>
       processed with
       <a href="https://pandoc.org/MANUAL.html#pandocs-markdown" target="_blank" rel="nofollow">{{ pandoc_version }}</a>
-      | Template by <a href="http://html5-templates.com/" target="_blank" rel="nofollow">HTML5 Templates</a>
     </div>
   </div>
 </div>

_build/includes/header.html

@@ -1,51 +1,23 @@
+<button onclick="topFunction()" id="BackToTopBtn" title="Go to top">&#11205;</button>
+<script src="/backtotop.js"></script>
 <div class="wrapAll clearfix">
-  <div class="sidebar">
+  <nav class="navigation">
     <div class="logo">
-      <a href="/"><img src='/images/sb-desktop-128x128.png' alt="logo"></a>
+      <a href="/"><img src='/images/sb-logo.png' alt="logo"></a>
     </div>
-    <div class="navigation">
-      <h4>SmallBASIC</h4>
-      <ul>
-        <li><a href="/">Main page</a></li>
-        <li><a href="/pages/download.html">Download</a></li>
-        <li><a href="/pages/reference.html">Language reference</a></li>
-        <li><a href="/pages/samples.html">Code library</a></li>
-      </ul>
-      <hr class="menuSeparator"/>
-      <ul>
-        <li><a href="/pages/news.html">News</a></li>
-        <li><a href="/pages/articles.html">Articles</a></li>
-        <li><a href="/pages/community.html">Community</a></li>
-        <li><a href="/pages/changelog.html">Changelog</a></li>
-        <li><a href="/pages/screenshots.html">Screenshots</a></li>
-        <li><a href="/pages/links.html">Links</a></li>
-      </ul>
+    <div class="navlinks">
+      <a href="/pages/download.html">Download</a>
+      <a href="/pages/news.html">News</a>
+      <a href="/pages/community.html">Community</a>
+      <a href="/pages/articles.html">Resources</a>
+      <a href="/pages/reference.html">Language Reference</a>
+      <a href="/pages/guide.html">SmallBASIC Manual</a>
     </div>
-  </div>
+  </nav>
   <div class="mainsection">
     <div class="tabs clearfix">
-      <div class="tabsLeft">
-        <ul>
-          <li><a href="#" class="active">Article</a></li>
-          <li><a href="https://www.syntaxbomb.com/smallbasic">Discuss</a></li>
-        </ul>
-      </div>
-      <div id="simpleSearch">
-        <form action="https://github.com/smallbasic/smallbasic.github.io/search"
-              target="_github" accept-charset="UTF-8" method="get" style="display:inline">
-          <div id="submitSearch">
-            <button type="submit">&nbsp;</button>
-            <input type="hidden" class="js-site-search-type-field" name="type">
-            <input type="hidden" name="utf8" value="✓">
-            <input type="hidden" name="l" value="Visual Basic">
-            <input type="text" name="q" placeholder="Search" id="searchInput">
-          </div>
-        </form>
-      </div>
       <div class="tabsRight">
-        <ul>
-          <li><a target="_github" href="{{ page.sourceurl }}">View source</a></li>
-          <li><a target="_github" href="{{ page.changesurl }}">View history</a></li>
-        </ul>
+          <a target="_github" href="{{ page.sourceurl }}">Edit</a>
+          <a target="_github" href="{{ page.changesurl }}">History</a>
       </div>
     </div>

_build/layouts/reference.html

@@ -59,22 +59,5 @@ <h1>{{ upper(page.name) }}</h1>
       <a href="/reference/{{ next_item[1] }}.html">{{ next_item[0] }} </a>&nbsp;
       {% next next_item %}
     </div>
-    <div class="subtitle">
-      If there is insufficient information on this page and you wish learn more about {{ page.name }},
-      please send an email to smallbasic@gmail.com. You can help to improve information about
-      {{ page.name }} by submitting a <a href="https://github.com/smallbasic/smallbasic.github.io/pulls">pull request</a>,
-      click View Source for details. Note, an offline language reference text file is also available - see the Download section.
-    </div>
-  </div>
-  <div class="categories">
-    <a href="/pages/console.html">Console </a>
-    <a href="/pages/data.html">Data </a>
-    <a href="/pages/date.html">Date </a>
-    <a href="/pages/file.html">File </a>
-    <a href="/pages/graphics.html">Graphics </a>
-    <a href="/pages/language.html">Language </a>
-    <a href="/pages/math.html">Math </a>
-    <a href="/pages/string.html">String </a>
-    <a href="/pages/system.html">System </a>
   </div>
 </div>

_build/pages/articles.markdown

@@ -2,11 +2,12 @@
 
 ## Programming in SmallBASIC
 
-- [User guide](/pages/guide.html): brief description of SmallBASIC for advanced BASIC users
-- Programming SmallBASIC  by Gerard Thomas Labèrnia: great starting point for all who want to learn programing in SmallBASIC
+- [SmallBASIC Manual](/pages/guide.html): Brief description of SmallBASIC for advanced BASIC users
+- Programming SmallBASIC by Gerard Thomas Labèrnia: great starting point for all who want to learn programing in SmallBASIC
   - [English](/pages/course_gtl.html)
   - [Catalan](/docs/smallbasic.ca.pdf)
 - [Vademecum](/pages/vade.html): comprehensive tutorial for beginners and experts
+- [Code Library](/pages/samples.html): Huge collection of examples
 - [Escape codes](/pages/escape.html)
 - [TRY/CATCH](/pages/trycatch.html)
 - [Network programming](/pages/network.html)
@@ -38,6 +39,8 @@
 
 ## Miscellaneous
 
+- [Changelog](/pages/changelog.html)
 - [Android Changelog](/pages/android_changelog.html)
+- [Screenshots](/pages/screenshots.html)
 - [Contributing](/pages/contributing.html)
 

_build/pages/community.markdown

@@ -5,14 +5,44 @@
 - [SyntaxBomb / SmallBASIC](https://www.syntaxbomb.com/smallbasic)
 
 ## Issues
+
 - [GitHub](https://github.com/smallbasic/SmallBASIC/issues){target=new}
 
 ## Email
+
 - [smallbasic@gmail.com](mailto:smallbasic@gmail.com)
 
+## Source Code
+
+- [Github](https://github.com/smallbasic){target=_blank}
+- [License](http://www.gnu.org/licenses/gpl.html){target=_blank}
+- [Sourceforge Project page](http://sourceforge.net/projects/smallbasic/){target=_blank}
+- [All sourceforge releases](http://sourceforge.net/project/showfiles.php?group_id=22348){target=_blank}
+- [Source code analysis](https://scan.coverity.com/projects/smallbasic){target=_blank}
+
+## External Articles
+
+- [Wikipedia entry](http://en.wikipedia.org/wiki/SmallBASIC){target=_blank}
+- [Learn X in Y minutes](https://learnxinyminutes.com/docs/smallbasic/){target=_blank}
+- [David A. Wheeler's Suggestions for PalmOS PDA Users](http://www.dwheeler.com/palm-suggest.html){target=_blank}
+
+## External Documentation
+
+- [Dartmouth BASIC spec circa 1964](http://www.bitsavers.org/pdf/dartmouth/BASIC_Oct64.pdf){target=_blank}
+
+## ECMA-55
+
+- [John's ECMA-55 Minimal BASIC Compiler](http://buraphakit.sourceforge.net/BASIC.shtml){target=_blank}
+- [STANDARD ECMA-55](http://sourceforge.net/p/buraphakit/MinimalBASIC/ci/default/tree/ECMA-55.TXT){target=_blank}
+
 ## Archived
+
 - [Google groups](https://groups.google.com/forum/#!forum/sbasic){target=_blank}
 - [Retrobasic](https://retrobasic.allbasic.info/index.php?PHPSESSID=pn2qric1ibenvcm6sc2ic49cra&board=22.0){target=_blank}
 - [Mailing List](https://sourceforge.net/projects/smallbasic/lists/smallbasic-public){target=_blank}
 - [Sourceforge Tickets](https://sourceforge.net/p/smallbasic/_list/tickets?source=navbar){target=_blank}
 
+## What About the Other "SmallBASIC?"
+
+We noticed there's another version of [SmallBASIC](https://smallbasic-publicwebsite.azurewebsites.net){target=_blank}.
+Other than the naming coincidence, our version of SmallBASIC doesn't have anything to do with this other version.

_build/pages/contributing.markdown

@@ -1,28 +1,18 @@
 # Contributing
 
-## Reference documentation
-
-1  Navigate to the documentation page:
-
--  https://github.com/smallbasic/smallbasic.github.io
-
-2  Click clone to create your own copy.
-
-3  In your clone, navigate to any of the poorly documented SUBs/FUNCs
-
-- For example:
-
-- https://github.com/smallbasic/smallbasic.github.io/blob/master/_build/reference/569-data-data.markdown
-
-4 Click the edit link to make some improvements.
-
-- Since this is BASIC, in a lot of cases there's already some other place that could be used for "inspiration" for example;
-
-- https://www.c64-wiki.com/wiki/DATA
-
-5 Commit and raise a pull request.
-
-- Click "Create a new branch" for this commit and start a pull request.
--  Click "Learn more about pull requests."
--  Click "commit"
--  You don't need any special software to do any of this, just a web browser
+## Improve the Reference Documentation
+
+1. Navigate to the documentation page:
+   - [https://github.com/smallbasic/smallbasic.github.io](https://github.com/smallbasic/smallbasic.github.io)
+2. Click clone to create your own copy.
+3. In your clone, navigate to any of the documented SUBs/FUNCs
+   - For example DATA:
+   - [https://github.com/smallbasic/smallbasic.github.io/blob/master/_build/reference/569-data-data.markdown](https://github.com/smallbasic/smallbasic.github.io/blob/master/_build/reference/569-data-data.markdown)
+4. Click the edit link to make some improvements.
+   - Since this is BASIC, in a lot of cases there's already some other place that could be used for "inspiration" for example;
+   - [https://www.c64-wiki.com/wiki/DATA](https://www.c64-wiki.com/wiki/DATA)
+5. Commit and raise a pull request.
+   - Click "Create a new branch" for this commit and start a pull request.
+   - Click "Learn more about pull requests."
+   - Click "commit"
+   - You don't need any special software to do any of this, just a web browser

_build/pages/download.markdown

@@ -45,3 +45,7 @@
 
 [Offline help text](../reference/sbref.txt){target="_blank"}
 
+## Changelog
+
+- [Changelog](/pages/changelog.html)
+- [Android Changelog](/pages/android_changelog.html)