Major updates to styles and such.

forge · Mar 23, 2013 · 91d1b72 · 91d1b72
1 parent d9827d6
commit 91d1b72
Show file tree

Hide file tree

Showing 13 changed files with 140 additions and 73 deletions.
diff --git a/.gitignore b/.gitignore
@@ -11,3 +11,4 @@ TODO
 Guardfile
 Gemfile.lock
 vendor
+*~
diff --git a/_layouts/base.html.haml b/_layouts/base.html.haml
@@ -1,4 +1,3 @@
-!!!5
 %html
   %head
     %meta{ :charset=>'utf-8' }
@@ -24,6 +23,14 @@
         $("pre.prettyprint code").removeClass("prettyprint").removeClass("linenums");
         prettyPrint();
       });
+
+    :javascript
+      $(document).ready(function() {
+        var pathname = window.location.pathname;
+        console.log(pathname);
+        $("body > .navbar a[href='" + pathname + "']").closest("li").addClass("active");
+        $("body > #content ul.nav a[href='" + pathname + "#content']").closest("li").addClass("active");
+      });
     :javascript
       var _gaq = _gaq || [];
       _gaq.push(['_setAccount', 'UA-34467975-1']);
@@ -45,7 +52,7 @@
             %span.icon-bar
             %span.icon-bar
           %a.brand{ :href=>'/index.html' }
-            %img{ :src=>'/images/jbossforge_logo_100px.png', :alt=>'JBoss Forge'}
+            %img{ :src=>'/images/jbossforge_icon_256px.png', :alt=>'JBoss Forge', :class=>"forge-logo" }
           .nav-collapse
             %ul.nav
               %li
@@ -64,7 +71,7 @@
                 %a{ :target=>'roadmap', :href=>'https://issues.jboss.org/browse/FORGE#selectedTab=com.atlassian.jira.plugin.system.project%3Aroadmap-panel' } Roadmap
               %li
                 %a{ :href=>'/events.html' } Events
-    .content
+    .container#content
       ~ content
       %hr
       %footer

diff --git a/_layouts/docs.html.haml b/_layouts/docs.html.haml
@@ -1,34 +1,26 @@
 ---
 layout: base
 ---
-:javascript
-  $(document).ready(function() {
-    var pathname = window.location.pathname;
-    console.log(pathname);
-    $("body > .navbar a[href='/docs/index.html']").closest("li").addClass("active");
-    $("body > .content ul.nav a[href='" + pathname + "']").closest("li").addClass("active");
-  });
 
-
-.container-fluid
-  .row-fluid   
-    .span2
+.container
+  .row
+    .span3
       %ul.nav.nav-list
         %li.nav-header Using Forge
         - for doc in site.docs_using
           %li
-            %a{ :href=>doc.url}= doc.title        
+            %a{ :href=>doc.url + "#content"}= doc.title        
         %li.nav-header Get involved
         - for doc in site.docs_get_involved
           %li
-            %a{ :href=>doc.url}= doc.title        
+            %a{ :href=>doc.url + "#content"}= doc.title        
         %li.nav-header Important plugins
         - for doc in site.docs_important_plugins
           %li
-            %a{ :href=>doc.url}= doc.title
+            %a{ :href=>doc.url + "#content"}= doc.title        
         %li.nav-header Developing plugins
         - for doc in site.docs_plugin_development
           %li
-            %a{ :href=>doc.url}= doc.title
-    .span10 
+            %a{ :href=>doc.url + "#content"}= doc.title        
+    .span9
       ~ content
diff --git a/docs/get_involved/release-guide.textile b/docs/get_involved/release-guide.textile
@@ -3,7 +3,6 @@ layout: docs
 title: Release Guide
 index: 1
 ---
-
 h1. Release Guide
 
 h2. Updating Plugin Tags

