fe / YOHOOD · Commits

Go to a project

Authored by microTT
Commit e78dbe27cd5ddeafd75f8ed9539604fe1a468916 2 parents 9cb929a5 529bb18c

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

Inline Side-by-side
Showing 4 changed files with 22 additions and 4 deletions
@@ -124,7 +124,24 @@ define('admin/brand',function(require, exports) @@ -124,7 +124,24 @@ define('admin/brand',function(require, exports)
124 ); 124 );
125 initLogoUp(); 125 initLogoUp();
126 initPicUp(); 126 initPicUp();
127 - init_upload_video(); 127 + init_upload_video('upload_video', function(response,swf)
  128 + {
  129 + if (response.error == 0)
  130 + {
  131 + var realPath = response.relaPath;
  132 + $("#video").val(realPath);
  133 + if($("#video").next().size()>0)
  134 + {
  135 + $("#video").next().remove();
  136 + }
  137 + $("#video").prev().css("margin-top","-100px");
  138 + $("#video").after('<video src="'+response.url+'" controls="controls" width="80"></video>');
  139 + }
  140 + else
  141 + {
  142 + box.alert(response.message);
  143 + }
  144 + } );
128 }); 145 });
129 146
130 147
@@ -52,6 +52,7 @@ @@ -52,6 +52,7 @@
52 SELECT * FROM `tbl_news` #where# order by create_time DESC LIMIT :offset, :limit 52 SELECT * FROM `tbl_news` #where# order by create_time DESC LIMIT :offset, :limit
53 </select> 53 </select>
54 <select id="getListByDateHits"> 54 <select id="getListByDateHits">
55 - SELECT * FROM tbl_news WHERE `tag` = :tag AND #where# ORDER BY UNIX_TIMESTAMP(FROM_UNIXTIME(create_time,'%Y-%m-%d')) DESC, hits DESC LIMIT :offset, :limit 55 + <!--SELECT * FROM tbl_news WHERE `tag` = :tag AND #where# ORDER BY UNIX_TIMESTAMP(FROM_UNIXTIME(create_time,'%Y-%m-%d')) DESC, hits DESC LIMIT :offset, :limit-->
  56 + SELECT * FROM tbl_news WHERE `tag` = :tag AND #where# or is_video=1 ORDER BY hits DESC LIMIT :offset, :limit
56 </select> 57 </select>
57 </sqlMap> 58 </sqlMap>
@@ -20,7 +20,7 @@ @@ -20,7 +20,7 @@
20 </div> 20 </div>
21 <div class="content"> 21 <div class="content">
22 <p><?php echo Lib_Helper_Emoji::convert_view(Lib_Utils_StringHelper::substr_full_en($title,60));?></p> 22 <p><?php echo Lib_Helper_Emoji::convert_view(Lib_Utils_StringHelper::substr_full_en($title,60));?></p>
23 - <p class="time" style="font-style:italic"><?php $en = array('01'=>'January','02'=>'February','03'=>'March','04'=>'April','05'=>'May','06'=>'June','07'=>'July','08'=>'August','09'=>'September','10'=>'October','11'=>'November','12'=>'December');$m=date('m', $fragment['publishTime']);echo $en[$m]?>&nbsp;&nbsp;&nbsp;<?php ECHO $m=date('d.Y', $fragment['publishTime'])?></p> 23 + <p class="time" style="font-style:italic"><?php $en = array('01'=>'January','02'=>'February','03'=>'March','04'=>'April','05'=>'May','06'=>'June','07'=>'July','08'=>'August','09'=>'September','10'=>'October','11'=>'November','12'=>'December');$m=date('m', $fragment['publishTime']);echo $en[$m]?>&nbsp;<?php ECHO $m=date('d,Y', $fragment['publishTime'])?></p>
24 </div> 24 </div>
25 </div> 25 </div>
26 <?php endforeach;?> 26 <?php endforeach;?>
@@ -53,7 +53,7 @@ $width = 342; @@ -53,7 +53,7 @@ $width = 342;
53 echo $news['tag']; 53 echo $news['tag'];
54 ?> 54 ?>
55 </a> 55 </a>
56 - <span class="item-time"><?php $en = array('01'=>'January','02'=>'February','03'=>'March','04'=>'April','05'=>'May','06'=>'June','07'=>'July','08'=>'August','09'=>'September','10'=>'October','11'=>'November','12'=>'December');$m=date('m', $news['create_time']);echo $en[$m]?>&nbsp;<?php ECHO $m=date('d,Y', $news['create_time'])?></span> 56 + <span class="item-time" style="margin-right:10px"><?php $en = array('01'=>'January','02'=>'February','03'=>'March','04'=>'April','05'=>'May','06'=>'June','07'=>'July','08'=>'August','09'=>'September','10'=>'October','11'=>'November','12'=>'December');$m=date('m', $news['create_time']);echo $en[$m]?>&nbsp;<?php ECHO $m=date('d,Y', $news['create_time'])?></span>
57 </div> 57 </div>
58 <div class="content"> 58 <div class="content">
59 <h2 <?php echo $news['main_title_type'] == 1 ? 'class="volupia"':'';?>> 59 <h2 <?php echo $news['main_title_type'] == 1 ? 'class="volupia"':'';?>>