Changeset 2243958

Timestamp:

02/13/2020 03:24:22 PM (4 years ago)

Author:

Hellstrom

Message:

1.7

• Implemented modern widget look following website relaunch.

Location:

i-plant-a-tree

Files:

• tags/1.7/iplantatree.php (modified) (2 diffs)
• trunk/assets/css/ipat_style.css (modified) (1 diff)
• trunk/assets/image/ipat_widget_green_100x100.svg (added)
• trunk/assets/image/ipat_widget_green_100x200.svg (added)
• trunk/assets/image/ipat_widget_green_100x300.svg (added)
• trunk/assets/image/ipat_widget_green_100x400.svg (added)
• trunk/assets/image/ipat_widget_green_200x100.svg (added)
• trunk/assets/image/ipat_widget_green_300x100.svg (added)
• trunk/assets/image/ipat_widget_green_400x100.svg (added)
• trunk/assets/image/ipat_widget_white_100x100.svg (added)
• trunk/assets/image/ipat_widget_white_100x200.svg (added)
• trunk/assets/image/ipat_widget_white_100x300.svg (added)
• trunk/assets/image/ipat_widget_white_100x400.svg (added)
• trunk/assets/image/ipat_widget_white_200x100.svg (added)
• trunk/assets/image/ipat_widget_white_300x100.svg (added)
• trunk/assets/image/ipat_widget_white_400x100.svg (added)
• trunk/iplantatree.php (modified) (10 diffs)
• trunk/readme.txt (modified) (3 diffs)

i-plant-a-tree/tags/1.7/iplantatree.php

@@ -6 +6 @@
 Description: This plugin shows the count of planted trees via "I Plant A Tree", as well as saved CO2.
 Author: Micha
-Version: 1.6
+Version: 1.
 Author URI: https://lightframefx.de
 URI: https://lightframefx.de
 Tags: ipat,widget,i plant a tree
 Requires at least: 4.2.2
-Tested up to: 5.1
+Tested up to: 5.
 License: GPLv3
 License URI: https://www.gnu.org/licenses/gpl-3.0
@@ -236 +236 @@
                 <tr>
                     <th scope="row">
-                        <label for="ipat_userID">IPAT <?php _e('user ID','i-plant-a-tree');?></label>
-                    </th>
-                    <td colspan="4">
-                        <input id="ipat_userID" class="regular-text" type="text" value="<?php echo $ipat_userID; ?>" name="ipat_userID">
-                    </td>
-                </tr>
-                <tr>
-                    <th scope="row">
                         <label for="ipat_teamID">IPAT <?php _e('team ID','i-plant-a-tree');?></label>
                     </th>

i-plant-a-tree/trunk/assets/css/ipat_style.css

@@ -151 +151 @@
     border:none;
 }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

i-plant-a-tree/trunk/iplantatree.php

@@ -6 +6 @@
 Description: This plugin shows the count of planted trees via "I Plant A Tree", as well as saved CO2.
 Author: Micha
-Version: 1.6
+Version: 1.
 Author URI: https://lightframefx.de
 URI: https://lightframefx.de
 Tags: ipat,widget,i plant a tree
 Requires at least: 4.2.2
-Tested up to: 5.1
+Tested up to: 5.
 License: GPLv3
 License URI: https://www.gnu.org/licenses/gpl-3.0
@@ -158 +158 @@
                 default: $widgetImageSize='120x190'; break;
             }
-            $widgetHTML=ipat_generateWidgetHTML($ipat_settings['widgetType'],'shortcodeAlign_'.$atts['align'],$ipat_settings['isTeamWidget'],$ipat_settings['userID'],$ipat_settings['teamID'],$ipat_settings['treeCount'],$ipat_settings['co2Saving'],$atts['class']);
+            $widgetHTML=ipat_generateWidgetHTML($ipat_settings['widgetType'],'shortcodeAlign_'.$atts['align'],$ipat_settings['isTeamWidget'],$ipat_settings['user'],$ipat_settings['teamID'],$ipat_settings['treeCount'],$ipat_settings['co2Saving'],$atts['class']);
             return $widgetHTML;
         }
