Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
@BugBuster1701
BugBuster1701 committed May 16, 2015
2 parents 7fa0826 + 414f45e commit 8ba12ae
Show file tree
Hide file tree
Showing 46 changed files with 912 additions and 631 deletions.
2 changes: 1 addition & 1 deletion assets/.htaccess
View file
Expand Up @@ -4,4 +4,4 @@
</IfModule>
<IfModule mod_authz_core.c>
Require all granted
</IfModule>
</IfModule>
169 changes: 33 additions & 136 deletions assets/mod_visitors_be.css
View file
@@ -1,179 +1,95 @@
/* Style sheet visitors backend */
.mod_visitors_be_II {
width: 690px;
}
.mod_visitors_be_III {
width: 690px;
}
.mod_visitors_be_IV {
width: 690px;
}
.mod_visitors_be_V {
width: 690px;
}

.mod_visitors_be_statistics {
width:300px;
width:50%;
float:left;
}
.mod_visitors_be_initial {
margin-bottom:0;
margin-left:auto;
margin-right:0;
margin-top:0;
width:330px;
}
.mod_visitors_be_average {
width:300px;
width:50%;
float:left;
}

.mod_visitors_be_average_nodata {
color:#B9B9B9;
}

.mod_visitors_be_countings {
width:300px;
width:50%;
float:left;
}

.mod_visitors_be_chart {
margin-bottom:0;
margin-left:auto;
margin-right:0;
margin-top:0;
width:330px;
width:50%;
float:left;
}
.mod_visitors_be_chart td {
padding-left:0 !important;
padding-right:0 !important;
}

.mod_visitors_be_browser {
width:360px;
width:50%;
float:left;
}

.mod_visitors_be_browser_mini {
width:300px;
margin-bottom:0;
margin-left:auto;
margin-right:0;
margin-top:0;
width:50%;
float:left;
}

.mod_visitors_be_browser_other {
margin-top:16px;
}
.mod_visitors_be_searchenginekeywords {
width:360px;
width:50%;
float:left;
}

.mod_visitors_be_searchengines {
width:300px;
margin-bottom:0;
margin-left:auto;
margin-right:0;
margin-top:0;
}

.mod_visitors_be_page_stat {
width: 690px;
width:50%;
float:left;
}

.mod_visitors_be_page_visit_hit_top {
width:330px;
width:50%;
float:left;
}

.mod_visitors_be_page_visit_hit_days {
width:330px;
margin-bottom:0;
margin-left:auto;
margin-right:0;
margin-top:0;
width:50%;
float:left;;
}

.mod_visitors_be_page_visit_hit_today {
width:330px;
width:50%;
float:left;
}

.mod_visitors_be_page_visit_hit_yesterday {
width:330px;
margin-bottom:0;
margin-left:auto;
margin-right:0;
margin-top:0;
width:50%;
float:left;
}

.mod_visitors_be_screen_stat {
width: 690px;
.mod_visitors_be_referrer {
width:50%;
float:left;
}

.mod_visitors_be_screen_top_resolution {
width:330px;
width:50%;
float:left;
}

.mod_visitors_be_screen_top_resolution_days {
width:330px;
margin-bottom:0;
margin-left:auto;
margin-right:0;
margin-top:0;
width:50%;
float:left;
}

.mod_visitors_be_version {

}

.mod_visitors_be_table_max {
margin: 2px 0 !important;
width: 690px;
padding: 0;
}

.mod_visitors_be_table_max td {
height:18px;
padding-left:6px !important;
padding-right:6px !important;
}

.mod_visitors_be_table {
margin: 2px 0 !important;
padding: 0;
width: 300px;
}

.mod_visitors_be_table td {
padding-left:6px !important;
padding-right:6px !important;
}

.mod_visitors_be_table_330 {
margin: 2px 0 !important;
padding: 0;
width: 330px;
}

.mod_visitors_be_table_330 td {
padding-left:6px !important;
padding-right:6px !important;
}

.mod_visitors_be_table_360 {
margin: 2px 0 !important;
padding: 0;
width: 360px;
}

.mod_visitors_be_table_390 {
margin: 2px 0 !important;
padding: 0;
width: 390px;
}

.mod_visitors_be_table_260 {
margin: 2px 0 !important;
padding: 0;
width: 260px;
width: 90%;
}

.mod_visitors_be_folder
Expand All @@ -182,30 +98,7 @@
border-bottom:1px solid #e9e9e9;
background-color:#f6f6f6;
}
/*
.mod_visitors_be_folder_list,.mod_visitors_be_folder_tlist
{
padding:2px 0 3px 0;
border-bottom:1px solid #e9e9e9;
background-color:#f6f6f6;
font-weight:bold;
}
.mod_visitors_be_folder_tlist
{
border-top:1px solid #e9e9e9;
}

.mod_visitors_be_file,.mod_visitors_be_file_list
{
padding:1px 0;
border-bottom:1px solid #e9e9e9;
background-color:#fff;
}
.mod_visitors_be_file_list
{
padding:2px 0;
}
*/
.mod_visitors_be_table_version {
margin: 2px 0 !important;
width: 100%;
Expand All @@ -216,4 +109,8 @@
height:18px;
padding-left:6px !important;
padding-right:6px !important;
}