diff --git a/docs/get_involved/write-docs.textile b/docs/get_involved/write-docs.textile
@@ -0,0 +1,23 @@
+---
+layout: docs
+title: Improve our documentation
+index: 2
+---
+h1. Improve our documentation
+
+We need your help! Good documentation is one of the most important things for a great Forge experience. It's really easy to help, so if you feel we are missing something in the docs, please add it. Be sure to follow the "contribution guide":http://forge.jboss.org/docs/get_involved/contribute.html when contributing documentation.
+
+The documentation is written in Textile, which is a lightweight markup language. 
+
+h3. Follow these steps to conribute documentation:
+
+# Clone "forge.github.com":http://github.com/forge/forge.github.com on GitHub.
+# Add a new .textile file in one of the sub directories of the docs directory. 
+# Push the empty Textile file to your GitHub repository.
+# Use the GitHub Textile editor to write your docs and preview changes. Of course you can use your own editor if you prefer so.
+
+The "Textile Wikipedia page":http://en.wikipedia.org/wiki/Textile_(markup_language) gives a good introduction about the markup language.
+
+h3. Some technical details
+
+The Forge website is built using Awestruct, and "the sources":http://github.com/forge/forge.github.com are on "github.com":http://github.com/forge/forge.github.com. However you don't have to install anything to contribute documentation! If you are interested in Awestruct anyway, you'll find a guide on the github page about how to setup and use Awestruct.
diff --git a/docs/index.html.haml b/docs/index.html.haml
@@ -2,26 +2,33 @@
 layout: docs
 ---
 
-%h1 Writing documentation
-We need your help! Good documentation is one of the most important things for broad adoption of Forge. It's really easy to help, so if you feel we are missing something in the docs, please add it :-)
+%h1 Get Started
+
 %p
-The documentation is written in Textile, which is a lightweight markup language. 
-%br
-Follow these steps to conribute documentation:
 %ol
-  %li Clone http://github.com/forge/forge.github.com on GitHub.
-  %li Add a new .textile file in one of the sub directories of the docs directory. 
-  %li Push the empty Textile file to your GitHub repository.
-  %li Use the GitHub Textile editor to write your docs and preview changes. Of course you can use your own editor if you prefer so.
-
-The Textile Wikipedia 
-%a{ :href => 'http://en.wikipedia.org/wiki/Textile_(markup_language)'} page 
-gives a good introduction about the markup language.
-
-%br
-%br
-%h3 Some technical details
-The Forge website is built using Awestruct, and the sources are on http://github.com/forge/forge.github.com. However you don't have to install anything to contribute documentation! If you are interested in Awestruct anyway, you'll find a guide on the github page about how to setup and use Awestruct. 
+  %li
+    %a{:href=>'https://repository.jboss.org/nexus/index.html#nexus-search;gav~org.jboss.forge~forge-distribution~1.*.Final~~'} Download
+    %span  and Un-zip Forge (or a recent
+    %a{:href=>'https://repository.jboss.org/nexus/index.html#nexus-search;gav~org.jboss.forge~forge-distribution~~~~kw,versionexpand'} snapshot build
+    %span ) into a folder on your hard-disk, this folder will be your FORGE_HOME
 
+  %li
+    %span Add '$FORGE_HOME/bin' to your path
+    %span (
+    %a{:href=>'http://www.google.com/search?q=windows+edit+path'} windows
+    %span ,
+    %a{:href=>'http://www.google.com/search?q=linux+set+path'} linux
+    %span ,
+    %a{:href=>'http://www.google.com/search?q=mac+osx+edit+path'} mac osx
+    %span )
+  %li * Consider installing Git and Maven 3.0.4+ (both optional)
+  %li Open a command prompt and run 'forge' (if you are on Windows, you will need to run forge.bat unless using a Unix-style terminal)
 
+%p
+%h3 What should I do next?
+Now you are ready to
+%a{:href=>"http://localhost:4242/docs/using/basic-javaee-app.html#content"} build an application.
 
+%p
+.video
+<iframe src="http://player.vimeo.com/video/26128736" width="500" height="313" frameborder="0" webkitAllowFullScreen mozallowfullscreen allowFullScreen></iframe>
diff --git a/docs/using/index.textile b/docs/using/index.textile
@@ -8,10 +8,6 @@ h1. Installing Forge
 
 Installing Forge is a relatively short process, and this guide will take you through the fundamentals (providing links to external materials if required;) however, if you encounter any issues with this process, please ask in the Forge Users mailing list, or if you think something is wrong with this guide, report a defect under "Documentation".
 
