Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Mucking with styles

  • Loading branch information...
commit ea24bc958b4819e757ef0faccae33c807badfd51 1 parent ff0fd0e
Neville Newey authored
View
6 abraxas/controllers/entry.py
@@ -24,7 +24,8 @@ def index(self, format='html', page=0, tag=None):
cols.url,
cols.tags,
cols.pubtime,
- cols.host
+ cols.host,
+ cols.feed_title
])
order_by = cols.pubtime.desc()
# todo, sort this pageination stuff out move to basecontroller
@@ -47,7 +48,8 @@ def tag(self, keyword, format='html', page=0):
cols.url,
cols.tags,
cols.pubtime,
- cols.host
+ cols.host,
+ cols.feed_title
], from_obj=j)
query = query.where(tag_table.c.lower==keyword.lower())
c.slicestart = 0
View
1  abraxas/public/static/960.css
@@ -0,0 +1 @@
+.container_12,.container_16{margin-left:auto;margin-right:auto;width:960px}.grid_1,.grid_2,.grid_3,.grid_4,.grid_5,.grid_6,.grid_7,.grid_8,.grid_9,.grid_10,.grid_11,.grid_12,.grid_13,.grid_14,.grid_15,.grid_16{display:inline;float:left;margin-left:10px;margin-right:10px}.container_12 .grid_3,.container_16 .grid_4{width:220px}.container_12 .grid_6,.container_16 .grid_8{width:460px}.container_12 .grid_9,.container_16 .grid_12{width:700px}.container_12 .grid_12,.container_16 .grid_16{width:940px}.alpha{margin-left:0}.omega{margin-right:0}.container_12 .grid_1{width:60px}.container_12 .grid_2{width:140px}.container_12 .grid_4{width:300px}.container_12 .grid_5{width:380px}.container_12 .grid_7{width:540px}.container_12 .grid_8{width:620px}.container_12 .grid_10{width:780px}.container_12 .grid_11{width:860px}.container_16 .grid_1{width:40px}.container_16 .grid_2{width:100px}.container_16 .grid_3{width:160px}.container_16 .grid_5{width:280px}.container_16 .grid_6{width:340px}.container_16 .grid_7{width:400px}.container_16 .grid_9{width:520px}.container_16 .grid_10{width:580px}.container_16 .grid_11{width:640px}.container_16 .grid_13{width:760px}.container_16 .grid_14{width:820px}.container_16 .grid_15{width:880px}.container_12 .prefix_3,.container_16 .prefix_4{padding-left:240px}.container_12 .prefix_6,.container_16 .prefix_8{padding-left:480px}.container_12 .prefix_9,.container_16 .prefix_12{padding-left:720px}.container_12 .prefix_1{padding-left:80px}.container_12 .prefix_2{padding-left:160px}.container_12 .prefix_4{padding-left:320px}.container_12 .prefix_5{padding-left:400px}.container_12 .prefix_7{padding-left:560px}.container_12 .prefix_8{padding-left:640px}.container_12 .prefix_10{padding-left:800px}.container_12 .prefix_11{padding-left:880px}.container_16 .prefix_1{padding-left:60px}.container_16 .prefix_2{padding-left:120px}.container_16 .prefix_3{padding-left:180px}.container_16 .prefix_5{padding-left:300px}.container_16 .prefix_6{padding-left:360px}.container_16 .prefix_7{padding-left:420px}.container_16 .prefix_9{padding-left:540px}.container_16 .prefix_10{padding-left:600px}.container_16 .prefix_11{padding-left:660px}.container_16 .prefix_13{padding-left:780px}.container_16 .prefix_14{padding-left:840px}.container_16 .prefix_15{padding-left:900px}.container_12 .suffix_3,.container_16 .suffix_4{padding-right:240px}.container_12 .suffix_6,.container_16 .suffix_8{padding-right:480px}.container_12 .suffix_9,.container_16 .suffix_12{padding-right:720px}.container_12 .suffix_1{padding-right:80px}.container_12 .suffix_2{padding-right:160px}.container_12 .suffix_4{padding-right:320px}.container_12 .suffix_5{padding-right:400px}.container_12 .suffix_7{padding-right:560px}.container_12 .suffix_8{padding-right:640px}.container_12 .suffix_10{padding-right:800px}.container_12 .suffix_11{padding-right:880px}.container_16 .suffix_1{padding-right:60px}.container_16 .suffix_2{padding-right:120px}.container_16 .suffix_3{padding-right:180px}.container_16 .suffix_5{padding-right:300px}.container_16 .suffix_6{padding-right:360px}.container_16 .suffix_7{padding-right:420px}.container_16 .suffix_9{padding-right:540px}.container_16 .suffix_10{padding-right:600px}.container_16 .suffix_11{padding-right:660px}.container_16 .suffix_13{padding-right:780px}.container_16 .suffix_14{padding-right:840px}.container_16 .suffix_15{padding-right:900px}.clear{clear:both;display:block;overflow:hidden;width:0;height:0}.clearfix:after{clear:both;content:'.';display:block;visibility:hidden;height:0}.clearfix{display:inline-block}* html .clearfix{height:1%}.clearfix{display:block}
View
BIN  abraxas/public/static/abraxas.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  abraxas/public/static/logo-abraxas.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
1  abraxas/public/static/reset.css
@@ -0,0 +1 @@
+html,body,div,span,applet,object,iframe,h1,h2,h3,h4,h5,h6,p,blockquote,pre,a,abbr,acronym,address,big,cite,code,del,dfn,em,font,img,ins,kbd,q,s,samp,small,strike,strong,sub,sup,tt,var,b,u,i,center,dl,dt,dd,ol,ul,li,fieldset,form,label,legend,table,caption,tbody,tfoot,thead,tr,th,td{margin:0;padding:0;border:0;outline:0;font-size:100%;vertical-align:baseline;background:transparent}body{line-height:1}ol,ul{list-style:none}blockquote,q{quotes:none}blockquote:before,blockquote:after,q:before,q:after{content:'';content:none}:focus{outline:0}ins{text-decoration:none}del{text-decoration:line-through}table{border-collapse:collapse;border-spacing:0}
View
81 abraxas/public/static/styles_960.css
@@ -0,0 +1,81 @@
+a.nav{text-decoration:none;font-size:100%;color:gray}
+a.view{font-size:240%;color:black}
+a.current_view{color:#009900}
+a.l{font-size:160%;color:#444444;text-decoration:none}
+a.l:hover{background:#444444;color:white;}
+a.by{text-decoration:none;color:#333}
+a.by:hover{text-decoration:underline}
+body{background:#ffffff}
+
+div#navbar ul{padding-left:0;margin-left:0;background-color: #4768b1;color: #fff;float: left;width: 100%;}
+div#navbar ul li{display:inline}
+div#navbar ul li a{padding: 0.2em 1em;color:white;text-decoration: none;float: left;border-right: 1px solid #fff;}
+div#navbar ul li a:hover,a.current_view { background-color: #016b02;color: #fff;}
+
+div#log1in{margin-left:auto;margin-right:auto;width:220px;margin-bottom:10px}
+
+
+div#user_actions{margin-bottom:10px}
+div#sidebar{background:padding-top:10px}
+div#footer{text-align:center;border-top:3px solid #bbbbbb;margin-top:20px;padding:10px;background:#dddddd}
+div#footer{border-bottom:3px solid #bbbbbb}
+div.vote_box{text-align:center;height:45px;background:#f1f1f1}
+div.sub{margin-bottom:10px;border-top:2px solid #aaaaaa}
+div.pg{text-align:right}
+div#profile h1 {font-size:100%;font-weight:normal}
+
+div#adverts{text-align:center;border:3px solid #dddddd;margin-bottom:10px;padding:0px;}
+div#adverts h1 {font-size:100%;background:#e9e9e9;color:black;margin:0px}
+
+div#sidebar div#user_actions ul{list-style: none;margin: 0;padding: 0;border: none;}
+div#sidebar div#user_actions li{border-bottom: 1px solid #ccc;margin-left: 0px;}
+div#sidebar div#user_actions li a{display: block;padding: 0px 0px 0px 0px;
+ background-color: #fff;color: #333;
+ text-decoration: none;width: 100%}
+div#sidebar div#user_actions li a:hover{background-color:#666;color:#fff}
+
+div#sidebar div#tags h1{background:#e9e9e9;margin:0px;font-size:100%;color:black}
+div#sidebar div#tags{padding: 0 0 0 0; margin-bottom: 1em;
+ color: gray;}
+div#sidebar div#tags ul{list-style: none;margin: 0;padding: 0;border: none;text-align:right}
+div#sidebar div#tags li{border-bottom: 1px solid #ccc;margin-left: 0px;}
+div#sidebar div#tags li a{display: block;padding: 0px 0px 0px 0px;
+ background-color: #fff;color: #333;
+ text-decoration: none;width: 100%}
+div#sidebar div#tags li a:hover{background-color:#666;color:#fff}
+
+form#banner_search{margin-top:20px;text-align:center}
+
+div#user_actions p#username{background:#e9e9e9;margin-bottom:0px;padding:2px;padding-top:3px}
+p.h{display:inline}
+p.h span.feed_title{color:#ff0000;background:#ffffff;font-size:120%}
+p.h span.pubtime{color: gray;font-size: 100%;}
+p.v_{display:inline;font-size:130%;font-family:Georgia;color:rgb(71,104,177)}
+p.v{display:inline;font-size:130%;font-family:Helvetica;font-weight:bold;color: #777777}
+p.l{display:inline;color:#808080;font-size:80%}
+div.sub a.l__{text-decoration:none;font-size:140%;}
+div.sub a.l__:hover{text-decoration:underline}
+div.sub a.c{color:black;font-size:80%;text-decoration:none}
+div.sub a.c:hover{text-decoration:underline}
+div.link_actions a{text-decoration:none;font-size:80%;color:gray;background: #f1f1f1;}
+
+table#profile td {padding-left:3px;font-weight:bold}
+table#profile td.r {text-align:right;font-weight:normal}
+
+div.sub div.tags{float:right;text-align:right}
+div.sub div.tags a{display:inline;background:#ffffaa;padding:3px;line-height:180%;text-decoration:none;color:#333}
+
+div.tags ul
+{
+padding-left: 0;
+margin-left: 0;
+background-color: #036;
+color: White;
+float: left;
+font-family: arial, helvetica, sans-serif;
+}
+
+div.sub div.tags ul li{display:inline}
+input:focus, textarea:focus{background-color: lightyellow; outline: 1px solid #4768b1;}
+span.error_message {color:red;font-weight:bold}
+
View
1  abraxas/public/static/text.css
@@ -0,0 +1 @@
+body{font:13px/1.5 Helvetica,Arial,'Liberation Sans',FreeSans,sans-serif}a:focus{outline:1px dotted invert}hr{border:0 #ccc solid;border-top-width:1px;clear:both;height:0}h1{font-size:25px}h2{font-size:23px}h3{font-size:21px}h4{font-size:19px}h5{font-size:17px}h6{font-size:15px}ol{list-style:decimal}ul{list-style:square}li{margin-left:30px}p,dl,hr,h1,h2,h3,h4,h5,h6,ol,ul,pre,table,address,fieldset{margin-bottom:20px}
View
4 data/african_feeds.csv
@@ -2,4 +2,6 @@ Techmasai,http://www.techmasai.com/,http://www.techmasai.com/feed/
"White African",http://whiteafrican.com/,http://feeds.feedburner.com/white_african
Afrigadget,http://afrigadget.com/,http://feeds.feedburner.com/afrigadget
Stii,http://stii.co.za,http://stii.co.za/feed/
-"Electronic Media Laboratory",http://www.ml.sun.ac.za/,http://www.ml.sun.ac.za/feed
+"Electronic Media Laboratory",http://www.ml.sun.ac.za/,http://www.ml.sun.ac.za/feed
+"Charl van Niekerk",http://blog.charlvn.com,http://blog.charlvn.com/feeds/posts/default
+"My Broadband",http://mybroadband.co.za,http://mybroadband.co.za/news/feed/index.1.rss
View
2  db_repository/versions/003_create_entries_table.py
@@ -12,6 +12,8 @@
Column('id', mysql.MSInteger(unsigned=True), autoincrement=True, primary_key=True, nullable=False),
Column('feed_id', VARCHAR(128), nullable=False),
Column('title', VARCHAR(512), nullable=False),
+ # The following field is denormalized from feed table...
+ Column('feed_title', VARCHAR(128), nullable=False),
Column('url', VARCHAR(256), nullable=False, unique=True, index=True),
Column('pubtime', DATETIME, index=True),
Column('tags', VARCHAR(512), nullable=True),
View
4 scripts/fetch_feeds.py
@@ -63,7 +63,6 @@ def fetch(feed):
# Now convert published to a datetime
published = datetime.datetime(*published[:6])
- raw_input("published=%s" % str(published))
summary = e.get('summary')
@@ -71,6 +70,7 @@ def fetch(feed):
entry = Entry()
entry.feed_id = feed.id
entry.title = title
+ entry.feed_title = feed.title
entry.url = url
entry.pubtime = published
entry.summary = summary
@@ -127,6 +127,6 @@ def fetch(feed):
#except:
# print 'Error updating feed %s' % f.title
# raise
- print "%s new entries added" % new
+ print "%s new entries added from %s" % (new, f.title)
print '----------------------------------'
Please sign in to comment.
Something went wrong with that request. Please try again.