Skip to content

Commit

Permalink
0.6.2 rev 4100
Browse files Browse the repository at this point in the history
  • Loading branch information
@nightflyza
nightflyza committed Jan 14, 2015
1 parent 18b595b commit 5210858
Show file tree
Hide file tree
Showing 14 changed files with 55 additions and 87 deletions.
2 changes: 1 addition & 1 deletion RELEASE
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.6.2 rev 4093
0.6.2 rev 4100
3 changes: 3 additions & 0 deletions api/libs/api.astral.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1717,4 +1717,7 @@ function wf_TimePickerPreset($field, $time='',$label='',$br=false) {
return ($result);
}




?>
3 changes: 2 additions & 1 deletion api/libs/api.ukv.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1864,14 +1864,15 @@ protected function buildReportTask($link, $icon, $text) {
*/

public function reportList() {
$reports = '';
$reports = '<div style="min-height:800px;">';
$reports.= $this->buildReportTask(self::URL_REPORTS_MGMT . 'reportDebtors', 'debtors.png', __('Debtors'));
$reports.= $this->buildReportTask(self::URL_REPORTS_MGMT . 'reportAntiDebtors', 'antidebtors.png', __('AntiDebtors'));
$reports.= $this->buildReportTask(self::URL_REPORTS_MGMT . 'reportTariffs', 'tariffsreport.jpg', __('Tariffs report'));
$reports.= $this->buildReportTask(self::URL_REPORTS_MGMT . 'reportFinance', 'financereport.jpg', __('Finance report'));
$reports.= $this->buildReportTask(self::URL_REPORTS_MGMT . 'reportSignup', 'signupreport.jpg', __('Signup report'));
$reports.= $this->buildReportTask(self::URL_REPORTS_MGMT . 'reportFees', 'feesreport.png', __('Money fees'));
$reports.= $this->buildReportTask(self::URL_REPORTS_MGMT . 'reportStreets', 'streetsreport.png', __('Streets report'));
$reports.='<div>';
show_window(__('Reports'), $reports);
}

Expand Down
26 changes: 13 additions & 13 deletions api/libs/api.workaround.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1903,7 +1903,7 @@ function zb_backup_database($silent = false) {
shell_exec($command);

if (!$silent) {
show_window(__('Backup saved'), $backname);
show_success(__('Backup saved').': '.$backname);
}

log_register("BACKUP CREATE `" . $backname . "`");
Expand Down Expand Up @@ -3581,8 +3581,8 @@ function web_AnalyticsArpuMonthGraph($year) {



$result = wf_tag('div', false, 'dashtask', '') . __('Dynamics of changes in ARPU for the year');
$result.= wf_Graph($data, '500', '300', false) . wf_tag('div', true);
$result = wf_tag('div', false, '', '') . __('Dynamics of changes in ARPU for the year');
$result.= wf_Graph($data, '800', '300', false) . wf_tag('div', true);
return ($result);
}

Expand Down Expand Up @@ -3622,8 +3622,8 @@ function web_AnalyticsPaymentsMonthGraph($year) {
$data.=$year . '-' . $eachmonth . '-01,' . $paycount . ',' . $month_summ . "\n";
}

$result = wf_tag('div', false, 'dashtask', '') . __('Dynamics of cash flow for the year');
$result.= wf_Graph($data, '500', '300', false) . wf_tag('div', true);
$result = wf_tag('div', false, '', '') . __('Dynamics of cash flow for the year');
$result.= wf_Graph($data, '800', '300', false) . wf_tag('div', true);
return ($result);
}

Expand All @@ -3642,8 +3642,8 @@ function web_AnalyticsSignupsMonthGraph($year) {
$data.=$year . '-' . $eachmonth . '-' . '-01,' . $count . "\n";
}

$result = wf_tag('div', false, 'dashtask', '') . __('Dynamics of change signups of the year');
$result.= wf_Graph($data, '500', '300', false) . wf_tag('div', true);
$result = wf_tag('div', false, '', '') . __('Dynamics of change signups of the year');
$result.= wf_Graph($data, '800', '300', false) . wf_tag('div', true);
return ($result);
}

