Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

add kill ie6

  • Loading branch information...
commit 5a823eda29364fd3ad9ac0083f4a27c0c939bf96 1 parent 15c0fa8
@whtsky whtsky authored
View
8 assets/css/pbb.scss
@@ -9,6 +9,10 @@ body{
background-color: #EEE;
}
+#main .container{
+ padding-top: 60px;
+}
+
.box {
background-color: white;
@include border-radius(3px);
@@ -77,6 +81,10 @@ body{
width: $avatar;
height: $avatar;
}
+
+ #members-list &{
+ margin-bottom: $avatar_margin_left;
+ }
}
View
4 assets/css/responsive.scss
@@ -1,8 +1,8 @@
@import "bootstrap-responsive";
-@media (min-width: 980px) {
+@media (max-width: 980px) {
#main .container{
- padding-top: 60px;
+ padding-top: 0px;
}
}
View
10 handlers/node.py
@@ -187,6 +187,15 @@ class NodeSidebar(tornado.web.UIModule):
def render(self, node):
return self.render_string("node/modules/sidebar.html", node=node)
+
+class FeedHandler(BaseHandler):
+ def get(self, node_name):
+ node = self.get_node(node_name)
+ topics = self.db.topics.find({'node': node['name']},
+ sort=[('modified', -1)])
+ self.render('feed.xml', topics=topics)
+
+
handlers = [
(r'/node', NodeListHandler),
(r'/node/add', AddHandler),
@@ -196,6 +205,7 @@ def render(self, node):
(r'/node/([%A-Za-z0-9.]+)/remove', RemoveHandler),
(r'/node/([%A-Za-z0-9.]+)/favorite', FavoriteHandler),
(r'/node/([%A-Za-z0-9.]+)/unfavorite', UnfavoriteHandler),
+ (r'/node/([%A-Za-z0-9.]+)/feed', FeedHandler),
]
ui_modules = {
View
2  static/css/style.css
1 addition, 1 deletion not shown
View
9 templates/base.html
@@ -7,7 +7,7 @@
<link rel="stylesheet" href="{{ static_url('css/style.css') }}" type="text/css" />
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<link rel="canonical" href="{{ handler.settings['forum_url'] }}{% block canonical %}{% end %}" />
- <link rel="alternate" type="application/atom+xml" href="/feed" />
+ <link rel="alternate" type="application/atom+xml" href="{% block feed %}/feed{% end %}" />
{% block head %}{% end %}
</head>
<body>
@@ -193,5 +193,12 @@
})();
{% end %}
</script>
+<!--[if IE 6]>
+ {% if handler.locale.code == 'zh_CN' %}
+ <script src="//letskillie6.googlecode.com/svn/trunk/2/zh_CN.js"></script>
+ {% else %}
+ <script src="//letskillie6.googlecode.com/svn/trunk/2/default.js"></script>
+ {% end %}
+<![endif]-->
</body>
</html>
View
2  templates/member/list.html
@@ -5,7 +5,7 @@
{% block canonical %}member?p={{p}}{% end %}
{% block content %}
-<div class="box">
+<div class="box" id="members-list">
<header>{{ _("Members") }}</header>
{% for member in members %}
{% raw handler.get_avatar(member) %}
View
1  templates/node/node.html
@@ -2,6 +2,7 @@
{% block description %}{{ node['name'] }},{{ node['title'] }}{% end %}
{% block canonical %}node/{{ node['name'] }}{% end %}
+{% block feed %}/node/{{ node['name'] }}/feed{% end %}
{% block title %}{{ node['title'] }} | {% end %}
View
2  templates/topic/move.html
@@ -17,7 +17,7 @@
<div class="control-group">
<label class="control-label">{{ _("From") }}</label>
<div class="controls">
- <input type="text" class="input-xlarge disabled" value="{{ topic['node'] }}" disabled>
+ <input type="text" class="input-xlarge disabled" value="{{ handler.get_node(topic['node'])['title'] }}" disabled>
</div>
</div>
<div class="control-group">
Please sign in to comment.
Something went wrong with that request. Please try again.