#ctrl_visitors_stat_admins {
margin-top: 1px;
}
8 changes: 4 additions & 4 deletions classes/DCA_module_visitors.php → classes/DcaModuleVisitors.php
View file
Expand Up @@ -3,7 +3,7 @@
/**
* Contao Open Source CMS, Copyright (C) 2005-2014 Leo Feyer
*
* Contao Module "Visitors" - DCA Helper Class DCA_module_visitors
* Contao Module "Visitors" - DCA Helper Class DcaModuleVisitors
*
* @copyright Glen Langer 2012..2014 <http://www.contao.glen-langer.de>
* @author Glen Langer (BugBuster)
Expand All @@ -19,17 +19,17 @@
namespace BugBuster\Visitors;

/**
* DCA Helper Class DCA_module_visitors
* DCA Helper Class DcaModuleVisitors
*
* @copyright Glen Langer 2012..2014 <http://www.contao.glen-langer.de>
* @author Glen Langer (BugBuster)
* @package GLVisitors
*
*/
class DCA_module_visitors extends \Backend
class DcaModuleVisitors extends \Backend
{
public function getVisitorsTemplates($dc)
{
return $this->getTemplateGroup('mod_visitors_fe_', $dc->activeRecord->pid);
}
}
}
10 changes: 5 additions & 5 deletions classes/DCA_visitors.php → classes/DcaVisitors.php
View file
Expand Up @@ -3,7 +3,7 @@
/**
* Contao Open Source CMS, Copyright (C) 2005-2014 Leo Feyer
*
* Contao Module "Visitors" - DCA Helper Class DCA_visitors
* Contao Module "Visitors" - DCA Helper Class DcaVisitors
*
* @copyright Glen Langer 2012..2014 <http://www.contao.glen-langer.de>
* @author Glen Langer (BugBuster)
Expand All @@ -19,14 +19,14 @@
namespace BugBuster\Visitors;

/**
* DCA Helper Class DCA_visitors
* DCA Helper Class DcaVisitors
*
* @copyright Glen Langer 2012..2014 <http://www.contao.glen-langer.de>
* @author Glen Langer (BugBuster)
* @package GLVisitors
*
*/
class DCA_visitors extends \Backend
class DcaVisitors extends \Backend
{
/**
* Import the back end user object
Expand All @@ -47,7 +47,7 @@ public function listVisitors($arrRow)
}
$output = '<div class="cte_type ' . $key . '"><strong>' . $arrRow['visitors_name'] . '</strong></div>' ;
$output.= '<div>'.$GLOBALS['TL_LANG']['tl_visitors']['visitors_startdate'][0].': ' . $startdate . '</div>';
//$output.= '<div>'.print_r($arrRow,true).'</div>';
//Debug $output.= '<div>'.print_r($arrRow,true).'</div>';
return $output;
}

Expand Down Expand Up @@ -108,4 +108,4 @@ public function toggleVisibility($intId, $blnVisible)
id=?")
->execute($intId);
}
}
}
15 changes: 10 additions & 5 deletions classes/DCA_visitors_category.php → classes/DcaVisitorsCategory.php
View file
Expand Up @@ -3,7 +3,7 @@
/**
* Contao Open Source CMS, Copyright (C) 2005-2014 Leo Feyer
*
* Contao Module "Visitors" - DCA Helper Class DCA_visitors_category
* Contao Module "Visitors" - DCA Helper Class DcaVisitorsCategory
*
* @copyright Glen Langer 2012..2014 <http://www.contao.glen-langer.de>
* @author Glen Langer (BugBuster)
Expand All @@ -19,14 +19,14 @@
namespace BugBuster\Visitors;

/**
* DCA Helper Class DCA_visitors_category
* DCA Helper Class DcaVisitorsCategory
*
* @copyright Glen Langer 2012..2014 <http://www.contao.glen-langer.de>
* @author Glen Langer (BugBuster)
* @package GLVisitors
*
*/
class DCA_visitors_category extends \Backend
class DcaVisitorsCategory extends \Backend
{
public function labelCallback($arrRow)
{
Expand All @@ -39,5 +39,10 @@ public function labelCallback($arrRow)
$version_warning = '<br /><span style="color:#ff0000;">[ERROR: Visitors-Module requires at least Contao 3.0]</span>';
}
return $label_1 . $label_2 . $version_warning;//. '<br /><span style="color:#b3b3b3;">['.$label_2.']</span>';
}
}
}

public function getAdminCheckbox($varValue)
{
return '1';
}
}

0 comments on commit 8ba12ae

Please sign in to comment.