kritbit Commit Details

Date:

2015-12-18 21:51:55 (9 years 10 months ago)

Author:

Natalie Adams

Branch:

master

Commit:

8f18ea5e3a6f4f22c16b3259f7682bbd324b50c7

Parents:

9440623edd8f72ac1d0d223ecefa7471e1174dd6

Message:

Adding URL config option and dygraphs

Changes:

File differences

-20
21 21
22 22
23 
23
24 24
25 25
26 26
+␉}␊
␊
␉protected function loadRender($template, $parameters=array()) {␊
␉␉$newParameters = array_merge($parameters, ["user" => $this->user]);␊
␉␉$newParameters = array_merge($parameters, ["config" => $this->config, "user" => $this->user]);␊
␉␉return parent::loadRender($template, $newParameters);␊
␉}␊
␊
 ␉}␊
 ␊
 ␉protected function loadRender($template, $parameters=array()) {␊
-␉␉$newParameters = array_merge($parameters, ["user" => $this->user]);␊
+␉␉$newParameters = array_merge($parameters, ["config" => $this->config, "user" => $this->user]);␊
 ␉␉return parent::loadRender($template, $newParameters);␊
 ␉}␊
 ␊

-3
4 4
5 5
6
6 7
7 8
8 9
... ...
19 20
20 21
21 22
23
22 24
23 25
24 26
+<html lang="en">␊
<head>␊
    <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>␊
    <base href="{{config.URL}}" >␊
    <script src="./media/js/jquery.js"></script>␊
    <script src="./media/js/jqueryui.js"></script>␊
␊

    <!-- Latest compiled and minified JavaScript -->␊
    <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/js/bootstrap.min.js" integrity="sha512-K1qjQ+NcF2TYO/eI3M6v8EiNYZfA95pQumfvcVrTHtwQVDG+aHRqLi/ETn2uB+1JqwYqVG3LIvdm9lj6imS/pQ==" crossorigin="anonymous"></script>␊
␊
    <script src="//cdnjs.cloudflare.com/ajax/libs/dygraph/1.1.1/dygraph-combined.js"></script>␊
    <script src="./media/js/jquery-confirm.min.js"></script>␊
    <script src="./media/js/jquery.dynatable.js"></script>␊
    <title>{{title}}</title>␊
 ...
 <html lang="en">␊
 <head>␊
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>␊
+    <base href="{{config.URL}}" >␊
     <script src="./media/js/jquery.js"></script>␊
     <script src="./media/js/jqueryui.js"></script>␊
 ␊
     <!-- Latest compiled and minified JavaScript -->␊
     <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/js/bootstrap.min.js" integrity="sha512-K1qjQ+NcF2TYO/eI3M6v8EiNYZfA95pQumfvcVrTHtwQVDG+aHRqLi/ETn2uB+1JqwYqVG3LIvdm9lj6imS/pQ==" crossorigin="anonymous"></script>␊
 ␊
+    <script src="//cdnjs.cloudflare.com/ajax/libs/dygraph/1.1.1/dygraph-combined.js"></script>␊
     <script src="./media/js/jquery-confirm.min.js"></script>␊
     <script src="./media/js/jquery.dynatable.js"></script>␊
     <title>{{title}}</title>␊

Download the corresponding diff file

kritbit

File differences

Branches