lib/rhosync/console/app/views/layout.erb in rhosync-2.0.9 vs lib/rhosync/console/app/views/layout.erb in rhosync-2.1.0.beta.1
- old
+ new
@@ -7,12 +7,29 @@
<!--<link rel="stylesheet" href="<%=url('main.css')%>" type="text/css" media="screen" /> -->
<link rel="stylesheet" href="<%=url('reset.css')%>" type="text/css" media="screen" />
<link rel="stylesheet" href="<%=url('home.css')%>" type="text/css" media="screen" />
<link rel="stylesheet" href="<%=url('style.css')%>" type="text/css" media="screen" />
<link rel="stylesheet" href="<%=url('ThickBox.css')%>" type="text/css" media="screen" />
+
+ <!--[if IE]><script language="javascript" type="text/javascript" src="<%=url('jqplot/excanvas.js')%>"></script><![endif]-->
+ <script language="javascript" type="text/javascript" src="<%=url('jqplot/jquery-1.4.2.min.js')%>"></script>
+ <script language="javascript" type="text/javascript" src="<%=url('jqplot/jquery.jqplot.min.js')%>"></script>
+ <script language="javascript" type="text/javascript" src="<%=url('jqplot/jqplot.categoryAxisRenderer.min.js')%>"></script>
+ <script language="javascript" type="text/javascript" src="<%=url('jqplot/jqplot.dateAxisRenderer.js')%>"></script>
+ <script language="javascript" type="text/javascript" src="<%=url('jqplot/jqplot.canvasTextRenderer.js')%>"></script>
+ <script language="javascript" type="text/javascript" src="<%=url('jqplot/jqplot.canvasAxisLabelRenderer.js')%>"></script>
+ <script language="javascript" type="text/javascript" src="<%=url('jqplot/jqplot.canvasAxisTickRenderer.js')%>"></script>
+ <script language="javascript" type="text/javascript" src="<%=url('jqplot/jqplot.cursor.js')%>"></script>
+ <!--<script language="javascript" type="text/javascript" src="<%=url('jqplot/jqplot.barRenderer.min.js')%>"></script>-->
+ <!--<script language="javascript" type="text/javascript" src="<%=url('jqplot/jqplot.pointLabels.min.js')%>"></script>-->
+
+ <link rel="stylesheet" type="text/css" href="<%=url('jqplot/jquery.jqplot.min.css')%>" />
+
<script type="text/javascript">
+ $.jqplot.config.enablePlugins = true;
+
function loadXMLDoc(url,id)
{
if(url.indexOf('?') != -1) {
url = url + "&xhr=true";
} else {
@@ -28,10 +45,11 @@
{
element = document.getElementById(id);
if (element != null)
{
element.innerHTML=xmlhttp.responseText;
+ parseScript(xmlhttp.responseText);
}
}
}
}
@@ -44,14 +62,45 @@
if(document.getElementById('link5') != null)document.getElementById('link5').className = "no_class";
if(document.getElementById('link6') != null)document.getElementById('link6').className = "no_class";
if(document.getElementById('link7') != null)document.getElementById('link7').className = "no_class";
document.getElementById(elem).className = "selected";
}
-
+ function parseScript(_source) {
+ var source = _source;
+ var scripts = new Array();
+
+ // Strip out tags
+ while(source.indexOf("<script") > -1 || source.indexOf("</script") > -1) {
+ var s = source.indexOf("<script");
+ var s_e = source.indexOf(">", s);
+ var e = source.indexOf("</script", s);
+ var e_e = source.indexOf(">", e);
+
+ // Add to scripts array
+ scripts.push(source.substring(s_e+1, e));
+ // Strip from source
+ source = source.substring(0, s) + source.substring(e_e+1);
+ }
+
+ // Loop through every script collected and eval it
+ for(var i=0; i<scripts.length; i++) {
+ try {
+ eval(scripts[i]);
+ }
+ catch(ex) {
+ // do what you want here when a script fails
+ }
+ }
+
+ // Return the cleaned source
+ return source;
+ }
+
</script>
+
</head>
<body>
<div class="container">
<div class="wrapper">
<div class="header">
@@ -67,21 +116,47 @@
<%= yield%>
</div><!--END col_1 -->
<div class="land_separator"></div>
</div><!--END header_landing -->
<div style="float:left">
- <%unless login_required %>
- <% license = {}
- handle_api_error("Can't get license information") do
- license = RhosyncApi::get_license_info(session[:server],session[:token])
- end
- %>
- <%="Licensed to #{license['licensee']}: #{license['available']}/#{license['seats']} devices available"%>
- <%end%>
- <br/>Rhosync v<%=Rhosync::VERSION%><br/>
+
+ <br/>
</div>
</div><!--END header -->
</div><!--END wrapper -->
</div><!-- END container -->
-
+ <div id="footer">
+ <div class="footer_content">
+ <div id="foot_lefts" class="foot_left">
+ <img src="/console/images/foot_logo_rhosync.png"></a>
+ <p>© 2010 <a href="http://www.rhomobile.com/">Rhomobile</a> All rights reserved.</p>
+ </div>
+ <div class="foot_right">
+ <ul class="ul_footer">
+ <%unless login_required %>
+ <% license = {}
+ handle_api_error("Can't get license information") do
+ license = RhosyncApi::get_license_info(session[:server],session[:token])
+ end
+ %>
+ <%="<li>Licensed to #{license['licensee']}</li><li>|</li><li> #{license['available']}/#{license['seats']} devices available</li>"%>
+ <%end%>
+ <li>|</li>
+ <li>Rhosync v<%=Rhosync::VERSION%></li>
+<!-- <li><a href="http://app.rhohub.com">Home</a></li>
+ <li>|</li>
+ <li><a href="http://app.rhohub.com/how_to_use">How to Use</a></li>
+ <li>|</li>
+ <li><a href="http://app.rhohub.com/pricing">Pricing</a></li>
+ <li>|</li>
+ <li><a class="largea3" target="_blank" href="http://wiki.rhomobile.com/index.php/RhoHub">Docs</a></li>
+ <li>|</li>
+ <li><a href="http://app.rhohub.com/terms">Terms of Service</a></li>
+ <li>|</li>
+ <li><a href="http://www.twitter.com/rhohub">Status</a></li>
+--> </ul>
+ </div>
+ <br class="clear">
+ </div>
+ </div>
</body>
</html>
\ No newline at end of file