@@ -204 +204 @@
         if($_POST['ipat_isTeamWidget']=='true') $ipat_settings['isTeamWidget']=true;
         $ipat_settings['remoteHost']=get_bloginfo('wpurl');
-        $ipat_settings['widgetType']=intval($_POST['ipat_widgetType'],10);
-        if ($ipat_settings['widgetType']==0) $ipat_settings['widgetType']=1;
+        //$ipat_settings['widgetType']=intval($_POST['ipat_widgetType'],10);
+        $ipat_settings['widgetType']=wp_strip_all_tags($_POST['ipat_widgetType'],true);
+        if ($ipat_settings['widgetType']=='') $ipat_settings['widgetType']='1';
         $ipat_language=sanitize_text_field($_POST['ipat_language']);
         $ipat_supportedLanguages=array('de','en','it');
@@ -235 +236 @@
                 <tr>
                     <th scope="row">
-                        <label for="ipat_userID">IPAT <?php _e('user ID','i-plant-a-tree');?></label>
-                    </th>
-                    <td colspan="4">
-                        <input id="ipat_userID" class="regular-text" type="text" value="<?php echo $ipat_userID; ?>" name="ipat_userID">
-                    </td>
-                </tr>
-                <tr>
-                    <th scope="row">
                         <label for="ipat_teamID">IPAT <?php _e('team ID','i-plant-a-tree');?></label>
                     </th>
@@ -274 +267 @@
                 <tr class="ipat_widgetType">
                     <th scope="row">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
                         <label for="ipat_widgetType"><?php _e('widget type','i-plant-a-tree');?></label>
                     </th>
                     <td>
