Changeset 591 for trunk

Timestamp:

11/22/10 16:19:49 (18 months ago)

Author:

r2

Message:

подсветка новых событий в ленте

Location:

trunk

Files:

• admin/css/styles.css (modified) (2 diffs)
• core/classes/actions.class.php (modified) (2 diffs)
• core/classes/user.class.php (modified) (1 diff)
• templates/_default_/admin/actions.php (modified) (1 diff)
• templates/_default_/components/com_users_profile.tpl (modified) (1 diff)
• templates/_default_/css/styles.css (modified) (1 diff)
• templates/_default_/modules/mod_actions.tpl (modified) (1 diff)

trunk/admin/css/styles.css

@@ -586 +586 @@
     overflow:hidden;
 }
+
+.action_entry .is_new { color:#FF5A00; }
 
 .action_user{
@@ -638 +640 @@
 .act_add_user_photo{ background:url(/templates/_default_/images/icons/actions/add_user_photo.png) no-repeat left 1px; }
 .act_add_user_photo_multi{ background:url(/templates/_default_/images/icons/actions/add_user_photo_multi.png) no-repeat left 3px; }
-.add_user{ background:url(/templates/_default_/images/icons/actions/add_user.png) no-repeat left 3px; }
-.add_wall_my{ background:url(/templates/_default_/images/icons/actions/add_wall_my.png) no-repeat left 3px; }
+.act_add_user{ background:url(/templates/_default_/images/icons/actions/add_user.png) no-repeat left 3px; }
+.act_add_wall_my{ background:url(/templates/_default_/images/icons/actions/add_wall_my.png) no-repeat left 3px; }

trunk/core/classes/actions.class.php

@@ -249 +249 @@
         if (!$this->only_friends){ $this->where('log.is_friends_only = 0'); }
         if (!$inUser->id) { $this->where('log.is_users_only = 0'); }
-        
+
         $sql = "SELECT log.object as object,
                        log.object_url as object_url,
@@ -301 +301 @@
             }
 
+            $action['is_new'] = false;
+
+            if ($inUser->id){
+                $action['is_new'] = (bool)(strtotime($action['pubdate']) > strtotime($inUser->logdate));
+            }
+            
             $action['user_url']     = cmsUser::getProfileURL($action['user_login']);
             $action['pubdate']      = cmsCore::dateDiffNow($action['pubdate']);

trunk/core/classes/user.class.php

@@ -67 +67 @@
             $this->{$key}   = $value;
         }
+
+        $this->logdate = $_SESSION['user']['logdate'];
 
         $avatar_dir     = PATH . '/images/users/avatars/small/';

trunk/templates/_default_/admin/actions.php

@@ -3 +3 @@
         <?php foreach($actions as $action) { ?>
             <div class="action_entry act_<?php echo $action['name']; ?>">
-                <div class="action_date"><?php echo $action['pubdate']; ?> íàçàä</div>
+                <div class="action_date<?php if ($action['is_new']){ ?> is_new<?php } ?>"><?php echo $action['pubdate']; ?> íàçàä</div>
                 <div class="action_title">
                     <a href="<?php echo $action['user_url']; ?>" class="action_user"><?php echo $action['user_nickname']; ?></a>

trunk/templates/_default_/components/com_users_profile.tpl

@@ -412 +412 @@
                                 {foreach key=aid item=action from=$usr.actions}
                                     <div class="action_entry act_{$action.name}">
-                                        <div class="action_date">{$action.pubdate} {$LANG.BACK}</div>
+                                        <div class="action_date{if $action.is_new} is_new{/if}">{$action.pubdate} {$LANG.BACK}</div>
                                         <div class="action_title">
                                             <a href="{$action.user_url}" class="action_user">{$action.user_nickname}</a>

trunk/templates/_default_/css/styles.css

@@ -3484 +3484 @@
     margin-bottom:15px;    
 }
+
+.action_entry .is_new { color:#FF5A00; }
 
 .action_user{

trunk/templates/_default_/modules/mod_actions.tpl

@@ -3 +3 @@
         {foreach key=aid item=action from=$actions}
             <div class="action_entry act_{$action.name}">
-                <div class="action_date">{$action.pubdate} {$LANG.BACK}</div>
+                <div class="action_date{if $action.is_new} is_new{/if}">{$action.pubdate} {$LANG.BACK}</div>
                 <div class="action_title">
                     <a href="{$action.user_url}" class="action_user">{$action.user_nickname}</a>