Changeset 2684

Timestamp:

09/30/10 09:41:55 (12 years ago)

Author:

Tomtom33

Message:

lunarPhase 1.1-RC2 :

• Added title for each item of previsions
• Added comments

Location:

plugins/lunarPhase/trunk

Files:

• _define.php (modified) (1 diff)
• _public.php (modified) (5 diffs)
• inc/class.lunarphase.php (modified) (1 diff)

plugins/lunarPhase/trunk/_define.php

@@ -17 +17 @@
           /* Description */        'Display the moon phases',
           /* Author */             'Tomtom (http://blog.zenstyle.fr)',
-          /* Verion */             '1.1-RC1',
+          /* Verion */             '1.1-RC2',
           /* Premission */         'usage,contentadmin'
 );

plugins/lunarPhase/trunk/_public.php

@@ -35 +35 @@
      Displays lunarphase widget
      
-     @param    object    w
-     @return   string
+     @param    w    <b>dcWidget</b>     dcWidget object
+     @return   <b>string</b>  HTML code of widget
      */
      public static function widget($w)
@@ -43 +43 @@
           
           $lp = new lunarPhase();
-          
-          $ul_mask = '<ul class="%2$s">%1$s</ul>';
-          $li_mask = '<li class="%2$s">%1$s</li>';
           
           if ($w->homeonly && $core->url->type != 'default') {
@@ -64 +61 @@
      }
      
+     /**
+     Returns "live" part of lunarphase widget
+     
+     @param    w    <b>dcWidget</b>     dcWidget object
+     @param    lp   <b>lunarPhaset</b>  lunarPhase object
+     @return   <b>string</b>  Live HTML part
+     */
      public static function getLive($w,$lp)
      {
@@ -132 +136 @@
      }
      
+     /**
+     Returns "previsions" part of lunarphase widget
+     
+     @param    w    <b>dcWidget</b>     dcWidget object
+     @param    lp   <b>lunarPhaset</b>  lunarPhase object
+     @return   <b>string</b>  previsions HTML part
+     */
      public static function getPrevisions($w,$lp)
      {
           $ul_mask = '<ul class="%2$s">%1$s</ul>';
-          $li_mask = '<li class="%2$s">%1$s</li>';
+          $li_mask = '<li class="%2$s" title="%3$s">%1$s</li>';
           $res = '';
           
           if ($w->previsions) {
                foreach ($lp->getPrevisions() as $k => $v) {
-                    $res .= sprintf($li_mask,lunarPhasePublic::formatValue('date',$v),$k);
+                    $res .= sprintf($li_mask,lunarPhasePublic::formatValue('date',$v['date']),$k,$v['name']);
                }
           }
@@ -151 +162 @@
      }
      
+     /**
+     Returns value passed in argument with a correct format
+     
+     @param    type      <b>string</b>  Type of convertion
+     @param    value     <b>mixed</b>   Value to convert
+     @return   <b>mixed</b>   Converted value
+     */
      public static function formatValue($type = '',$value)
      {

plugins/lunarPhase/trunk/inc/class.lunarphase.php

@@ -143 +143 @@
           $start = time() - $this->live['age'] * $ts_day;
           
-          $this->previsions = new ArrayObject;
-          $this->previsions['waxing_crescent_moon'] = $start + $ts_synodic / 8;
-          $this->previsions['first_quarter_moon'] = $start + $ts_synodic / 4;
-          $this->previsions['waxing_gibbous_moon'] = $start + $ts_synodic * 3 / 8;
-          $this->previsions['full_moon'] = $start + $ts_synodic / 2;
-          $this->previsions['waning_gibbous_moon'] = $start + $ts_synodic * 5 / 8;
-          $this->previsions['last_quarter_moon'] = $start + $ts_synodic * 3 / 4;
-          $this->previsions['waning_crescent_moon'] = $start + $ts_synodic * 7 / 8;
-          $this->previsions['new_moon'] = $start + $ts_synodic;
-          
+          $this->previsions['waxing_crescent_moon'] = array(
+               'name' => __('Waxing crescent moon'),
+               'date' => $start + $ts_synodic / 8
+          );
+          $this->previsions['first_quarter_moon'] = array(
+               'name' => __('First quarter moon'),
+               'date' => $start + $ts_synodic / 4
+          );
+          $this->previsions['waxing_gibbous_moon'] = array(
+               'name' => __('Waxing gibbous moon'),
+               'date' => $start + $ts_synodic * 3 / 8
+          );
+          $this->previsions['full_moon'] = array(
+               'name' => __('Full moon'),
+               'date' => $start + $ts_synodic / 2
+          );
+          $this->previsions['waning_gibbous_moon'] = array(
+               'name' => __('Waning gibbous moon'),
+               'date' => $start + $ts_synodic * 5 / 8
+          );
+          $this->previsions['last_quarter_moon'] = array(
+               'name' => __('Last qurter moon'),
+               'date' => $start + $ts_synodic * 3 / 4
+          );
+          $this->previsions['waning_crescent_moon'] = array(
+               'name' => __('Waning crescent moon'),
+               'date' => $start + $ts_synodic * 7 / 8
+          );
+          $this->previsions['new_moon'] = array(
+               'name' => __('New moon'),
+               'date' =>$start + $ts_synodic
+          );
      }