-                        <input type="radio" <?php if ($ipat_settings['widgetType']==1) echo 'checked="checked"';?> value="1" name="ipat_widgetType"><span class="m-l">120 x 190 px</span><br/>
-                        <?php
-                            echo ipat_generateWidgetHTML(1,'',$ipat_settings['isTeamWidget'],$ipat_settings['userID'],$ipat_settings['teamID'],$ipat_settings['treeCount'],$ipat_settings['co2Saving'],'');
-                        ?>
-                    </td>
-                    <td>
-                        <input type="radio" <?php if ($ipat_settings['widgetType']==2) echo 'checked="checked"';?> value="2" name="ipat_widgetType"><span class="m-l">220 x 90 px</span><br/>
-                        <?php
-                            echo ipat_generateWidgetHTML(2,'',$ipat_settings['isTeamWidget'],$ipat_settings['userID'],$ipat_settings['teamID'],$ipat_settings['treeCount'],$ipat_settings['co2Saving'],'');
-                        ?>
-                    </td>
-                    <td>
-                        <input type="radio" <?php if ($ipat_settings['widgetType']==3) echo 'checked="checked"';?> value="3" name="ipat_widgetType"><span class="m-l">100 x 150 px</span><br/>
-                        <?php
-                            echo ipat_generateWidgetHTML(3,'',$ipat_settings['isTeamWidget'],$ipat_settings['userID'],$ipat_settings['teamID'],$ipat_settings['treeCount'],$ipat_settings['co2Saving'],'');
-                        ?>
-                    </td>
-                    <td>
-                        <input type="radio" <?php if ($ipat_settings['widgetType']==4) echo 'checked="checked"';?> value="4" name="ipat_widgetType"><span class="m-l">180 x 80 px</span><br/>
-                        <?php
-                            echo ipat_generateWidgetHTML(4,'',$ipat_settings['isTeamWidget'],$ipat_settings['userID'],$ipat_settings['teamID'],$ipat_settings['treeCount'],$ipat_settings['co2Saving'],'');
+                        <input type="radio" <?php if ($ipat_settings['widgetType']=='white_100x100') echo 'checked="checked"';?> value="white_100x100" name="ipat_widgetType"><span class="m-l">100×100 px</span><br/>
+                        <?php
+                            echo ipat_generateWidgetHTML('white_100x100','',$ipat_settings['isTeamWidget'],$ipat_settings['userName'],$ipat_settings['teamID'],$ipat_settings['treeCount'],$ipat_settings['co2Saving'],'');
+                        ?>
+                    </td>
+                    <td>
+                        <input type="radio" <?php if ($ipat_settings['widgetType']=='white_200x100') echo 'checked="checked"';?> value="white_200x100" name="ipat_widgetType"><span class="m-l">200×100 px</span><br/>
+                        <?php
+                            echo ipat_generateWidgetHTML('white_200x100','',$ipat_settings['isTeamWidget'],$ipat_settings['userName'],$ipat_settings['teamID'],$ipat_settings['treeCount'],$ipat_settings['co2Saving'],'');
+                        ?>
+                    </td>
+                    <td>
+                        <input type="radio" <?php if ($ipat_settings['widgetType']=='white_300x100') echo 'checked="checked"';?> value="white_300x100" name="ipat_widgetType"><span class="m-l">300×100 px</span><br/>
+                        <?php
+                            echo ipat_generateWidgetHTML('white_300x100','',$ipat_settings['isTeamWidget'],$ipat_settings['userName'],$ipat_settings['teamID'],$ipat_settings['treeCount'],$ipat_settings['co2Saving'],'');
+                        ?>
+                    </td>
+                    <td>
+                        <input type="radio" <?php if ($ipat_settings['widgetType']=='white_400x100') echo 'checked="checked"';?> value="white_400x100" name="ipat_widgetType"><span class="m-l">400×100 px</span><br/>
+                        <?php
+                            echo ipat_generateWidgetHTML('white_400x100','',$ipat_settings['isTeamWidget'],$ipat_settings['userName'],$ipat_settings['teamID'],$ipat_settings['treeCount'],$ipat_settings['co2Saving'],'');
+                        ?>
+                    </td>
+                </tr>
+                <tr class="ipat_widgetType">
+                    <th>
+                    </th>
+                    <td>
+                        <input type="radio" <?php if ($ipat_settings['widgetType']=='green_100x100') echo 'checked="checked"';?> value="green_100x100" name="ipat_widgetType"><span class="m-l">100×100 px</span><br/>
+                        <?php
+                            echo ipat_generateWidgetHTML('green_100x100','',$ipat_settings['isTeamWidget'],$ipat_settings['userName'],$ipat_settings['teamID'],$ipat_settings['treeCount'],$ipat_settings['co2Saving'],'');
+                        ?>
+                    </td>
+                    <td>
+                        <input type="radio" <?php if ($ipat_settings['widgetType']=='green_200x100') echo 'checked="checked"';?> value="green_200x100" name="ipat_widgetType"><span class="m-l">200×100 px</span><br/>
+                        <?php
+                            echo ipat_generateWidgetHTML('green_200x100','',$ipat_settings['isTeamWidget'],$ipat_settings['userName'],$ipat_settings['teamID'],$ipat_settings['treeCount'],$ipat_settings['co2Saving'],'');
+                        ?>
+                    </td>
+                    <td>
+                        <input type="radio" <?php if ($ipat_settings['widgetType']=='green_300x100') echo 'checked="checked"';?> value="green_300x100" name="ipat_widgetType"><span class="m-l">300×100 px</span><br/>
+                        <?php
+                            echo ipat_generateWidgetHTML('green_300x100','',$ipat_settings['isTeamWidget'],$ipat_settings['userName'],$ipat_settings['teamID'],$ipat_settings['treeCount'],$ipat_settings['co2Saving'],'');
+                        ?>
+                    </td>
+                    <td>
+                        <input type="radio" <?php if ($ipat_settings['widgetType']=='green_400x100') echo 'checked="checked"';?> value="green_400x100" name="ipat_widgetType"><span class="m-l">400×100 px</span><br/>
+                        <?php
+                            echo ipat_generateWidgetHTML('green_400x100','',$ipat_settings['isTeamWidget'],$ipat_settings['userName'],$ipat_settings['teamID'],$ipat_settings['treeCount'],$ipat_settings['co2Saving'],'');
+                        ?>
+                    </td>
+                </tr>
+                <tr class="ipat_widgetType">
+                    <th>
+                    </th>
+                    <td>
+                    </td>
+                    <td>
+                        <input type="radio" <?php if ($ipat_settings['widgetType']=='white_100x200') echo 'checked="checked"';?> value="white_100x200" name="ipat_widgetType"><span class="m-l">100×200 px</span><br/>
+                        <?php
+                            echo ipat_generateWidgetHTML('white_100x200','',$ipat_settings['isTeamWidget'],$ipat_settings['userName'],$ipat_settings['teamID'],$ipat_settings['treeCount'],$ipat_settings['co2Saving'],'');
+                        ?>
+                    </td>
+                    <td>
+                        <input type="radio" <?php if ($ipat_settings['widgetType']=='white_100x300') echo 'checked="checked"';?> value="white_100x300" name="ipat_widgetType"><span class="m-l">100×300 px</span><br/>
+                        <?php
+                            echo ipat_generateWidgetHTML('white_100x300','',$ipat_settings['isTeamWidget'],$ipat_settings['userName'],$ipat_settings['teamID'],$ipat_settings['treeCount'],$ipat_settings['co2Saving'],'');
+                        ?>
+                    </td>
+                    <td>
+                        <input type="radio" <?php if ($ipat_settings['widgetType']=='white_100x400') echo 'checked="checked"';?> value="white_100x400" name="ipat_widgetType"><span class="m-l">100×400 px</span><br/>
+                        <?php
+                            echo ipat_generateWidgetHTML('white_100x400','',$ipat_settings['isTeamWidget'],$ipat_settings['userName'],$ipat_settings['teamID'],$ipat_settings['treeCount'],$ipat_settings['co2Saving'],'');
+                        ?>
+                    </td>
+                </tr>
+                <tr class="ipat_widgetType">
+                    <th>
+                    </th>
+                    <td>
+                    </td>
+                    <td>
+                        <input type="radio" <?php if ($ipat_settings['widgetType']=='green_100x200') echo 'checked="checked"';?> value="green_100x200" name="ipat_widgetType"><span class="m-l">100×200 px</span><br/>
+                        <?php
+                            echo ipat_generateWidgetHTML('green_100x200','',$ipat_settings['isTeamWidget'],$ipat_settings['userName'],$ipat_settings['teamID'],$ipat_settings['treeCount'],$ipat_settings['co2Saving'],'');
+                        ?>
+                    </td>
+                    <td>
+                        <input type="radio" <?php if ($ipat_settings['widgetType']=='green_100x300') echo 'checked="checked"';?> value="green_100x300" name="ipat_widgetType"><span class="m-l">100×300 px</span><br/>
+                        <?php
+                            echo ipat_generateWidgetHTML('green_100x300','',$ipat_settings['isTeamWidget'],$ipat_settings['userName'],$ipat_settings['teamID'],$ipat_settings['treeCount'],$ipat_settings['co2Saving'],'');
+                        ?>
+                    </td>
+                    <td>
+                        <input type="radio" <?php if ($ipat_settings['widgetType']=='green_100x400') echo 'checked="checked"';?> value="green_100x400" name="ipat_widgetType"><span class="m-l">100×400 px</span><br/>
+                        <?php
+                            echo ipat_generateWidgetHTML('green_100x400','',$ipat_settings['isTeamWidget'],$ipat_settings['userName'],$ipat_settings['teamID'],$ipat_settings['treeCount'],$ipat_settings['co2Saving'],'');
                         ?>
                     </td>
