Merge branch '2.0.x' of dev.sourcefabric.org:airtime into 2.0.x
This commit is contained in:
commit
252777c3f9
3043 changed files with 365 additions and 781638 deletions
|
@ -1338,6 +1338,15 @@ div.success{
|
|||
border:1px solid #488214;
|
||||
}
|
||||
|
||||
div.errors{
|
||||
color:#902d2d;
|
||||
font-size:11px;
|
||||
padding:2px 4px;
|
||||
background:#c6b4b4;
|
||||
margin-bottom:2px;
|
||||
border:1px solid #c83f3f;
|
||||
}
|
||||
|
||||
.collapsible-header, .collapsible-header-disabled {
|
||||
border: 1px solid #8f8f8f;
|
||||
background-color: #cccccc;
|
||||
|
|
|
@ -21,9 +21,6 @@ set_include_path(implode(PATH_SEPARATOR, array(
|
|||
//Propel classes.
|
||||
set_include_path(APPLICATION_PATH . '/models' . PATH_SEPARATOR . get_include_path());
|
||||
|
||||
//Pear classes.
|
||||
set_include_path(APPLICATION_PATH . '/../library/pear' . PATH_SEPARATOR . get_include_path());
|
||||
|
||||
//Controller plugins.
|
||||
set_include_path(APPLICATION_PATH . '/controllers/plugins' . PATH_SEPARATOR . get_include_path());
|
||||
|
||||
|
|
9
airtime_mvc/public/js/libs/google-analytics.js
Normal file
9
airtime_mvc/public/js/libs/google-analytics.js
Normal file
|
@ -0,0 +1,9 @@
|
|||
var _gaq = _gaq || [];
|
||||
_gaq.push(['_setAccount', 'UA-28765064-1']);
|
||||
_gaq.push(['_trackPageview']);
|
||||
|
||||
(function() {
|
||||
var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
|
||||
ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
|
||||
var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
|
||||
})();
|
Loading…
Add table
Add a link
Reference in a new issue