Further improve website and bump version numbers.

jidesoft · Feb 21, 2014 · 2886c49 · 2886c49
1 parent 814568c
commit 2886c49
Show file tree

Hide file tree

Showing 14 changed files with 261 additions and 232 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
 	"name": "jide.js",
-	"version": "1.0.0-beta3",
+	"version": "1.0.0-beta4",
     "description": "jide.js is a free UI toolkit for modern web applications based on data binding and separation of concerns.",
     "authors": ["Patrick Gotthardt <[email protected]> (http://www.pagosoft.com)"],
     "repository": {

diff --git a/demo/apps/contacts/index.html b/demo/apps/contacts/index.html
@@ -9,5 +9,13 @@
     <script src="../../../bower_components/requirejs/require.js"></script>
     <script src="/jidejs-core.js"></script>
     <script src="main.js"></script>
+    <script>
+        (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+            (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+                m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+        })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+        ga('create', 'UA-1514948-2', 'jidesoft.com');
+        ga('send', 'pageview');
+    </script>
 </body>
 </html>
diff --git a/demo/apps/email/index.html b/demo/apps/email/index.html
@@ -11,5 +11,13 @@
 <script src="../../../bower_components/requirejs/require.js"></script>
 <script src="/jidejs-core.js"></script>
 <script src="main.js"></script>
+<script>
+    (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+        (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+            m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+    })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+    ga('create', 'UA-1514948-2', 'jidesoft.com');
+    ga('send', 'pageview');
+</script>
 </body>
 </html>
diff --git a/demo/apps/issues/index.html b/demo/apps/issues/index.html
@@ -131,5 +131,13 @@ <h2>Reading the demo sources</h2>
     </script>
 </head>
 <body>
+<script>
+    (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+        (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+            m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+    })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+    ga('create', 'UA-1514948-2', 'jidesoft.com');
+    ga('send', 'pageview');
+</script>
 </body>
 </html>
diff --git a/gulpfile.js b/gulpfile.js
@@ -42,6 +42,8 @@ var gulp = require('gulp'),
     less = require('gulp-less'),
     zip = require('gulp-zip'),
     minifyCSS = require('gulp-minify-css'),
+    csso = require('gulp-csso'),
+    imagemin = require('gulp-imagemin'),
     rjs = require('gulp-requirejs'),
     clean = require('gulp-clean'),
     rename = require('gulp-rename'),
@@ -133,7 +135,7 @@ gulp.task('clean:jsdoc', function() {
     return gulp.src('./website/contents/api', {read:false})
         .pipe(clean());
 });
-gulp.task('clean', ['clean:compiled', 'clean:build', 'clean:api', 'clean:website']);
+gulp.task('clean', ['clean:compiled', 'clean:build', 'clean:jsdoc', 'clean:website']);
 //endregion /CLEAN
 
 //region COMPILE used resources for jide.js (style, templates)
@@ -363,8 +365,14 @@ gulp.task('website:optimize:rjs', [
 //endregion WEBSITE:OPTIMIZE:RJS
 
 //region WEBSITE:OPTIMIZE:MINIFY Minfiy all build files
+gulp.task('website:optimize:minify:images', ['website:build'], function() {
+    return gulp.src('./website/build/**/*.(gif|jpe?g|png)')
+        .pipe(imagemin())
+        .pipe(gulp.dest('./website/build/'));
+});
 gulp.task('website:optimize:minify:css', ['website:build'], function() {
     return gulp.src('./website/build/**/*.css')
+        .pipe(csso())
         .pipe(minifyCSS({}))
         .pipe(gulp.dest('./website/build/'));
 });
@@ -373,7 +381,11 @@ gulp.task('website:optimize:minify:js', ['website:build', 'website:optimize:rjs'
         .pipe(uglify())
         .pipe(gulp.dest('website/build/'));
 });
-gulp.task('website:optimize:minify', ['website:optimize:minify:css', 'website:optimize:minify:js']);
+gulp.task('website:optimize:minify', [
+    'website:optimize:minify:css',
+    'website:optimize:minify:js',
+    'website:optimize:minify:images'
+]);
 //endregion WEBSITE:OPTIMIZE:MINIFY
 
 gulp.task('website:optimize', ['website:optimize:minify']);

diff --git a/jsdoc/jidejs/tmpl/layout.tmpl b/jsdoc/jidejs/tmpl/layout.tmpl
@@ -40,7 +40,7 @@
     <link rel="stylesheet" type="text/css" href="/style/MyFontsWebfontsKit.css">
     <link type="text/css" rel="stylesheet" href="/style/docs.css">
 </head>
-<body class="container-fluid">
+<body>
 <div class="navbar navbar-fixed-top">
     <div class="navbar-inner">
         <a class="brand" href="http://js.jidesoft.com">jide.js</a>
@@ -53,6 +53,7 @@
         </ul>
     </div>
 </div>
+<div class="container-fluid">
 <div class="row-fluid">
     <aside class="span3">
         <nav class="apidoc">
@@ -63,9 +64,9 @@
         <?js= content ?>
     </article>
 </div>
-
+</div>
 <!--==============================footer=================================-->
-<footer class="row-fluid">
+<footer>
     <p>JIDE Software, Inc. 2002-<script>document.write(new Date().getFullYear());</script> | <a href="http://www.jidesoft.com/company/privacy.html">Privacy Policy</a></p>
     <p>Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc <?js= env.version.number ?></a> on <?js= (new Date()) ?></p>
 </footer>

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "jide",
-  "version": "1.0.0-beta3",
+  "version": "1.0.0-beta4",
   "author": "Patrick Gotthardt, <[email protected]>",
   "description": "jide.js is a free UI toolkit for modern web applications based on data binding and separation of concerns.",
   "keywords": [
@@ -74,6 +74,8 @@
     "gulp-changed": "~0.2.0",
     "event-stream": "~3.1.0",
     "gulp-util": "~2.2.14",
-    "wintersmith-livereload": "~0.1.1"
+    "wintersmith-livereload": "~0.1.1",
+    "gulp-csso": "~0.2.3",
+    "gulp-imagemin": "~0.1.5"
   }
 }
diff --git a/website/contents/examples/docs.js b/website/contents/examples/docs.js
@@ -4,12 +4,12 @@ function replaceOutput(root, code) {
 
 function initUI(e, example) {
 	require(['jidejs/ui/control/Button'], function(Button) {
-		var outputElement = e.querySelector('[data-role="output"]')
-			, jseditor = e.querySelector('[data-role="jseditor"]')
-			, titleElement = e.querySelector('[data-role="title"]')
-			, introElement = e.querySelector('[data-role="intro"]')
-			, aboutElement = e.querySelector('[data-role="about"]')
-			, buttonElement = e.querySelector('[data-role="run"]');
+		var outputElement = document.querySelector('[data-role="output"]')
+			, jseditor = document.querySelector('[data-role="jseditor"]')
+			, titleElement = document.querySelector('[data-role="title"]')
+			, introElement = document.querySelector('[data-role="intro"]')
+			, aboutElement = document.querySelector('[data-role="about"]')
+			, buttonElement = document.querySelector('[data-role="run"]');
 
 		jseditor.innerHTML = '';
 		buttonElement.innerHTML = '';
@@ -22,7 +22,7 @@ function initUI(e, example) {
 		var runButton = new Button({
 			element: buttonElement,
 			text: 'Run',
-			//classList: ['btn', 'btn-primary'],
+			classList: ['btn', 'btn-primary', 'btn-large'],
 			on: {
 				click: function() {
 					outputElement.innerHTML = example.get().html || '';

diff --git a/website/contents/guide/00-installation/021-with-npm.md b/website/contents/guide/00-installation/021-with-npm.md
@@ -37,7 +37,7 @@ npm install deamdify --save-dev
 
 Now that you have installed all required dependencies for your application, you can start to create your application.
 To keep the scope of this documentation small, we'll create a very simple application. The
-[Yeoman Quickstart]{/guide/00-installation/03-with-yeoman.html) will create a larger sample application and comes with
+[Yeoman Quickstart](/guide/00-installation/03-with-yeoman.html) will create a larger sample application and comes with
 a preview server and several other useful tools.
 
 Create an index.html file at your project root, and insert something along the lines of:
@@ -79,7 +79,7 @@ document.body.appendChild(new Button({
 # Creating the Bundle
 
 Browserify requires you to create a bundle every time you changed your application. The
-[Yeoman Generator]{/guide/00-installation/03-with-yeoman.html) will help you to create a build script that takes care
+[Yeoman Generator](/guide/00-installation/03-with-yeoman.html) will help you to create a build script that takes care
 of this for you but in the meantime, you can try to run this command:
 
 ```

diff --git a/website/contents/style/apidoc.less b/website/contents/style/apidoc.less
@@ -0,0 +1,119 @@
+.class-description {
+  font-style: italic;
+  font-size: 130%;
+  line-height: 140%;
+}
+
+section
+{
+  display: block;
+}
+
+.variation {
+  display: none;
+}
+
+.optional:after {
+  content: "opt";
+  font-size: 60%;
+  color: #aaa;
+  font-style: italic;
+  font-weight: lighter;
+}
+
+footer {
+  font-style: italic;
+  font-size: 90%;
+}
+
+h5, .container-overview .subsection-title
+{
+  font-size: 120%;
+  font-weight: bold;
+  letter-spacing: -0.01em;
+}
+
+.important
+{
+  font-weight: bold;
+  color: #950B02;
+}
+
+.yes-def {
+  text-indent: -1000px;
+}
+
+.type-signature {
+  color: #ddd;
+}
+
+.name, .signature, .CodeMirror pre, .CodeMirror-linenumber, .prettyprint code, code.prettyprint,
+code, pre, .params .type {
+  font-family: "Source Code Pro", Consolas, "Lucida Console", Monaco, monospace;
+}
+
+.details {  }
+.details dt { border-left: 2px solid #DDD; }
+.details dd {  }
+.details ul {  }
+.details ul { }
+.details li { }
+
+dd { margin-left: 40px; }
+
+.description {
+}
+
+.code-caption
+{
+  font-style: italic;
+  font-family: Palatino, 'Palatino Linotype', serif;
+  font-size: 107%;
+  margin: 0;
+}
+
+.prettyprint
+{
+  border: 1px solid #ddd;
+  width: 80%;
+  overflow: auto;
+}
+
+.prettyprint.source {
+  width: inherit;
+}
+
+.prettyprint code, code.prettyprint
+{
+  font-size: 13px;
+  line-height: 18px;
+  display: block;
+  margin: 0;
+  text-space-collapse: preserve;
+}
+
+.params {
+  code {
+    color: #FFF;
+  }
+
+  dl {
+    margin-left: 10px;
+  }
+
+  .type {
+    color: #DDD;
+
+    &:before {
+      content: "{";
+    }
+
+    &:after {
+      content: "}";
+    }
+  }
+}
+
+.apidoc > ul > .nav-header {
+  text-transform: none;
+}