Expand All @@ -3662,8 +3662,8 @@ function web_AnalyticsSigReqMonthGraph($year) {
$data.=$year . '-' . $eachmonth . '-' . '-01,' . $count . "\n";
}

$result = wf_tag('div', false, 'dashtask', '') . __('Signup requests received during the year');
$result.= wf_Graph($data, '500', '300', false) . wf_tag('div', true);
$result = wf_tag('div', false, '', '') . __('Signup requests received during the year');
$result.= wf_Graph($data, '800', '300', false) . wf_tag('div', true);
return ($result);
}

Expand All @@ -3682,8 +3682,8 @@ function web_AnalyticsTicketingMonthGraph($year) {
$data.=$year . '-' . $eachmonth . '-' . '-01,' . $count . "\n";
}

$result = wf_tag('div', false, 'dashtask', '') . __('Ticketing activity during the year');
$result.= wf_Graph($data, '500', '300', false) . wf_tag('div', true);
$result = wf_tag('div', false, '', '') . __('Ticketing activity during the year');
$result.= wf_Graph($data, '800', '300', false) . wf_tag('div', true);
return ($result);
}

Expand All @@ -3702,8 +3702,8 @@ function web_AnalyticsTaskmanMonthGraph($year) {
$data.=$year . '-' . $eachmonth . '-' . '-01,' . $count . "\n";
}

$result = wf_tag('div', false, 'dashtask', '') . __('Task manager activity during the year');
$result.= wf_Graph($data, '500', '300', false) . wf_tag('div', true);
$result = wf_tag('div', false, '', '') . __('Task manager activity during the year');
$result.= wf_Graph($data, '800', '300', false) . wf_tag('div', true);
return ($result);
}

Expand Down
Empty file added content/documents/glmcustoms/.gitignore
View file
Empty file.
4 changes: 1 addition & 3 deletions content/meta_tags.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,6 @@
<!-- timepicker -->
<script type="text/javascript" src="modules/jsc/timepick/jquery.timepicker.min.js"></script>
<link rel="stylesheet" type="text/css" href="modules/jsc/timepick/jquery.timepicker.css" />
<!-- flot -->
<script src="modules/jsc/flot/jquery.flot.min.js" type="text/javascript"></script>
<script src="modules/jsc/flot/jquery.flot.categories.min.js" type="text/javascript"></script>



6 changes: 3 additions & 3 deletions modules/general/openpayz/index.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -137,9 +137,9 @@ function zb_OPShowGraphs() {
$gdata.=$datestamp.','.$optrans['count'].','.$optrans['summ']."\n";
}

$result.=wf_tag('div', false, 'dashtask', '');
$result.=wf_tag('span').$psys.wf_tag('span',true).wf_delimiter();
$result.= wf_Graph($gdata, '600', '200',false);
$result.=wf_tag('div', false, '', '');
$result.=wf_tag('h2').$psys.wf_tag('h2',true).wf_delimiter();
$result.= wf_Graph($gdata, '800', '200',false);
$result.=wf_tag('div',true);
}

Expand Down
41 changes: 8 additions & 33 deletions modules/general/report_finance/index.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,41 +87,16 @@
show_window(__('Year'), $yearform);

$graphs= wf_Link("?module=report_finance", __('Back'), true, 'ubButton');
$graphs= '<script type="text/javascript">
$(function() {
var dataArray = [["01-10-2014", "3"], ["01-11-2014", 8], ["01-12-2014", 5], ["01-01-2015", 13]];
var dataArray2 = [["01-10-2014", 13], ["01-11-2014", 18], ["01-12-2014", 15], ["01-01-2015", 23]];
$.plot("#placeholder", [ dataArray,dataArray2 ], {
xaxis: {
mode: "categories",
tickLength: 0
},
series: {
lines: { show: true },
points: { show: true }
}
});
});
</script> <div id="placeholder" style="width:100%; height:400px;"></div>';