@@ -309 +407 @@
                         <input type="radio" <?php if ($ipat_settings['refreshInterval']==240) {echo 'checked="checked"'; $ipat_intervalChecked=true;} ?> value="240" name="ipat_refreshInterval"><span class="m-l"><?php _e('4 hours','i-plant-a-tree');?></span>
                         <input type="radio" <?php if ($ipat_settings['refreshInterval']==720) {echo 'checked="checked"'; $ipat_intervalChecked=true;}?> value="720" name="ipat_refreshInterval"><span class="m-l"><?php _e('12 hours','i-plant-a-tree');?></span>
-                        <input type="radio" <?php if ($ipat_settings['refreshInterval']==1440 || !$ipat_intervalChecked) echo 'checked="checked"';?> value="1440" name="ipat_refreshInterval"><span class="m-l"><?php _e('24 hours','i-plant-a-tree');?></span>
+                        <input type="radio" <?php if ($ipat_settings['refreshInterval']==1440) {echo 'checked="checked"'; $ipat_intervalChecked=true;}?> value="1440" name="ipat_refreshInterval"><span class="m-l"><?php _e('24 hours','i-plant-a-tree');?></span>
+                        <input type="radio" <?php if ($ipat_settings['refreshInterval']==10080 || !$ipat_intervalChecked) echo 'checked="checked"';?> value="10080" name="ipat_refreshInterval"><span class="m-l"><?php _e('weekly','i-plant-a-tree');?></span>
                         <p class="description"><?php _e('The update interval determines how often new data will be gotten from server. Usually a daily update will do.','i-plant-a-tree');?></p>
                     </td>