-h3. Get involved!
-
-If you would like to get involved, stop by the Forge Dev mailing list, file an issue, or come find us on irc.freenode.net, in channel #forge.
-
 h2. Install a Forge Distribution
 
 Follow these steps to install a Forge distribution:

diff --git a/images/jbossforge_icon_256px.png b/images/jbossforge_icon_256px.png
diff --git a/index.html.haml b/index.html.haml
@@ -2,37 +2,41 @@
 layout: base
 ---
 .container
+  .row{:style=>'margin-bottom: 45px;'}
+    %p
+      %center
+        %img{:src=>'/images/forge.png'}
+    %center
+      %pre
+        %strong The fastest way to build applications, share your software, and enjoy doing it.
+
   .container.hidden-phone
-    .row{:style=>'margin-bottom: 45px;'}
-      %p
-        %center
-          %img{:src=>'/images/forge.png'}
     .row
       .span6
         .row
           .span6
-            <iframe src="http://player.vimeo.com/video/47944743?title=0&amp;byline=0&amp;portrait=0" width="570" height="428" frameborder="0" webkitAllowFullScreen mozallowfullscreen allowFullScreen></iframe>
+            .video
+              <iframe width="560" height="315" src="http://www.youtube.com/embed/Clso5vtKu9k?rel=0" frameborder="0" allowfullscreen></iframe>
         .row
           .span6
             %center
-              %h2
+              %h5
                 %span Follow Forge on Twitter
                 %a{ :href =>'http://twitter.com/jbossforge'} @JBossForge
       .span6
-        .hero-unit
-          %h2 The new enterprise industrial evolution.
-          %p A core framework and next-generation shell for tooling and automation at a command line level; with APIs for integration in IDEs, extending built in functionality with plugins, and scripting for automating repetitive tasks, Forge is a tool every open-source developer should be looking at.
-
-          %p A core framework for rapid-application development in a standards-based environment. Plugins / incremental project enhancement for Java EE, and more.
-          %p
-            %a.btn.btn-primary.btn-large{ :href =>'#', :onclick=>'_gaq.push([\'_trackEvent\', \'Downloads\', \'1.2.2.Final\']);document.location.href=\'https://repository.jboss.org/nexus/service/local/artifact/maven/redirect?r=releases&g=org.jboss.forge&a=forge-distribution&v=1.2.2.Final&e=zip\''} Download (1.2.2.Final)
-            %a.btn.btn-secondary.btn-large{ :href =>'/docs/using/'} How to Install
+        .hero-unit{:style=>"min-height: 200px;"}
+          %center
+            %h2 The new enterprise industrial evolution.
+            %a.btn.btn-primary.btn-large{ :style=>"width: 89px;", :href =>'#', :onclick=>'_gaq.push([\'_trackEvent\', \'Downloads\', \'1.2.2.Final\']);document.location.href=\'https://repository.jboss.org/nexus/service/local/artifact/maven/redirect?r=releases&g=org.jboss.forge&a=forge-distribution&v=1.2.2.Final&e=zip\''} Download (1.2.2.Final)
+            %a.btn.btn-secondary.btn-large{ :style=>"width: 89px;", :href =>'/docs/using/'} How to Install
 
   .row.visible-phone
-    %h2 The new enterprise industrial evolution.
-    %p A core framework and next-generation shell for tooling and automation at a command line level; with APIs for integration in IDEs, extending built in functionality with plugins, and scripting for automating repeditive tasks, Forge is a tool every open-source developer should be looking at.
+    .hero-unit
+      %center
+        %h4 The new enterprise industrial evolution.
+        %a.btn.btn-primary.btn-large{ :style=>"width: 89px;", :href =>'#', :onclick=>'_gaq.push([\'_trackEvent\', \'Downloads\', \'1.2.2.Final\']);document.location.href=\'https://repository.jboss.org/nexus/service/local/artifact/maven/redirect?r=releases&g=org.jboss.forge&a=forge-distribution&v=1.2.2.Final&e=zip\''} Download (1.2.2.Final)
+        %a.btn.btn-secondary.btn-large{ :style=>"width: 89px;", :href =>'/docs/using/'} How to Install
 