// $graphs.= web_AnalyticsArpuMonthGraph($currentYear);
// $graphs.= web_AnalyticsPaymentsMonthGraph($currentYear);
// $graphs.= web_AnalyticsSignupsMonthGraph($currentYear);
// $graphs.= web_AnalyticsSigReqMonthGraph($currentYear);
// $graphs.= web_AnalyticsTicketingMonthGraph($currentYear);
// $graphs.= web_AnalyticsTaskmanMonthGraph($currentYear);
$graphs.= web_AnalyticsArpuMonthGraph($currentYear);
$graphs.= web_AnalyticsPaymentsMonthGraph($currentYear);
$graphs.= web_AnalyticsSignupsMonthGraph($currentYear);
$graphs.= web_AnalyticsSigReqMonthGraph($currentYear);
$graphs.= web_AnalyticsTicketingMonthGraph($currentYear);
$graphs.= web_AnalyticsTaskmanMonthGraph($currentYear);


show_window('',$graphs);


Expand Down
2 changes: 1 addition & 1 deletion modules/general/report_selfcredit/index.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ public function renderMonthGraph() {
$result.=wf_TableBody($this->tabledata, '100%', '0', 'sortable');
$result.=wf_tag('span', false, 'glamour').__('Our final profit').': '.$this->yearsumm.wf_tag('span', true);
$result.= wf_delimiter();
$result.= wf_tag('div', false, 'dashtask', '');
$result.= wf_tag('div', false, '', '');
$result.= wf_Graph($this->chartdata, '800', '400', false);
$result.= wf_tag('div', true);
return ($result);
Expand Down
7 changes: 0 additions & 7 deletions modules/jsc/flot/jquery.flot.categories.min.js
View file

This file was deleted.

8 changes: 0 additions & 8 deletions modules/jsc/flot/jquery.flot.min.js
View file

This file was deleted.

13 changes: 0 additions & 13 deletions skins/ubng/css/layout.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,19 +85,6 @@ width: 68%;
background: url(../images/header_shadow.png) no-repeat left top;
}

.notificationArea {
float: left;
padding-left: 10px;
padding-top: 5px;
}

.notificationArea img{
float: left;
padding-left: 10px;
padding-right: 5px;

}


.btn_view_help {
float: right;
Expand Down
21 changes: 21 additions & 0 deletions skins/ubng/css/ubilling.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -516,3 +516,24 @@ margin-top: -130px;
color: #666;
padding-left: 4px;
}


.notificationArea {
float: left;
padding-left: 10px;
padding-top: 10px;
}

.notificationArea a {
color: #666;
}

.notificationArea a:hover {
text-decoration: none;
}

.notificationArea img{
float: left;
padding-left: 10px;
padding-right: 5px;
}
6 changes: 2 additions & 4 deletions skins/ubng/skin.general.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,10 @@
<link rel="stylesheet" href="css/ie.css" type="text/css" media="screen" />
<script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
<![endif]-->
<script src="modules/jsc/jquery.cookie.js" type="text/javascript"></script>
<script src="modules/jsc/glmenuCollapser.js" type='text/javascript'></script>
<script src="modules/jsc/hideshow.js" type="text/javascript"></script>
<script src="modules/jsc/winman.js" type="text/javascript"></script>
<script src="modules/jsc/jquery.cookie.js" type="text/javascript"></script>

</head>


Expand Down Expand Up @@ -81,9 +80,8 @@
<ul class="toggle">
<li>
<form action="" method="POST">
<img src="skins/menuicons/icn_jump_back.png">
<input name="logout_form" value="1" type="hidden">
<input value="<?=__('Log out').' '.whoami();?>" type="submit">
<img src="skins/menuicons/icn_jump_back.png"><input value="<?=__('Log out').' '.whoami();?>" type="submit">
</form>
</li>
<li>
Expand Down

0 comments on commit 5210858

Please sign in to comment.