Merge branch 'develop' of http://git.dev.yoho.cn/web/yohood into develop

@@ -68,6 +68,17 @@ class Controller_Activity extends Controller_Abstract
 		}	
 		}	
 		krsort($list);
 		krsort($list);
 		krsort($navList);
 		krsort($navList);
+		if(empty($topics))
+		{
+		    if($this->_platform == 'web')
+		    {
+		        $this->_viewname = '../default/other';
+		    }
+		    else
+		    {
+		        $this->_viewname = '../default/othermobile';
+		    }
+		}
 		$this->_view['plans'] = $planList;
 		$this->_view['plans'] = $planList;
 		$this->_view['topics'] = $list[$currentday];
 		$this->_view['topics'] = $list[$currentday];
 		$this->_view['navs'] = $navList;
 		$this->_view['navs'] = $navList;

@@ -17,15 +17,27 @@ class Controller_MobileApi extends Controller_Abstract
 		foreach($modules as $module)
 		foreach($modules as $module)
  		{
  		{
  		    $headCover = '';
  		    $headCover = '';
+ 		    $url = '';
  		    if($module['id'] == 1)
  		    if($module['id'] == 1)
  		    {
  		    {
  		        $headCover = SITE_IMG.'/yohood/yohood-logo-mobile_v3.png';
  		        $headCover = SITE_IMG.'/yohood/yohood-logo-mobile_v3.png';
  		    }
  		    }
+ 		    if(!empty($module['url']))
+ 		    {
+ 		    	if(preg_match('@^http://@', $module['url']))
+ 		    	{
+ 		    		$url = $module['url'];
+ 		    	}
+ 		    	else
+ 		    	{
+ 		    	    $url = SITE_MAIN.$module['url'];
+ 		    	}
+ 		    }
 			$data []  = array('id'=> $module['id'],
 			$data []  = array('id'=> $module['id'],
 			                  'status'=> $module['status'],
 			                  'status'=> $module['status'],
 			           		  'moduleName' => $module['module_name'],
 			           		  'moduleName' => $module['module_name'],
 					          'headCover' => $headCover,
 					          'headCover' => $headCover,
-			                  'url' => !empty($module['url']) ? SITE_MAIN.$module['url'] :'',
+			                  'url' => $url,
 			    );
 			    );
 		}
 		}
 		return $this->returnJson(self::SUCCESS_STATUS_CODE, Config_Code_Mobile::$success_opt['code'], $data, Config_Code_Mobile::$success_opt['message']);
 		return $this->returnJson(self::SUCCESS_STATUS_CODE, Config_Code_Mobile::$success_opt['code'], $data, Config_Code_Mobile::$success_opt['message']);

 <?php $this->_extends('layout/default_layout');?>
 <?php $this->_extends('layout/default_layout');?>
 <?php $this->_block('main');?>
 <?php $this->_block('main');?>
 <div class="site-activity-content">
 <div class="site-activity-content">
-   <h2 class="site-activity-date"><?php echo date('Y-m-d', $this->view->currentday);?></h2>
+    <?php if(!empty($this->view->currentday)):?>
+        <h2 class="site-activity-date"><?php echo date('Y-m-d', $this->view->currentday);?></h2>
+   <?php endif;?>
+   
    <?php foreach($this->view->topics as $topic):?>
    <?php foreach($this->view->topics as $topic):?>
     <div class="main-layout clearfix">
     <div class="main-layout clearfix">
         <div class="layout-section">
         <div class="layout-section">