-    %p A core framework for rapid-application development in a standards-based environment. Plugins / incremental project enhancement for Java EE, and more.
   .row
     .span6
       %h2 Quick Install
@@ -64,13 +68,14 @@ layout: base
           %li * Consider installing Git and Maven 3.0+ (both optional)
           %li Open a command prompt and run 'forge' (if you are on Windows, you will need to run forge.bat unless using a Unix-style terminal)
     .span6
-      %h2 News
-      - for post in site.posts
-        %li
-          %h3
-            %a{ :href=>post.url }#{post.title}
-          - if (post.content.length > 0)
-            %p{:style=>"color: #666;"}
-              %strong #{post.date.year}-#{post.date.month}-#{post.date.day}: #{post.author}
-            %p= summarize(html_to_text(post.content), 50)
+      %h2 Latest News
+      %ul.simple
+        - for post in site.posts
+          %li
+            %h3
+              %a{ :href=>post.url }#{post.title}
+            - if (post.content.length > 0)
+              %p{:style=>"color: #666;"}
+                %strong #{post.date.year}-#{post.date.month}-#{post.date.day}: #{post.author}
+              %p= summarize(html_to_text(post.content), 50)
 
diff --git a/javascripts/videoscale.js b/javascripts/videoscale.js
@@ -4,7 +4,7 @@ jQuery(function() {
 	var $allVideos = jQuery("iframe[src^='http://www.youtube.com'],iframe[src^='http://www.youtube-nocookie.com'],iframe[src^='http://player.vimeo.com']"),
 
 	    // The element that is fluid width
-	    $fluidEl = jQuery(".span6");
+	    $fluidEl = jQuery(".video");
 
 	// Figure out and save aspect ratio for each video
 	$allVideos.each(function() {

diff --git a/plugins.html.haml b/plugins.html.haml
@@ -1,7 +1,8 @@
 ---
 layout: base
 ---
-.container
+%h2 Search for plugins
+.container{:style=>'padding-top: 30px;'}
   %p Installing plugins in Forge is simple - you need only use the built-in `forge find-plugin` and `forge install-plugin` commands to search and install any of the plugins listed below. Alternatively, you may use `forge git-plugin` and `forge source-plugin` to install plugins from third party repositories, or from your local filesystem.
 
 %script
@@ -23,9 +24,8 @@ layout: base
     });
   });
 
-.container
-  %input{:type=>'text', :id=>'filterInput'}
-
+.container{:style=>'padding-top: 30px;'}
+  %input{:type=>'text', :id=>'filterInput', :placeholder=>'Start typing to search'}
   %table.table.table-striped.table-bordered.table-condensed{:id=>'pluginTable'}
     %tr
       %th

diff --git a/stylesheets/bootstrap.min.css b/stylesheets/bootstrap.min.css
diff --git a/stylesheets/styles.scss b/stylesheets/styles.scss
@@ -4,10 +4,38 @@
 // Include responsive Bootstrap styles
 @import "bootstrap-responsive";
 
+html {
+   text-align: left;
+}
+
+body {
+   padding-top: 70px;
+   margin-left: auto;
+   margin-right: auto;
+
+    font-family: "Helvetica Neue Light","Helvetica Neue",Helvetica,Arial,Arial,sans-serif;
+    font-size: 16px;
+    font-weight: 300;
+    line-height: 20px;
+}
+
 .navbar .brand {
     max-height: 100px;
     overflow: visible;
     padding-top: 0;
     padding-bottom: 0;
 }
 
+.forge-logo {
+   height: 35px;
+   width: 35px;
+}
+
+ul.simple {
+   list-style-type: none;
+   margin-left: 0px;
+}
+
+.video {
+   width: 100%;
+}