From c83cebe47888d91f14938f0b1b03c245fccf47de Mon Sep 17 00:00:00 2001
From: Joel Latino <jlatino@sapo.pt>
Date: Mon, 19 Jan 2015 18:06:13 +0000
Subject: [PATCH] Some fixes

---
 dashboards/main.cdfde          |  32 +-
 dashboards/main.wcdf           |   2 +-
 dashboards/samples.cdfde       |  94 +++---
 dashboards/samples.wcdf        |   2 +-
 resources/styles/IvyDC.html    | 527 +++++++++++----------------------
 resources/styles/ivystyle.html | 298 -------------------
 6 files changed, 246 insertions(+), 709 deletions(-)
 delete mode 100644 resources/styles/ivystyle.html

diff --git a/dashboards/main.cdfde b/dashboards/main.cdfde
index 7f92d01..0e55b95 100644
--- a/dashboards/main.cdfde
+++ b/dashboards/main.cdfde
@@ -3023,32 +3023,32 @@
       "type": "JavaScript"
      },
      {
-      "name": "parameters",
+      "name": "colTypes",
       "value": "[]",
-      "type": "ValuesArray"
+      "type": "colTypesCustom"
      },
      {
-      "name": "colHeaders",
+      "name": "colFormats",
       "value": "[]",
       "type": "Array"
      },
      {
-      "name": "colTypes",
+      "name": "colWidths",
       "value": "[]",
-      "type": "colTypesCustom"
+      "type": "Array"
      },
      {
-      "name": "colFormats",
+      "name": "colSortable",
       "value": "[]",
       "type": "Array"
      },
      {
-      "name": "colWidths",
+      "name": "parameters",
       "value": "[]",
-      "type": "Array"
+      "type": "ValuesArray"
      },
      {
-      "name": "colSortable",
+      "name": "colHeaders",
       "value": "[]",
       "type": "Array"
      },
@@ -3239,19 +3239,14 @@
       "value": "MAP_QUERY_SAMPLE",
       "type": "Datasource"
      },
-     {
-      "name": "priority",
-      "value": 5,
-      "type": "Integer"
-     },
      {
       "name": "width",
       "value": "250",
       "type": "Integer"
      },
      {
-      "name": "height",
-      "value": "250",
+      "name": "priority",
+      "value": 5,
       "type": "Integer"
      },
      {
@@ -3259,6 +3254,11 @@
       "value": "",
       "type": "Integer"
      },
+     {
+      "name": "height",
+      "value": "250",
+      "type": "Integer"
+     },
      {
       "name": "colors",
       "value": "[]",
diff --git a/dashboards/main.wcdf b/dashboards/main.wcdf
index 93c4c45..c8d8f08 100644
--- a/dashboards/main.wcdf
+++ b/dashboards/main.wcdf
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<cdf><title>main</title><description>Clean Dashboard</description><author>IvyLabs</author><style>ivystyle - (IvyDC)</style><rendererType>bootstrap</rendererType><widget>false</widget><widgetName></widgetName><widgetParameters></widgetParameters></cdf>
\ No newline at end of file
+<cdf><title>main</title><description>Clean Dashboard</description><author>IvyLabs</author><style>IvyDC - (IvyDC)</style><rendererType>bootstrap</rendererType><widget>false</widget><widgetName></widgetName><widgetParameters></widgetParameters></cdf>
\ No newline at end of file
diff --git a/dashboards/samples.cdfde b/dashboards/samples.cdfde
index f056317..6edcdf0 100644
--- a/dashboards/samples.cdfde
+++ b/dashboards/samples.cdfde
@@ -3985,11 +3985,6 @@
       "value": "",
       "type": "JavaScript"
      },
-     {
-      "name": "colHeaders",
-      "value": "[]",
-      "type": "Array"
-     },
      {
       "name": "colTypes",
       "value": "[]",
@@ -4015,6 +4010,11 @@
       "value": "[]",
       "type": "ValuesArray"
      },
+     {
+      "name": "colHeaders",
+      "value": "[]",
+      "type": "Array"
+     },
      {
       "name": "parameters",
       "value": "[]",
@@ -4070,16 +4070,16 @@
       "value": "G2_QUERY",
       "type": "Datasource"
      },
-     {
-      "name": "sDom",
-      "value": "<'row'<'col-md-6'l><'col-md-6'f>r>t<'row'<'col-md-6'i><'col-md-6'p>>",
-      "type": "JavaScript"
-     },
      {
       "name": "sortBy",
       "value": "[]",
       "type": "SortByArray"
      },
