Changeset 1169316
- Timestamp:
- 05/28/2015 11:12:31 AM (11 years ago)
- Location:
- free-counter
- Files:
-
- 28 added
- 4 edited
-
tags/1.2 (added)
-
tags/1.2/free-counter.org_icon.png (added)
-
tags/1.2/img (added)
-
tags/1.2/img/fiveStars.png (added)
-
tags/1.2/license.txt (added)
-
tags/1.2/plugin.php (added)
-
tags/1.2/readme.txt (added)
-
tags/1.2/screenshot-1.png (added)
-
tags/1.2/screenshot-10.png (added)
-
tags/1.2/screenshot-11.png (added)
-
tags/1.2/screenshot-2.png (added)
-
tags/1.2/screenshot-3.png (added)
-
tags/1.2/screenshot-4.png (added)
-
tags/1.2/screenshot-5.png (added)
-
tags/1.2/screenshot-6.png (added)
-
tags/1.2/screenshot-7.png (added)
-
tags/1.2/screenshot-8.png (added)
-
tags/1.2/screenshot-9.png (added)
-
tags/1.2/template (added)
-
tags/1.2/template/button_ok.png (added)
-
tags/1.2/template/counter.js (added)
-
tags/1.2/template/counter_style.css (added)
-
tags/1.2/template/jquery.minicolors.css (added)
-
tags/1.2/template/jquery.minicolors.js (added)
-
tags/1.2/template/jquery.minicolors.min.js (added)
-
tags/1.2/template/jquery.minicolors.png (added)
-
tags/1.2/template/settings_form.php (added)
-
tags/1.2/template/statistic.php (added)
-
trunk/plugin.php (modified) (3 diffs)
-
trunk/readme.txt (modified) (1 diff)
-
trunk/template/counter_style.css (modified) (3 diffs)
-
trunk/template/statistic.php (modified) (11 diffs)
Legend:
- Unmodified
- Added
- Removed
-
free-counter/trunk/plugin.php
r1168887 r1169316 6 6 * Description: <a href="http://www.free-counter.org/">Counter and statistics</a> plugin and Widget for WordPress. 7 7 * Author: Free counter 8 * Version: 1. 18 * Version: 1.2 9 9 * Author URI: http://www.free-counter.org/ 10 10 */ … … 301 301 $image_hidden = get_option(_PREFIX . 'default_hidden'); 302 302 $date_week = self::getWeekDates(); 303 if ($res = self::sendToServer($data)) { 303 if ($res = self::sendToServer($data)) { // $res = self::sendToServer($data) 304 304 305 305 if (isset($res["stat"]['all']['months'])) { … … 356 356 $data[$i][3] = $val['3']['country']; 357 357 $data[$i][4] = $val['3']['city']; 358 $data[$i][5] = $val[ '6']['name'];358 $data[$i][5] = $val[6]['operating_systems']; 359 359 $data[$i][6] = $val['5']['name']; 360 360 $data[$i][7] = $val['1']; -
free-counter/trunk/readme.txt
r1155302 r1169316 5 5 Requires at least: 2.5.1 6 6 Tested up to: 4.2.2 7 Stable tag: 1. 17 Stable tag: 1.2 8 8 License: GPLv2 or later 9 9 License URI: http://www.gnu.org/licenses/gpl-2.0.html -
free-counter/trunk/template/counter_style.css
r1167017 r1169316 2 2 * css www.free-counter.org 3 3 */ 4 .review-block { 5 margin-top:0px;float:right; border-left:5px solid #fff; cursor: pointer; 6 text-align: center; 7 font-size: 16px; 8 padding: 0px 25px; 9 } 10 .review-block .desc, .review-registr .desc { 11 font-size: 13px; 12 } 13 .review-block .title, .review-registr .title { 14 margin-bottom: 8px; 15 } 16 .review-registr .title { 17 margin-top: 5px; 18 } 19 .review-registr .desc { 20 margin-bottom: 10px; 21 } 22 .review-registr { 23 position: absolute; 24 right: 0; 25 margin-top:0px; border:1px solid #2ea2cc; cursor: pointer; 26 border-radius: 5px; 27 background: #ffffcb; 28 text-align: center; 29 font-size: 16px; 30 padding: 0px 25px; 31 bottom: 0px; 32 margin-right: 60px; 33 margin-bottom : 15px; 34 box-shadow: 0 0 7px 3px rgba(90, 202, 242, 0.9); 35 } 4 36 .img-counter { 5 37 cursor: pointer; … … 269 301 height: auto; 270 302 overflow:hidden; 303 position: relative; 271 304 } 272 305 .form-account-title { … … 278 311 float:left; 279 312 width: 40%; 313 position: relative; 280 314 } 281 315 .form-account-login { -
free-counter/trunk/template/statistic.php
r1133589 r1169316 70 70 </div> 71 71 </div> 72 <div class="review-registr" style="position: absolute; right: 0;" onclick="window.open('https://wordpress.org/support/view/plugin-reviews/free-counter?filter=5')"> 73 <div class="title">Reviews & Suggestions</div> 74 <img src="<?php echo plugins_url('/img/fiveStars.png', dirname(__FILE__) ); ?>" alt=""> 75 <div class="desc" >to help us maintain this project</div> 76 </div> 72 77 </div> 73 78 <?php } else { … … 75 80 <div class="form-account-login"> 76 81 <div class="form-account-block-login"> 77 <div class="inline" style="margin-top: 0px;">82 <div class="inline" style="margin-top:14px;"> 78 83 <div class="inline" style="margin-top:4px;"> 79 84 <label for="<?php echo ('email'); ?>" class="label-form">E-mail:</label> … … 91 96 </div> 92 97 </div> 98 <div class="review-block" onclick="window.open('https://wordpress.org/support/view/plugin-reviews/free-counter?filter=5')"> 99 <div class="title">Reviews & Suggestions</div> 100 <img src="<?php echo plugins_url('/img/fiveStars.png', dirname(__FILE__) ); ?>" alt=""> 101 <div class="desc" >to help us maintain this project</div> 102 </div> 93 103 </div> 94 104 <?php … … 107 117 <th class="stat"> 108 118 Today<br> 109 <?php echo date(" j.m.y"); ?>119 <?php echo date("d.m.Y"); ?> 110 120 </th> 111 121 <th class="stat"> … … 164 174 <?php 165 175 $count_date = 1; 166 $c = count($stat_chart_day); 167 $count_date = ceil($c/15)+1; 176 $c = 0; 168 177 foreach ($stat_chart_day as $k => $v) { 169 178 foreach($v as $m => $days) { 179 $c += count($days); 170 180 foreach($days as $day => $count){ 181 if (strlen($m) == 1) { 182 $m = '0' . $m; 183 } 184 if (strlen($day) == 1) { 185 $day = '0' . $day; 186 } 171 187 echo "['$day.$m.$k', $count],"; 188 172 189 } 173 190 } 174 }?> 191 } 192 $count_date = ceil($c / 15); 193 ?> 175 194 ]); 176 195 count_in_stat = '<?php echo $count_date; ?>' ; 177 196 var options = { 178 width: '1200', 197 width: '1200', 179 198 height:'200', 180 199 hAxis : {textStyle :{fontSize: 10}, showTextEvery:count_in_stat }, 181 200 colors:["#00f20e"], 182 title: "Visitors User onDate"201 title: "Visitors per Date" 183 202 }; 184 203 … … 196 215 ['Date', 'Visitor'], 197 216 <?php 217 $c = ceil(count($stat_chart_month) / 7) + 1; 198 218 foreach ($stat_chart_month as $month => $days) { 199 219 echo "['$month', $days],"; 200 220 }?> 201 221 ]); 202 222 count_in_month = '<?php echo $c; ?>' ; 203 223 var options = { 204 224 width: '400', 205 225 height:'200', 206 hAxis : {textStyle :{fontSize: 10}, showTextEvery: 1},226 hAxis : {textStyle :{fontSize: 10}, showTextEvery: count_in_month }, 207 227 colors: ["#00e4f2"], 208 title: "Visitors User onMonth"228 title: "Visitors per Month" 209 229 }; 210 230 … … 222 242 ['Date', 'Visitor'], 223 243 <?php 224 foreach ($stat_chart_week as $days) { 225 226 echo "['{$days['date']}', {$days['stat']}],"; 227 244 foreach ($stat_chart_week as $days => $c) { 245 echo "['{$days}', {$c}],"; 228 246 }?> 229 247 ]); … … 232 250 width: '650', 233 251 height:'200', 234 hAxis : {textStyle :{fontSize: 10}, showTextEvery: 1 },252 hAxis : {textStyle :{fontSize: 10}, showTextEvery: 1, slantedTextAngle: '20',slantedText:true }, 235 253 colors: ["#00e4f2"], 236 title: "Visitors User onWeek"254 title: "Visitors per Week" 237 255 }; 238 256 … … 511 529 </td> 512 530 <td class="stat"> 513 <img src="<?php echo IMG . $value[6]['img']; ?>" alt="<?php echo($value[6]['name']); ?>" title="<?php echo($value[6]['name']); ?>"> 531 <?php $os_name = isset($value[6]['operating_systems']) ? $value[6]['operating_systems'] : ""; ?> 532 <img src="<?php echo IMG . $value[6]['img']; ?>" alt="<?php echo $os_name; ?>" title="<?php echo $os_name; ?>"> 514 533 </td> 515 534 <td class="stat"> 516 <img src="<?php echo SERVER_URL_VISIT. $value[5]['img']?>" title="<?php echo $value[5]['name']; ?>" alt="<?php echo $value[5]['name']; ?>">535 <img src="<?php echo IMG . $value[5]['img']?>" title="<?php echo $value[5]['name']; ?>" alt="<?php echo $value[5]['name']; ?>"> 517 536 </td> 518 537 <td class="stat"> … … 580 599 ?> 581 600 </td> 582 601 583 602 </tr> 584 603 <tr> 585 604 <td align="left">System</td> 586 605 <td align="left"> 587 <img src="<?php echo IMG . $value[6]['img']; ?>" alt="<?php echo($value[6]['name']); ?>" title="<?php echo($value[6]['name']); ?>"> <?php echo($value[6]['name']); ?> 606 <?php $os_name = isset($value[6]['operating_systems']) ? $value[6]['operating_systems'] : ""; ?> 607 <img src="<?php echo IMG . $value[6]['img']; ?>" alt="<?php echo($os_name); ?>" title="<?php echo($os_name); ?>"> <?php echo($os_name); ?> 588 608 </td> 589 609 <td align="left">Possible text-query</td> … … 593 613 <td align="left">Browser</td> 594 614 <td align="left"> 595 <img src="<?php echo SERVER_URL_VISIT. $value[5]['img']?>" title="<?php echo $value[5]['name']; ?>" alt="<?php echo $value[5]['name']; ?>"> <?php echo str_replace("Browser ", "", $value[5]['name']); ?>615 <img src="<?php echo IMG . $value[5]['img']?>" title="<?php echo $value[5]['name']; ?>" alt="<?php echo $value[5]['name']; ?>"> <?php echo str_replace("Browser ", "", $value[5]['name']); ?> 596 616 </td> 597 617 <td colspan="2"></td>
Note: See TracChangeset
for help on using the changeset viewer.