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)
);
initLogoUp();
initPicUp();
init_upload_video();
init_upload_video('upload_video', function(response,swf)
{
if (response.error == 0)
{
var realPath = response.relaPath;
$("#video").val(realPath);
if($("#video").next().size()>0)
{
$("#video").next().remove();
}
$("#video").prev().css("margin-top","-100px");
$("#video").after('<video src="'+response.url+'" controls="controls" width="80"></video>');
}
else
{
box.alert(response.message);
}
} );
});
... ...
... ... @@ -52,6 +52,7 @@
SELECT * FROM `tbl_news` #where# order by create_time DESC LIMIT :offset, :limit
</select>
<select id="getListByDateHits">
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
<!--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-->
SELECT * FROM tbl_news WHERE `tag` = :tag AND #where# or is_video=1 ORDER BY hits DESC LIMIT :offset, :limit
</select>
</sqlMap>
\ No newline at end of file
... ...
... ... @@ -20,7 +20,7 @@
</div>
<div class="content">
<p><?php echo Lib_Helper_Emoji::convert_view(Lib_Utils_StringHelper::substr_full_en($title,60));?></p>
<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>
<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>
</div>
</div>
<?php endforeach;?>
... ...
... ... @@ -53,7 +53,7 @@ $width = 342;
echo $news['tag'];
?>
</a>
<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>
<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>
</div>
<div class="content">
<h2 <?php echo $news['main_title_type'] == 1 ? 'class="volupia"':'';?>>
... ...