+     {
+      "name": "sDom",
+      "value": "<'row'<'col-md-6'l><'col-md-6'f>r>t<'row'<'col-md-6'i><'col-md-6'p>>",
+      "type": "JavaScript"
+     },
      {
       "name": "priority",
       "value": 5,
@@ -4203,23 +4203,23 @@
       "type": "Datasource"
      },
      {
-      "name": "height",
+      "name": "width",
       "value": "250",
       "type": "Integer"
      },
      {
-      "name": "refreshPeriod",
-      "value": "",
+      "name": "priority",
+      "value": 5,
       "type": "Integer"
      },
      {
-      "name": "width",
-      "value": "250",
+      "name": "refreshPeriod",
+      "value": "",
       "type": "Integer"
      },
      {
-      "name": "priority",
-      "value": 5,
+      "name": "height",
+      "value": "250",
       "type": "Integer"
      },
      {
@@ -4243,12 +4243,12 @@
       "type": "JavaScript"
      },
      {
-      "name": "postExecution",
+      "name": "postFetch",
       "value": "",
       "type": "JavaScript"
      },
      {
-      "name": "postFetch",
+      "name": "postExecution",
       "value": "",
       "type": "JavaScript"
      },
@@ -5415,13 +5415,13 @@
       "type": "Id"
      },
      {
-      "name": "language",
-      "value": "beanshell",
+      "name": "initscript",
+      "value": "",
       "type": "String"
      },
      {
-      "name": "initscript",
-      "value": "",
+      "name": "language",
+      "value": "beanshell",
       "type": "String"
      },
      {
@@ -5486,13 +5486,13 @@
       "type": "Id"
      },
      {
-      "name": "language",
-      "value": "beanshell",
+      "name": "initscript",
+      "value": "",
       "type": "String"
      },
      {
-      "name": "initscript",
-      "value": "",
+      "name": "language",
+      "value": "beanshell",
       "type": "String"
      },
      {
@@ -5557,13 +5557,13 @@
       "type": "Id"
      },
      {
-      "name": "language",
-      "value": "beanshell",
+      "name": "initscript",
+      "value": "",
       "type": "String"
      },
      {
-      "name": "initscript",
-      "value": "",
+      "name": "language",
+      "value": "beanshell",
       "type": "String"
      },
      {
@@ -5628,13 +5628,13 @@
       "type": "Id"
      },
      {
-      "name": "language",
-      "value": "beanshell",
+      "name": "initscript",
+      "value": "",
       "type": "String"
      },
      {
-      "name": "initscript",
-      "value": "",
+      "name": "language",
+      "value": "beanshell",
       "type": "String"
      },
      {
@@ -5699,13 +5699,13 @@
       "type": "Id"
      },
      {
-      "name": "language",
-      "value": "beanshell",
+      "name": "initscript",
+      "value": "",
       "type": "String"
      },
      {
-      "name": "initscript",
-      "value": "",
+      "name": "language",
+      "value": "beanshell",
       "type": "String"
      },
      {
@@ -5770,13 +5770,13 @@
       "type": "Id"
      },
      {
-      "name": "language",
-      "value": "beanshell",
+      "name": "initscript",
+      "value": "",
       "type": "String"
      },
      {
-      "name": "initscript",
-      "value": "",
+      "name": "language",
+      "value": "beanshell",
       "type": "String"
      },
      {
@@ -5841,13 +5841,13 @@
       "type": "Id"
      },
      {
-      "name": "language",
-      "value": "beanshell",
+      "name": "initscript",
+      "value": "",
       "type": "String"
      },
      {
-      "name": "initscript",
-      "value": "",
+      "name": "language",
+      "value": "beanshell",
       "type": "String"
      },
      {
diff --git a/dashboards/samples.wcdf b/dashboards/samples.wcdf
index ab17f8f..d13ccdd 100644
--- a/dashboards/samples.wcdf
+++ b/dashboards/samples.wcdf
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<cdf><title>samples</title><description>Clean Dashboard</description><author>IvyLabs</author><style>ivystyle - (IvyDC)</style><rendererType>bootstrap</rendererType><widget>false</widget><widgetName></widgetName><widgetParameters></widgetParameters></cdf>
\ No newline at end of file
+<cdf><title>samples</title><description>Clean Dashboard</description><author>IvyLabs</author><style>IvyDC - (IvyDC)</style><rendererType>bootstrap</rendererType><widget>false</widget><widgetName></widgetName><widgetParameters></widgetParameters></cdf>
\ No newline at end of file
diff --git a/resources/styles/IvyDC.html b/resources/styles/IvyDC.html
index d08ca64..11515b9 100644
--- a/resources/styles/IvyDC.html
+++ b/resources/styles/IvyDC.html
@@ -1,350 +1,187 @@
+ 
 <!DOCTYPE html>
-<html lang="en">
+<!--[if lt IE 7]>      <html class="no-js lt-ie9 lt-ie8 lt-ie7"> <![endif]-->
+<!--[if IE 7]>         <html class="no-js lt-ie9 lt-ie8"> <![endif]-->
+<!--[if IE 8]>         <html class="no-js lt-ie9"> <![endif]-->
+<!--[if gt IE 8]><!--> <html class="no-js"> <!--<![endif]-->
     <head>
-        <meta http-equiv="content-type" content="text/html; charset=UTF-8"> 
+        <meta charset="utf-8">
+        <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
         <title>Ivy Dashboard Components</title>
         <meta name="author" content="Ivy Information Systems">
         <link rel="shortcut icon" href="../../../api/repos/IvyDC/static/custom/img/favicon.ico">
         <link rel="icon" type="image/x-icon" href="../../../api/repos/IvyDC/static/custom/img/favicon.ico">
+        <meta name="description" content="">
+        <meta name="viewport" content="width=device-width">
 
-        @HEADER@        
+        @HEADER@   
+        
+        <link rel="stylesheet" href="../../../api/repos/IvyDC/static/custom/css/icomoon-social.css">
+        <link href='http://fonts.googleapis.com/css?family=Open+Sans:400,700,600,800' rel='stylesheet' type='text/css'>
 
-        <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
-        <!--[if lt IE 9]>
-          <script src="//html5shim.googlecode.com/svn/trunk/html5.js"></script>
-        <![endif]-->
+		<link rel="stylesheet" href="../../../api/repos/IvyDC/static/custom/css/main.css">
+
+        <script src="../../../api/repos/IvyDC/static/custom/js/modernizr-2.6.2-respond-1.1.0.min.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-47483249-3', 'github.com');
+			ga('send', 'pageview');
+		</script>
         
-        <style type="text/css">
-            /* override bootstrap styles */
-          @import url('http://fonts.googleapis.com/css?family=Oswald:300,400:latin,latin-ext');
-
-          .navbar-form input, .form-inline input {
-            width:auto;
-          }
-
-          body {
-            padding-top:50px;
-            color:#646464;
-            background-color:#efefef;
-          }
-
-          h1,h2,h3,.highlight,.navbar a,#masthead h4 {
-            font-family:'Oswald',arial narrow,sans-serif;
-          }
-
-          footer {
-            margin-top:40px;
-            padding-top:40px;
-            padding-bottom:40px;
-            background-color:#cecece;
-          }
-
-
-          #masthead {
-            min-height:178px;
-            background-color:#B0E36F;
-            color:#aaaacc;
-          }
-
-          #masthead h1 {
-            font-size: 55px;
-            line-height: 1;
-            color:#fefeff;
-            margin-top:45px;
-          }
-
-          #masthead .well {
-            margin-top:31px;
-            padding-bottom: 5px;
-            padding-top: 5px;
-          }
-
-          #topPanel {
-            padding-top:0px;
-            padding-left:22px;
-            padding-right:22px;
-          }
-          #topPanel .panel-body {
-            padding-top:0px;
-          }
-
-          .navbar.affix {
-            position:fixed;
-            top:0;
-            width:100%;
-          }
-
-          .top-spacer {
-            background-color:#ffffff;
-            height:40px;
-          }
-
-          a,a:hover {
-            color:#223344;
-            text-decoration:none;
-          }
-
-          .icon-bar {
-            background-color:#fff;
-          }
-
-          @media screen and (min-width: 768px) {
-            #masthead h1 {
-              font-size: 60px;
-            }
-          }
-
-          .navbar-bright {
-            background-color:#8CC63F;
-            color:#fff;
-            margin-bottom: 0;
-            border-width: 0;
-          }
-
-          .navbar-bright a, .navbar-bright .navbar-brand, #masthead h4 {
-            color:#fff;
-            font-size:14px;
-            text-transform: uppercase;
-            letter-spacing:.08em;
-          }
-          
-          .navbar-bright li > a:hover, .navbar-bright li > a:focus {
-            background-color:#539100;
-          }
-
-          .navbar-bright button.navbar-toggle:hover{
-            background-color:#539100;
-          }
-
-          .dropdown-menu {
-            min-width: 250px;
-          }
-
-          .caret {
-            color:#fff;
-          }
-
-          .navbar-toggle {
-            color:#fff;
-            border-width:0;
-          }
-
-          .navbar-toggle:hover {
-            background-color:#fff;
-          }
-
-          .panel {
-            border-color:transparent;
-            border-radius:0;
-          }
-
-          .thumbnail {
-            margin-bottom:8px;
-          }
-
-          .img-container {
-            overflow:hidden;
-            height:170px;
-          }
-
-          .img-container img {
-            min-width:280px;
-            min-height:180px;
-            max-width:380px;
-            max-height:280px;
-          }
-
-          .txt-container {
-            overflow:hidden;
-            height:100px;
-          }
-
-          .panel .lead {
-            overflow:hidden;
-            height:90px;
-          }
-
-          .label-float{
-            margin:0 auto;
-            position: absolute;
-            top: 0;
-            z-index: 1;
-            width:100%;
-            opacity:.9;
-            padding:6px;
-            color:#fff;
-          }
-              
-          .btn-twitter {background-color:#4099FF;color:#fff;}
-          .btn-facebook {background-color:#4c66a4;color:#fff;}
-          .btn-linkedin {background-color:#3B5998;color:#fff;}
-          .btn-google-plus {background-color:#d34836;color:#fff;}
-          .btn-youtube {background-color:#BA1500;color:#fff;}
-          .btn-github {background-color:#808080;color:#fff;}
-
-          .btn-twitter:hover {background-color:#3088FF;color:#62BBFF;}
-          .btn-facebook:hover {background-color:#486ABD;color:#6A8DDE;}
-          .btn-linkedin:hover {background-color:#2A4998;color:#4C6BBA;}
-          .btn-google-plus:hover {background-color:#C23836;color:#E45A58;}
-          .btn-youtube:hover {background-color:#C20300;color:#E80300;}
-          .btn-github:hover {background-color:#A6A6A6;color:#BFBFBF;}
-
-          a.logo {
-              background-attachment: scroll;
-              background-clip: border-box;
-              background-color: rgba(0, 0, 0, 0);
-              background-origin: padding-box;
-              background-position: 0 50%;
-              background-repeat: no-repeat;
-              background-size: auto auto;
-              display: block;
-              height: 30px;
-              width: 60px;
-          }
-
-          .logo {
-              -moz-text-decoration-color: -moz-use-text-color;
-              -moz-text-decoration-line: none;
-              -moz-text-decoration-style: solid;
-              background-color: #FFFFFF;
-              border-bottom-left-radius: 2px;
-              border-bottom-right-radius: 2px;
-              border-top-left-radius: 2px;
-              border-top-right-radius: 2px;
-              color: #80CC28;
-              display: block;
-              font-size: 20px;
-              font-weight: 700;
-              margin-bottom: 9px;
-              margin-left: 10px;
-              margin-top: 5px;
-              padding-bottom: 3px;
-              padding-left: 3px;
-              padding-right: 3px;
-              padding-top: 3px;
-              text-align: center;
-              text-shadow: 0 0 1px;
-              width: 34px;
-          }
-
-          .nav.navbar-nav.navbar-right div.popover{
-            color: #333;
-          }
-        </style>
+        <script language="javascript" type="text/javascript">
+        
+			var dashboardProperties = {
+				name: "IvyDC",
+				mainTitle: "IvyDC - Ivy Dashboard Components"
+			}; 
+
+
+			var render_getMenuItemsComponent = {
+				type: "Query",
+				name: "render_getMenuItemsComponent",
+				priority: 5,
+				parameters: [],
+				executeAtStart: true,
+				listeners: [],
+				postFetch: function d(data){
+				
+					Dashboards.log("Loading Style Menu Items");
+
+					menuItemsHTML = "<li class='logo-wrapper'><h1 style='margin-bottom:0;margin-top:10px;'><span style='color:#8cc63f;font-weight:600;'>Ivy</span><span>DC</span></h1></li>";
+
+					$.each(data.resultset,function(idx, val){
+						menuItemsHTML += "<li><a href='"+val[1]+"'>"+val[0]+"</a></li>"
+					});
+
+					$('#mainMenuList').html(menuItemsHTML);
+				},
+				queryDefinition:  {
+					endpoint: "getMenuItems",
+					pluginId: "IvyDC",
+					stepName: "OUTPUT",
+					kettleOutput: "Json",
+					queryType: "cpk"
+				}
+			};
+
+			Dashboards.addComponents([render_getMenuItemsComponent]);
+
+		</script>
+
+		<style type="text/css">
+
+			h4 {
+				padding-left:15px;
+				margin-top:25px;
+				margin-bottom:15px;
+			} 
+
+			.h4p {
+				padding-left:25px;
+			} 
+			.affix{
+				top: 0px;
+			}
+		</style>
+
+		<script language="javascript" type="text/javascript">
+
+		$(function(){
+
+
+			$("#pageTitle").text(dashboardProperties.mainTitle);
+
+			var d = new Date();
+			$('.footer-copyright').html("&copy; "+d.getFullYear()+" Ivy Information Systems. All rights reserved.");
+			
+			$('#submitDetails, #declineDetails').click(function(){
+				render_setOptions.update();
+				$('#myModal').modal('hide');
+			});
+
+		});
+
+		</script>
     </head>
-    
-    
     <body>
+        <!--[if lt IE 7]>
+            <p class="chromeframe">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> or <a href="http://www.google.com/chromeframe/?redirect=true">activate Google Chrome Frame</a> to improve your experience.</p>
+        <![endif]-->
         
-      <header class="navbar navbar-bright navbar-fixed-top" role="banner">
-        <div class="container">
-          <div class="navbar-header">
-            <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#bs-navbar-collapse">
-              <span class="sr-only">Toggle navigation</span>
-              <span class="icon-bar"></span>
-              <span class="icon-bar"></span>
-              <span class="icon-bar"></span>
-            </button>
-            <a target="_blank" class="logo" href="http://www.ivy-is.co.uk">
-              <img style="margin-right:25px" class="logo" src="../../../api/repos/IvyDC/static/custom/img/ivy_logo.png">
-            </a>
-          </div>
-          <div class="navbar-collapse collapse" id="bs-navbar-collapse">
-            <ul class="nav navbar-nav">
-              <li>
-                <a href="main">Components</a>
-              </li>
-              <li>
-                <a href="samples">Samples</a>
-              </li>
-            </ul>
-            <ul class="nav navbar-nav navbar-right">
-              <li id="IvyBC-Link"><a href="http://www.ivy-is.co.uk/ivy-labs/pentaho-bootstrap-dashboards/" target="_blank">Get the Bootstrap Componentes!</a></li>
-            </ul>
-          </nav>
-        </div>
-      </header>
-
-      <div id="masthead">  
-        <div class="container">
-          <div class="row">
-            <div class="col-md-7">
-              <h1>Ivy CDE Components
-                <p class="lead"></p>
-              </h1>
-            </div>
-            <div class="col-md-5">
-              <div class="well"> 
-                <div class="row">
-                  <div class="col-sm-12">
-                    <div class="col-md-12">
-                      <h5>This plugin provides the Ivy IS CDE Community Components.</h5>
-                      <h5>Use the documentation and samples to understand how they work. Share your thoughts.</h5>
-                      <div class="col-md-6"><a href="https://twitter.com/share" class="twitter-share-button" data-url="http://www.ivy-is.co.uk/ivy-labs/ivy-software/" data-text="I'm using IvyDC - Ivy Dashboard Components for @pentaho" data-via="ivyinfosystems" data-hashtags="pentaho" data-dnt="true">Tweet</a>
-<script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+'://platform.twitter.com/widgets.js';fjs.parentNode.insertBefore(js,fjs);}}(document, 'script', 'twitter-wjs');</script></div><div class="col-md-6"><div class="fb-like" data-href="http://www.ivy-is.co.uk/ivy-labs/ivy-software/" data-layout="button_count" data-action="like" data-show-faces="true" data-share="true"></div></div>
-                    </div>
-                  </div>
-                </div>
-              </div>
-            </div>
-          </div> 
-        </div><!-- /cont -->
-        <div id="fb-root"></div>
-        <script>(function(d, s, id) {
-          var js, fjs = d.getElementsByTagName(s)[0];
-          if (d.getElementById(id)) return;
-          js = d.createElement(s); js.id = id;
-          js.src = "//connect.facebook.net/en_GB/sdk.js#xfbml=1&version=v2.0";
-          fjs.parentNode.insertBefore(js, fjs);
-        }(document, 'script', 'facebook-jssdk'));</script>
-        
-        <div class="container">
-          <div class="row">
-            <div class="col-md-12">
-              <div class="top-spacer"> </div>
-            </div>
-          </div> 
-        </div><!-- /cont -->
-        
-      </div>
-
-
-      <div class="container">
-        <div class="row">
-          <div class="col-md-12"> 
-            <div class="panel">
-              <div class="panel-body">
-                @CONTENT@                                                                                                         
-              </div>
-            </div>
-          </div><!--/col-12-->
-        </div>
-      </div>
-
-      <hr>
-
-      <div class="IvyDC-Footer">
-          @FOOTER@
-      </div>
-
-      <footer>
-        <div class="container" id="footer">
-        <div class="row">
-          <div class="col col-sm-12">
-            <h4><a href="http://www.ivy-is.co.uk" target="_blank">Copyright © 2014 Ivy Information Systems Ltd</a></h4>
-            <h3>Follow Us</h3>
-            <div class="btn-group">
-             <a class="btn btn-twitter btn-xs" href="https://twitter.com/ivyinfosystems" target="_blank"><i class="fa fa-twitter icon-large"></i> Twitter</a>
-             <a class="btn btn-facebook btn-xs" href="https://www.facebook.com/ivyinfosystems" target="_blank"><i class="fa fa-facebook icon-large"></i> Facebook</a>
-             <a class="btn btn-google-plus btn-xs" href="https://plus.google.com/+Ivy-isCoUk" target="_blank"><i class="fa fa-google-plus icon-large"></i> Google+</a>
-             <a class="btn btn-linkedin btn-xs" href="https://www.linkedin.com/company/ivy-information-systems-limited" target="_blank"><i class="fa fa-linkedin icon-large"></i> LinkedIn</a>
-             <a class="btn btn-youtube btn-xs" href="https://www.youtube.com/IvyIS" target="_blank"><i class="fa fa-youtube icon-large"></i> Youtube</a>
-             <a class="btn btn-github btn-xs" href="https://github.com/ivylabs" target="_blank"><i class="fa fa-github icon-large"></i> Github</a>
-            </div>
-          </div>
-        </div>
-      </div>
-      </footer>
+
+        <!-- Navigation & Logo-->
+        <div class="mainmenu-wrapper">
+	        <div class="container">
+		        <nav id="mainmenu" class="mainmenu">
+					<ul class="nav navbar-nav" id="mainMenuList"></ul>
+					<ul class="nav navbar-nav navbar-right">
+		              <li id="IvyBC-Link" data-original-title="" title=""><a href="http://www.ivy-is.co.uk/ivy-labs/pentaho-bootstrap-dashboards/" target="_blank">Get the Bootstrap Componentes!</a></li>
+		            </ul>
+				</nav>
+			</div>
+		</div>
+		
+		<div id="dashboardBreadcrumbs" class="section section-breadcrumbs">
+    		<div class="container">
+				<div class="row">
+					<div class="col-md-12">
+						<h1 id="pageTitle">Title</h1>
+					</div>
+				</div>
+			</div>
+		</div>
+		
+		<div class="container" style="padding:20px;">
+
+		@CONTENT@
+		
+		</div>
+
+	    <!-- Footer -->
+	    <div class="footer">
+	    	<div class="container">
+		    	<div class="row">
+		    		<div class="col-footer col-md-4 col-xs-12">
+		    			<h3>Useful Links</h3>
+		    			<ul class="no-list-style footer-navigate-section">
+		    				<li><a href="http://www.ivy-is.co.uk" target="_blank">Website</a></li>
+		    				<li><a href="http://www.ivy-is.co.uk/blog" target="_blank">Blog</a></li>
+		    				<li><a href="http://www.ivy-is.co.uk/ivy-labs/ivy-software/" target="_blank">Plugins</a></li>
+		    				<li><a href="http://www.ivy-is.co.uk/services/pentaho-solutions/" target="_blank">Services</a></li>
+		    			</ul>
+		    		</div>
+		    		
+		    		<div class="col-footer col-md-4 col-xs-12">
+		    			<h3>Contacts</h3>
+		    			<p class="contact-us-details">
+	        				<b>Address:</b> 10 York Place Edinburgh, Scotland, EH1 3EP<br/>
+	        				<b>Phone:</b> +44 (0)131 524 8144<br/>
+	        				<b>Email:</b> <a href="mailto:enquiries@ivy-is.com">enquiries@ivy-is.com</a>
+	        			</p>
+		    		</div>
+		    		<div class="col-footer col-md-4 col-xs-12">
+		    			<h3>Stay Connected</h3>
+		    			<ul class="footer-stay-connected no-list-style">
+		    				<li><a href="https://www.facebook.com/ivyinfosystems" target="_blank" class="facebook"></a></li>
+		    				<li><a href="https://twitter.com/ivyinfosystems" target="_blank" class="twitter"></a></li>
+		    			</ul>
+		    		</div>
+		    	</div>
+		    	<div class="row">
+		    		<div class="col-md-12">
+		    			<div class="footer-copyright">&copy; 2014 Ivy Information Systems. All rights reserved.</div>
+		    		</div>
+		    	</div>
+		    </div>
+	    </div>
+	    
+	    
+	    @FOOTER@
+
 
       <script>
         $('#IvyBC-Link').popover({
@@ -359,6 +196,14 @@ <h3>Follow Us</h3>
         });
 
         $(function() {
+
+        	$('#menuAffix').affix({
+			  offset: {
+			    top: 200,
+			  }
+			});
+
+
             $.get(webAppPath+"/plugin/IvyDC/api/checkLicense", function( data ) {
               
               if(data != undefined && data.status==="ok" && data.result==="false"){
@@ -441,16 +286,6 @@ <h3>Follow Us</h3>
             });
         });
       </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-47483249-3', 'github.com');
-        ga('send', 'pageview');
 
-      </script>
-        
     </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/resources/styles/ivystyle.html b/resources/styles/ivystyle.html
deleted file mode 100644
index e2a2f68..0000000
--- a/resources/styles/ivystyle.html
+++ /dev/null
@@ -1,298 +0,0 @@
- 
-<!DOCTYPE html>
-<!--[if lt IE 7]>      <html class="no-js lt-ie9 lt-ie8 lt-ie7"> <![endif]-->
-<!--[if IE 7]>         <html class="no-js lt-ie9 lt-ie8"> <![endif]-->
-<!--[if IE 8]>         <html class="no-js lt-ie9"> <![endif]-->
-<!--[if gt IE 8]><!--> <html class="no-js"> <!--<![endif]-->
-    <head>
-        <meta charset="utf-8">
-        <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-        <title>Ivy Dashboard Components</title>
-        <meta name="author" content="Ivy Information Systems">
-        <link rel="shortcut icon" href="../../../api/repos/IvyDC/static/custom/img/favicon.ico">
-        <link rel="icon" type="image/x-icon" href="../../../api/repos/IvyDC/static/custom/img/favicon.ico">
-        <meta name="description" content="">
-        <meta name="viewport" content="width=device-width">
-
-        @HEADER@   
-        
-        <link rel="stylesheet" href="../../../api/repos/IvyDC/static/custom/css/icomoon-social.css">
-        <link href='http://fonts.googleapis.com/css?family=Open+Sans:400,700,600,800' rel='stylesheet' type='text/css'>
-
-		<link rel="stylesheet" href="../../../api/repos/IvyDC/static/custom/css/main.css">
-
-        <script src="../../../api/repos/IvyDC/static/custom/js/modernizr-2.6.2-respond-1.1.0.min.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-47483249-3', 'github.com');
-			ga('send', 'pageview');
-		</script>
-        
-        <script language="javascript" type="text/javascript">
-        
-			var dashboardProperties = {
-				name: "IvyDC",
-				mainTitle: "IvyDC - Ivy Dashboard Components"
-			}; 
-
-
-			var render_getMenuItemsComponent = {
-				type: "Query",
-				name: "render_getMenuItemsComponent",
-				priority: 5,
-				parameters: [],
-				executeAtStart: true,
-				listeners: [],
-				postFetch: function d(data){
-				
-					Dashboards.log("Loading Style Menu Items");
-
-					menuItemsHTML = "<li class='logo-wrapper'><h1 style='margin-bottom:0;margin-top:10px;'><span style='color:#8cc63f;font-weight:600;'>Ivy</span><span>DC</span></h1></li>";
-
-					$.each(data.resultset,function(idx, val){
-						menuItemsHTML += "<li><a href='"+val[1]+"'>"+val[0]+"</a></li>"
-					});
-
-					$('#mainMenuList').html(menuItemsHTML);
-				},
-				queryDefinition:  {
-					endpoint: "getMenuItems",
-					pluginId: "IvyDC",
-					stepName: "OUTPUT",
-					kettleOutput: "Json",
-					queryType: "cpk"
-				}
-			};
-
-			Dashboards.addComponents([render_getMenuItemsComponent]);
-
-		</script>
-
-		<style type="text/css">
-
-			h4 {
-				padding-left:15px;
-				margin-top:25px;
-				margin-bottom:15px;
-			} 
-
-			.h4p {
-				padding-left:25px;
-			} 
-			.affix{
-				top: 0px;
-			}
-		</style>
-
-		<script language="javascript" type="text/javascript">
-
-		$(function(){
-
-
-			$("#pageTitle").text(dashboardProperties.mainTitle);
-
-			var d = new Date();
-			$('.footer-copyright').html("&copy; "+d.getFullYear()+" Ivy Information Systems. All rights reserved.");
-			
-			$('#submitDetails, #declineDetails').click(function(){
-				render_setOptions.update();
-				$('#myModal').modal('hide');
-			});
-
-		});
-
-		</script>
-    </head>
-    <body>
-        <!--[if lt IE 7]>
-            <p class="chromeframe">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> or <a href="http://www.google.com/chromeframe/?redirect=true">activate Google Chrome Frame</a> to improve your experience.</p>
-        <![endif]-->
-        
-
-        <!-- Navigation & Logo-->
-        <div class="mainmenu-wrapper">
-	        <div class="container">
-		        <nav id="mainmenu" class="mainmenu">
-					<ul id="mainMenuList">
-
-					</ul>
-				</nav>
-			</div>
-		</div>
-		
-		<div id="dashboardBreadcrumbs" class="section section-breadcrumbs">
-    		<div class="container">
-				<div class="row">
-					<div class="col-md-12">
-						<h1 id="pageTitle">Title</h1>
-					</div>
-				</div>
-			</div>
-		</div>
-		
-		<div class="container" style="padding:20px;">
-
-		@CONTENT@
-		
-		</div>
-
-	    <!-- Footer -->
-	    <div class="footer">
-	    	<div class="container">
-		    	<div class="row">
-		    		<div class="col-footer col-md-4 col-xs-12">
-		    			<h3>Useful Links</h3>
-		    			<ul class="no-list-style footer-navigate-section">
-		    				<li><a href="http://www.ivy-is.co.uk" target="_blank">Website</a></li>
-		    				<li><a href="http://www.ivy-is.co.uk/blog" target="_blank">Blog</a></li>
-		    				<li><a href="http://www.ivy-is.co.uk/ivy-labs/ivy-software/" target="_blank">Plugins</a></li>
-		    				<li><a href="http://www.ivy-is.co.uk/services/pentaho-solutions/" target="_blank">Services</a></li>
-		    			</ul>
-		    		</div>
-		    		
-		    		<div class="col-footer col-md-4 col-xs-12">
-		    			<h3>Contacts</h3>
-		    			<p class="contact-us-details">
-	        				<b>Address:</b> 10 York Place Edinburgh, Scotland, EH1 3EP<br/>
-	        				<b>Phone:</b> +44 (0)131 524 8144<br/>
-	        				<b>Email:</b> <a href="mailto:enquiries@ivy-is.com">enquiries@ivy-is.com</a>
-	        			</p>
-		    		</div>
-		    		<div class="col-footer col-md-4 col-xs-12">
-		    			<h3>Stay Connected</h3>
-		    			<ul class="footer-stay-connected no-list-style">
-		    				<li><a href="https://www.facebook.com/ivyinfosystems" target="_blank" class="facebook"></a></li>
-		    				<li><a href="https://twitter.com/ivyinfosystems" target="_blank" class="twitter"></a></li>
-		    			</ul>
-		    		</div>
-		    	</div>
-		    	<div class="row">
-		    		<div class="col-md-12">
-		    			<div class="footer-copyright">&copy; 2014 Ivy Information Systems. All rights reserved.</div>
-		    		</div>
-		    	</div>
-		    </div>
-	    </div>
-	    
-	    
-	    @FOOTER@
-
-        <script src="/pentaho/api/repos/IvyDC/static/custom/js/jquery.fitvids.js"></script>
-        <script src="/pentaho/api/repos/IvyDC/static/custom/js/jquery.sequence-min.js"></script>
-        <script src="/pentaho/api/repos/IvyDC/static/custom/js/jquery.bxslider.js"></script>
-        <script src="/pentaho/api/repos/IvyDC/static/custom/js/main-menu.js"></script>
-        <script src="/pentaho/api/repos/IvyDC/static/custom/js/template.js"></script>
-
-
-
-
-      <script>
-        $('#IvyBC-Link').popover({
-          html: true,
-          placement: "bottom",
-          trigger: "hover",
-          title: "IvyBC - Ivy Bootstrap Components",
-          content: "<img src=\"../../../api/repos/IvyDC/static/custom/img/devices_small.png\" class='img-responsive'>Create responsive mobile dashboards using  our new "+
-            "Pentaho plugin Ivy Bootstrap Components! Everything "+
-            "you need to create mobile dashboards with ease.</br /><br />"+
-            "Check out the <a href=\"http://www.ivy-is.co.uk/ivy-labs/pentaho-bootstrap-dashboards\" style=\"color:#b0e36f\">Ivy Labs</a> for more information!"
-        });
-
-        $(function() {
-
-        	$('#menuAffix').affix({
-			  offset: {
-			    top: 200,
-			  }
-			});
-
-
-            $.get(webAppPath+"/plugin/IvyDC/api/checkLicense", function( data ) {
-              
-              if(data != undefined && data.status==="ok" && data.result==="false"){
-                $("body").append('<div class="modal fade" id="licenseCheckModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="false">' +
-                  '<div class="modal-dialog modal-lg">' +
-                    '<div class="modal-content">' +
-                      '<div class="modal-header">' +
-                        '<h1 class="modal-title" id="myModalLabel">IvyDC - Ivy Dashboard Components License</h1>' +
-                      '</div>' +
-                      '<div class="modal-body">' +
-                        '<div id="alertLicense" class="alert alert-danger fade in">' +
-                          '<strong>Error</strong> Invalid license.' +
-                        '</div>' +
-                        '<div class="row">' +
-                          '<div class="col-md-12">' +
-                            '<h2 class="page-header">Submit Ivy Dashboard Components License</h2>' +
-                            '<p><center>To get your free IvyDC license, please click the button below.</center></p>' +
-                            '<center><a type="button" class="btn btn-success btn-lg" href="http://www.ivy-is.co.uk/licenses" target="_blank">Get License</a></center>' +
-                            '<div class="form-group">' +
-                              '<label for="licenseKeyField">License Key</label>' +
-                              '<textarea class="form-control" id="licenseKeyField" rows="3" placeholder="Paste your license key here"></textarea>' +
-                            '</div>' +
-                          '</div>' +
-                        '</div>' +
-                      '</div>' +
-                      '<div class="modal-footer">' +
-                        '<button type="button" class="btn btn-default" id="apply-license-btn">Apply License</button>' +
-                      '</div>' +
-                    '</div>' +
-                  '</div>' +
-                '</div>');
-                $("body #licenseCheckModal #apply-license-btn").on("click", function() {
-                  var licenseKey = $("body #licenseCheckModal .modal-body #licenseKeyField").val();
-                  if(licenseKey == ""){
-                    $("body #licenseCheckModal .modal-body #alertLicense").remove();
-                    $("body #licenseCheckModal .modal-body").prepend('<div id="alertLicense" class="alert alert-danger fade in">' +
-                          '<strong>Error</strong> You don\'t paste any license.</div>');
-                  }else{
-                    $("body #licenseCheckModal .modal-body").empty();
-                    $("body #licenseCheckModal .modal-body").prepend("<center><img src='../../../content/IvyDC/img/loading.gif'/></center>");
-
-                    $.post( webAppPath+"/plugin/IvyDC/api/submitLicense?licenseKey="+encodeURIComponent(licenseKey)).done(function( data ) {
-                      $("body #licenseCheckModal .modal-body").empty();
-                      if(data != undefined && data.status==="ok"){
-                        $("body #licenseCheckModal .modal-body").append('<div id="alertLicense" class="alert alert-success fade in">' +
-                              '<strong>Success</strong> License accepted.</div>');
-                        $("body #licenseCheckModal .modal-body").append('<div class="row">' +
-                          '<div class="col-md-3"><strong>Username:</strong></div>' +
-                            '<div class="col-md-9">'+JSON.parse(data.result).UserName+'</div>' +
-                          '</div>' + 
-                          '<div class="row">' +
-                            '<div class="col-md-3"><strong>Email:</strong></div>' +
-                            '<div class="col-md-9">'+JSON.parse(data.result).UserEmail+'</div>' +
-                          '</div>' + 
-                          '<div class="row">' +
-                            '<div class="col-md-3"><strong>Plugin Name:</strong></div>' +
-                            '<div class="col-md-9">'+JSON.parse(data.result).UserPluginName+'</div>' +
-                          '</div>' + 
-                          '<div class="row">' +
-                            '<div class="col-md-3"><strong>Plugin Type:</strong></div>' +
-                            '<div class="col-md-9">'+JSON.parse(data.result).UserPluginType+'</div>' +
-                          '</div>'
-                        );
-                        setTimeout(function(){
-                           window.location.reload(1);
-                        }, 3000);
-                      }else{
-                        $("body #licenseCheckModal .modal-body").prepend('<div id="alertLicense" class="alert alert-danger fade in">' +
-                              '<strong>Error</strong> License invalid, please try again.</div>');
-                        setTimeout(function(){
-                           window.location.reload(1);
-                        }, 2000);
-                      }
-                    });
-
-                  }
-                });
-                $('body #licenseCheckModal').modal({keyboard: false, backdrop: "static"}).modal('show');
-              }
-            });
-        });
-      </script>
-
-    </body>
-</html>
\ No newline at end of file