Skip to content

Commit

Permalink
Version 3.2.5:Material Design.
Browse files Browse the repository at this point in the history
  • Loading branch information
lincanbin committed Nov 17, 2014
1 parent 538e34b commit 2066cfa
Show file tree
Hide file tree
Showing 5 changed files with 78 additions and 147 deletions.
4 changes: 2 additions & 2 deletions common.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
//数据库从设计上避免使用Join多表联查

//error_reporting(0);//不输出任何错误信息
//error_reporting(E_ALL ^ E_NOTICE);//除了 E_NOTICE,报告其他所有错误
error_reporting(E_ALL);//输出所有错误信息,调试用
error_reporting(E_ALL ^ E_NOTICE);//除了 E_NOTICE,报告其他所有错误
//error_reporting(E_ALL);//输出所有错误信息,调试用
ini_set('display_errors', '1');//显示错误
date_default_timezone_set('PRC');//设置中国时区
//开始计时,初始化常量、常量
Expand Down
2 changes: 1 addition & 1 deletion install/database.sql
Original file line number Diff line number Diff line change
Expand Up @@ -447,7 +447,7 @@ INSERT INTO `carbon_config` VALUES ('PostsPerPage', '25');
INSERT INTO `carbon_config` VALUES ('SiteDesc', '一个精简、高速的基于话题的新式论坛');
INSERT INTO `carbon_config` VALUES ('SiteName', 'Carbon Forum');
INSERT INTO `carbon_config` VALUES ('TopicsPerPage', '20');
INSERT INTO `carbon_config` VALUES ('Version', '3.2.4');
INSERT INTO `carbon_config` VALUES ('Version', '3.2.5');

-- ----------------------------
-- Records of carbon_roles
Expand Down
6 changes: 3 additions & 3 deletions styles/default/template/layout.php
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,10 @@
<!--a href="<?php echo $Config['WebsitePath']; ?>/explore"<?php echo $UrlPath=='explore'?' class="buttons-active"':''; ?>>发现</a-->
<?php if($CurUserID){ ?>
<a href="<?php echo $Config['WebsitePath']; ?>/new"<?php echo $UrlPath=='new'?' class="buttons-active"':''; ?>>发新帖</a>
<a href="<?php echo $Config['WebsitePath']; ?>/settings"<?php echo $UrlPath=='settings'?' class="buttons-active"':''; ?> style="float:right;">设置</a>
<a href="<?php echo $Config['WebsitePath']; ?>/notifications#notifications2"<?php echo $UrlPath=='notifications'?' class="buttons-active"':''; ?> style="float:right;"><span style="position: relative;">消息<?php echo $CurUserInfo['NewMessage']?'<span style="color:#FFFFFF;position: absolute;left: 100%;margin-left: 1px;top: -6px;font-size: 10px;line-height: 1.4;background-color: #ff3b30;padding: 1px 5px;border-radius: 50%;">'.$CurUserInfo['NewMessage'].'</span>':'';?></span></a>
<a href="<?php echo $Config['WebsitePath']; ?>/settings"<?php echo $UrlPath=='settings'?' class="buttons-active"':''; ?> style="float:right;"><span class="icon icon-action-settings"></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</a>
<a href="<?php echo $Config['WebsitePath']; ?>/notifications#notifications2"<?php echo $UrlPath=='notifications'?' class="buttons-active"':''; ?> style="float:right;"><span style="position: relative;"><span class="icon icon-action-newmessages"></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<?php echo $CurUserInfo['NewMessage']?'<span style="color:#FFFFFF;position: absolute;left: 60%;margin-left: 1px;top: -8px;font-size: 10px;line-height: 1.4;background-color: #ff3b30;padding: 1px 5px !important;border-radius: 50%;">'.$CurUserInfo['NewMessage'].'</span>':'';?></span></a>
<?php if($CurUserRole==5){?>
<a href="<?php echo $Config['WebsitePath']; ?>/dashboard"<?php echo $UrlPath=='dashboard'?' class="buttons-active"':''; ?> style="float:right;">系统设置</a>
<a href="<?php echo $Config['WebsitePath']; ?>/dashboard"<?php echo $UrlPath=='dashboard'?' class="buttons-active"':''; ?> style="float:right;"><span class="icon icon-action-dashboard"></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</a>
<?php }
} ?>
</div>
Expand Down
Binary file added styles/default/theme/img/material_design.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 2066cfa

Please sign in to comment.