Fix #3 through Frege/frege-interpreter@3b6cd90, Fix UI not to overflow

Frege · Sep 2, 2013 · 026a5ae · 026a5ae
1 parent 6015d9e
commit 026a5ae
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 22 deletions.
diff --git a/try-frege-web/src/main/webapp/css/repl.css b/try-frege-web/src/main/webapp/css/repl.css
@@ -48,19 +48,6 @@ div.console span.jquery-console-prompt-label {
     font-weight: bold
 }
 
-.footer {
-    font-weight: italic;
-    text-align: right;
-    font-size: 10px;
-    color: #444;
-    font-family: Terminus, Consolas, Profont, "Andale Mono", Monaco,
-    Inconsolata, Inconsolata-g, Unifont, Lime, "ClearlyU PUA", Clean,
-    "DejaVu Sans Mono", "Lucida Console", "Bitstream Vera Sans Mono",
-    Freemono, "Liberation Mono", Dina, Anka, Droid Sans Mono,
-    Anonymous Pro, Proggy fonts, Envy Code R, Gamow, Courier,
-    "Courier New", Terminal, monospace;
-}
-
 div.morefrege {
     font-size: 14px;
     font-family: Consolas, Inconsolata, Profont, Terminus, "DejaVu Sans Mono","Andale Mono", Monaco,
@@ -86,9 +73,9 @@ div.morefrege {
 }
 
 ul.repolinks li:hover{background: #F39814; color: white;}
-ul.repolinks { list-style-type: none; margin: 0; padding: 0; width: 680px; }
-ul.repolinks li { margin: 3px 3px 3px 0; padding: 1px; float: left; width: 300px; height: 90px; font-size: 24px; text-align: center; }
+ul.repolinks { list-style-type: none; margin: 0; padding: 0;  }
+ul.repolinks li { margin: 3px 3px 3px 0; padding: 6px; float: left; width: 80%; font-size: 16px; text-align: center; }
 ul.repolinks li a { margin: 0px; display: block; width: 100%; height: 100%; }
 
 ul.features { }
-ul.features li {margin: 3px 3px 3px 0; padding: 4px; font-size:20px;}
+ul.features li {padding:2px; font-size:14px;}
diff --git a/try-frege-web/src/main/webapp/index.jsp b/try-frege-web/src/main/webapp/index.jsp
@@ -65,6 +65,9 @@
 						between Frege and Haskell</a></li>
           <li class="ui-state-default ui-corner-all"><a target="_blank"
 						href="https://github.com/Frege/frege/wiki/Calling-Frege-Code-from-Java">Calling Frege from Java</a></li>
+          <li class="ui-state-default ui-corner-all"><a target="_blank"
+						href="https://github.com/Frege/frege/tree/master/examples">Examples
+	(Brainfuck, Euler, Sudoku, Java Swing and more)</a></li>
           <li class="ui-state-default ui-corner-all"><a target="_blank"
 						href="http://fregepl.blogspot.com/">Author's Blog</a></li>
           <li class="ui-state-default ui-corner-all"><a target="_blank"
@@ -73,7 +76,7 @@
 				</ul>
 </td><td>
                              <div class="ui-widget-content ui-corner-all">
-                                 <h1>What is Frege?</h1><div class="widget-area" role="complementary">
+                                 <h4>What is Frege?</h4><div class="widget-area" role="complementary">
 				<ul class="features">
 					<li><a target="_blank" href="https://github.com/Frege/frege#readme">Frege</a>
 					is a non-strict, pure functional programming language in the spirit
@@ -89,7 +92,7 @@
 				</ul></div>
                                 </div><br/>
                                 <div class="ui-widget-content ui-corner-all">
-				<h1>Hello World!</h1>
+				<h4>Hello World!</h4>
 				<pre>
 					<code>
 module helloworld.Main where

diff --git a/try-frege-web/src/main/webapp/js/repl.js b/try-frege-web/src/main/webapp/js/repl.js
@@ -97,7 +97,7 @@ $(document).ready(function(){
         } else {
           fregeEval(line, report);
         }
-     } else if (line.match(/^:tutorial/i)) {
+     } /*else if (line.match(/^:tutorial/i)) {
         tutorialMode = true;
         $("div.console").parent().css({width:"50%"});
         $("#tutorial").parent().css({width:"50%"}, "slow");
@@ -107,7 +107,7 @@ $(document).ready(function(){
           "You can browse through tutorial by typing :1 for tutorial 1,\n" +
           ":2 for tutorial 2 and so on or by typing :next and :prev.\n" +
           "On the right side, the tutorial contents will be displayed.");
-     } else {
+     }*/ else {
        try {
          fregeEval(line, report);
        } catch (e) {
@@ -124,7 +124,7 @@ $(document).ready(function(){
  controller.promptText('');
 
   window.github = new Github({
-         token: "2cfc111c560520c526f7f7aa3f280bffa5fe1a12",
+         token: "", // Place a valid oauth token here
          auth: "oauth"
        });
   window.markdown = new Showdown.converter();
@@ -147,7 +147,7 @@ function navigateTutorial(cmd) {
   } else if (cmd == "prev") {
     navigateTutorial(tutPage - 1);
   } else {
-    repo.read('master', "tutorial/Tutorial-" + cmd + ".md", function(err, contents) {
+    repo.read('master', "try-frege-web/src/main/webapp/tutorial/Tutorial-" + cmd + ".md", function(err, contents) {
           if (contents) {
             $("#tutorial").html(markdown.makeHtml(contents));
             tutPage = parseInt(cmd);