kritbit

kritbit Commit Details


Date:2015-12-18 21:51:55 (9 years 20 days ago)
Author:Natalie Adams
Branch:master
Commit:8f18ea5e3a6f4f22c16b3259f7682bbd324b50c7
Parents: 9440623edd8f72ac1d0d223ecefa7471e1174dd6
Message:Adding URL config option and dygraphs

Changes:

File differences

web/application/config.dist.php
1212
1313
1414
15
16
1517
$config["REDIRECT_URI"] = "";
$config["URL"] = "";
return $config;
web/application/controllers/base.php
2020
2121
2222
23
23
2424
2525
2626
}
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);
}
web/application/views/base.html
33
44
55
6
67
78
89
......
1920
2021
2122
23
2224
2325
2426
<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>

Archive Download the corresponding diff file

Branches

Number of commits:
Page rendered in 0.08492s using 14 queries.