@@ -393 +492 @@
         $co2Saving=$widget->{"co2"};
         $ipat_settings['lastUpdate']=time();
-        if ((!$ipat_settings['isTeamWidget'] && $ipat_settings['userID']==0) || ($ipat_settings['isTeamWidget'] && $ipat_settings['teamID']==0)) {
-            $ipat_settings['treeCount']=0;
+        if ((!$ipat_settings['isTeamWidget'] && $ipat_settings['userID']==0) || ($ipat_settings['isTeamWidget'] && $ipat_settings['teamID']==0)) {
+            $ipat_settings['treeCount']=;
             $ipat_settings['co2Saving']=0;
         } else {
@@ -415 +514 @@
     $ipat_sidebarWidgetHTML.='<p>';
 
-    $ipat_sidebarWidgetHTML.=ipat_generateWidgetHTML($ipat_settings['widgetType'],$ipat_settings['widgetControlAlign'],$ipat_settings['isTeamWidget'],$ipat_settings['userID'],$ipat_settings['teamID'],$ipat_settings['treeCount'],$ipat_settings['co2Saving'],'');
+    $ipat_sidebarWidgetHTML.=ipat_generateWidgetHTML($ipat_settings['widgetType'],$ipat_settings['widgetControlAlign'],$ipat_settings['isTeamWidget'],$ipat_settings['user'],$ipat_settings['teamID'],$ipat_settings['treeCount'],$ipat_settings['co2Saving'],'');
 
     $ipat_sidebarWidgetHTML.='</p>';
@@ -425 +524 @@
 }
 
-function ipat_generateWidgetHTML($ipat_widgetType,$ipat_widgetControlAlign,$ipat_isTeamWidget,$ipat_userID,$ipat_teamID,$ipat_treeCount,$ipat_co2Saving,$ipat_extraClass) {
+function ipat_generateWidgetHTML($ipat_widgetType,$ipat_widgetControlAlign,$ipat_isTeamWidget,$ipat_user,$ipat_teamID,$ipat_treeCount,$ipat_co2Saving,$ipat_extraClass) {
     $ipat_sidebarWidgetHTML='';
 
     switch ($ipat_widgetType) {
-        case 2: $widgetImageSize='220x90'; break;
-        case 3: $widgetImageSize='100x150'; break;
-        case 4: $widgetImageSize='180x80'; break;
-        default: $widgetImageSize='120x190'; break;
+        case '1':
+            $ipat_sidebarWidgetHTML=ipat_generateWidgetHTML_classic($ipat_widgetType,$ipat_widgetControlAlign,$ipat_isTeamWidget,$ipat_userName,$ipat_teamID,$ipat_treeCount,$ipat_co2Saving,$ipat_extraClass); break;
+        case '2':
+            $ipat_sidebarWidgetHTML=ipat_generateWidgetHTML_classic($ipat_widgetType,$ipat_widgetControlAlign,$ipat_isTeamWidget,$ipat_userName,$ipat_teamID,$ipat_treeCount,$ipat_co2Saving,$ipat_extraClass); break;
+        case '3':
+            $ipat_sidebarWidgetHTML=ipat_generateWidgetHTML_classic($ipat_widgetType,$ipat_widgetControlAlign,$ipat_isTeamWidget,$ipat_userName,$ipat_teamID,$ipat_treeCount,$ipat_co2Saving,$ipat_extraClass); break;
+        case '4':
+            $ipat_sidebarWidgetHTML=ipat_generateWidgetHTML_classic($ipat_widgetType,$ipat_widgetControlAlign,$ipat_isTeamWidget,$ipat_userName,$ipat_teamID,$ipat_treeCount,$ipat_co2Saving,$ipat_extraClass); break;
+        default:
+            $ipat_sidebarWidgetHTML=ipat_generateWidgetHTML_modern($ipat_widgetType,$ipat_widgetControlAlign,$ipat_isTeamWidget,$ipat_userName,$ipat_teamID,$ipat_treeCount,$ipat_co2Saving,$ipat_extraClass); break;
+    }
+
+    return $ipat_sidebarWidgetHTML;
+}
+
+function ipat_generateWidgetHTML_modern($ipat_widgetType,$ipat_widgetControlAlign,$ipat_isTeamWidget,$ipat_userName,$ipat_teamID,$ipat_treeCount,$ipat_co2Saving,$ipat_extraClass) {
+
+    $ipat_sidebarWidgetHTML='<a ';
+    if ($ipat_co2Saving>1) {
+        $ipat_sidebarWidgetHTML.='title="'.round(($ipat_co2Saving*1000),1).' kg" ';
+    }
+    if ($ipat_isTeamWidget) {
+        $ipat_sidebarWidgetHTML.='href="https://www.iplantatree.org/team/'.$ipat_teamID.'" target="_blank" rel="noopener">';
+    } else {
+        $ipat_sidebarWidgetHTML.='href="https://www.iplantatree.org/user/'.$ipat_userName.'" target="_blank" rel="noopener">';
+    }
+
+    $ipat_sidebarWidgetHTML.='<div ';
+    $ipat_sidebarWidgetHTML.='style=background-image:url('.plugins_url().'/'.dirname(plugin_basename(__FILE__)).'/assets/image/ipat_widget_'.$ipat_widgetType.'.svg)';
+    $ipat_sidebarWidgetHTML.=' class="ipat_widget ipat_widgetType_'.$ipat_widgetType;
+
+    switch ($ipat_widgetControlAlign) {
+        case 'left': $ipat_sidebarWidgetHTML.=' ipat_alignSidebarLeft'; break;
+        case 'right': $ipat_sidebarWidgetHTML.=' ipat_alignSidebarRight'; break;
+        case 'center': $ipat_sidebarWidgetHTML.=' ipat_alignSidebarCenter'; break;
+        case 'shortcodeAlign_left': $ipat_sidebarWidgetHTML.=' ipat_alignLeft'; break;
+        case 'shortcodeAlign_right': $ipat_sidebarWidgetHTML.=' ipat_alignRight'; break;
+        case 'shortcodeAlign_center': $ipat_sidebarWidgetHTML.=' ipat_alignCenter'; break;
+    }
+    $ipat_sidebarWidgetHTML.=' '.$ipat_extraClass.'">';
+
+    $ipat_sidebarWidgetHTML.='<div class="ipat_m_widgetTreeCountTextWrapper">';
+    $ipat_sidebarWidgetHTML.='<div class="ipat_m_widgetTreeCountText">';
+    if ($ipat_widgetType=='white_100x100' || $ipat_widgetType=='green_100x100') {
+        $ipat_sidebarWidgetHTML.=__('trees','i-plant-a-tree').':</div>';
+    } else {
+        $ipat_sidebarWidgetHTML.=__('planted trees','i-plant-a-tree').':</div>';
+    }
+    $ipat_sidebarWidgetHTML.='<div class="ipat_m_widgetTreeCount">'.$ipat_treeCount.'</div>';
+    $ipat_sidebarWidgetHTML.='</div>';
+
+    $ipat_sidebarWidgetHTML.='<div class="ipat_m_widgetCo2SavingWrapper">';
+    $ipat_sidebarWidgetHTML.='<div class="ipat_m_widgetCo2SavingText">';
+    if ($ipat_widgetType=='white_100x100' || $ipat_widgetType=='green_100x100') {
+        $ipat_sidebarWidgetHTML.='CO<sub>2</sub>:</div>';
+    } else {
+        $ipat_sidebarWidgetHTML.=__('CO<sub>2</sub> saved','i-plant-a-tree').':</div>';
+    }
+    $ipat_sidebarWidgetHTML.='<div class="ipat_m_widgetCo2Saving">'.ipat_formatHumanReadable($ipat_co2Saving).'</div>';
+    $ipat_sidebarWidgetHTML.='</div>';
+
+    $ipat_sidebarWidgetHTML.='</div>';
+    $ipat_sidebarWidgetHTML.='</a>';
+
+    return $ipat_sidebarWidgetHTML;
+}
+
+function ipat_generateWidgetHTML_classic($ipat_widgetType,$ipat_widgetControlAlign,$ipat_isTeamWidget,$ipat_userName,$ipat_teamID,$ipat_treeCount,$ipat_co2Saving,$ipat_extraClass) {
+    $ipat_sidebarWidgetHTML='';
+
+    switch ($ipat_widgetType) {
+        case '1': $widgetImageSize='120x190'; break;
+        case '2': $widgetImageSize='220x90'; break;
+        case '3': $widgetImageSize='100x150'; break;
+        case '4': $widgetImageSize='180x80'; break;
     }
 
@@ -453 +623 @@
         $ipat_sidebarWidgetHTML.='href="https://www.iplantatree.org/team/'.$ipat_teamID.'" target="_blank" rel="noopener">';
     } else {
-        $ipat_sidebarWidgetHTML.='href="https://www.iplantatree.org/user/'.$ipat_userID.'" target="_blank" rel="noopener">';
+        $ipat_sidebarWidgetHTML.='href="https://www.iplantatree.org/user/'.$ipat_user.'" target="_blank" rel="noopener">';
     }
 

i-plant-a-tree/trunk/readme.txt

@@ -3 +3 @@
 Tags: ipat,widget,i plant a tree
 Requires at least: 4.2.2
-Tested up to: 5.1
-Stable tag: 1.6
+Tested up to: 5.
+Stable tag: 1.
 License: GPLv3
 License URI: https://www.gnu.org/licenses/gpl-3.0
@@ -25 +25 @@
 
 == Changelog ==
+
+
+
 
 = 1.6 =
@@ -98 +101 @@
 == Upgrade Notice ==
 
-= 1.6 =
-Aufgrund eines holperigen Webseite-Relaunchs bei IPAT ist es notwendig, deinen Benutzernamen in den Einstellungen einzutragen, damit das Widget wieder funktioniert.
-Due to a kind of bumpy website relaunch at IPAT it is neccessary to provide your user name in the settings, to make your widget working again.
+= 1. =
+.
+.