From de1381ed1b00c4f592c28bc5aed1a7cfd71e6c4c Mon Sep 17 00:00:00 2001 From: Oliver Marks Date: Thu, 11 Jun 2015 22:09:06 +0100 Subject: [PATCH] adding rss feeds to the site, work in progress --- LICENSE | 0 site/__init__.py | 0 site/constants.py | 4 ++ site/generate.py | 77 ++++++++++++--------- site/index.py | 3 + site/static/template/default.css | 19 ++++- site/static/template/images/background.png | Bin 0 -> 6486 bytes site/static/template/images/example-01.jpg | Bin site/static/template/images/example-02.jpg | Bin site/static/template/images/example-03.jpg | Bin site/static/template/images/hackspace.png | Bin site/static/template/images/hackspace.svg | 0 site/static/template/images/icon.png | Bin site/static/template/images/tile-01.jpg | Bin site/static/template/images/tile-02.jpg | Bin site/widgets/__init__.py | 0 site/widgets/__init__.pyc | Bin site/widgets/banner_slider.py | 28 +++++--- site/widgets/banner_slider.pyc | Bin 2423 -> 2609 bytes site/widgets/footer-content.pyc | Bin site/widgets/footer.pyc | Bin site/widgets/footer_content.py | 0 site/widgets/footer_content.pyc | Bin site/widgets/google_group.pyc | Bin site/widgets/google_groups.py | 0 site/widgets/google_groups.pyc | Bin site/widgets/google_groups_signup.py | 4 +- site/widgets/google_groups_signup.pyc | Bin 1590 -> 1616 bytes site/widgets/google_hangout.py | 0 site/widgets/google_hangout.pyc | Bin site/widgets/header_strip.py | 0 site/widgets/header_strip.pyc | Bin site/widgets/headerstrip.pyc | Bin site/widgets/loginbox.py | 0 site/widgets/loginbox.pyc | Bin site/widgets/readme | 0 site/widgets/tiles.py | 4 +- site/widgets/tiles.pyc | Bin 1497 -> 1535 bytes site/widgets/twitter_feed.py | 9 +-- site/widgets/twitter_feed.pyc | Bin 1964 -> 1985 bytes 40 files changed, 95 insertions(+), 53 deletions(-) mode change 100755 => 100644 LICENSE mode change 100755 => 100644 site/__init__.py mode change 100755 => 100644 site/static/template/default.css create mode 100644 site/static/template/images/background.png mode change 100755 => 100644 site/static/template/images/example-01.jpg mode change 100755 => 100644 site/static/template/images/example-02.jpg mode change 100755 => 100644 site/static/template/images/example-03.jpg mode change 100755 => 100644 site/static/template/images/hackspace.png mode change 100755 => 100644 site/static/template/images/hackspace.svg mode change 100755 => 100644 site/static/template/images/icon.png mode change 100755 => 100644 site/static/template/images/tile-01.jpg mode change 100755 => 100644 site/static/template/images/tile-02.jpg mode change 100755 => 100644 site/widgets/__init__.py mode change 100755 => 100644 site/widgets/__init__.pyc mode change 100755 => 100644 site/widgets/banner_slider.py mode change 100755 => 100644 site/widgets/banner_slider.pyc mode change 100755 => 100644 site/widgets/footer-content.pyc mode change 100755 => 100644 site/widgets/footer.pyc mode change 100755 => 100644 site/widgets/footer_content.py mode change 100755 => 100644 site/widgets/footer_content.pyc mode change 100755 => 100644 site/widgets/google_group.pyc mode change 100755 => 100644 site/widgets/google_groups.py mode change 100755 => 100644 site/widgets/google_groups.pyc mode change 100755 => 100644 site/widgets/google_groups_signup.py mode change 100755 => 100644 site/widgets/google_groups_signup.pyc mode change 100755 => 100644 site/widgets/google_hangout.py mode change 100755 => 100644 site/widgets/google_hangout.pyc mode change 100755 => 100644 site/widgets/header_strip.py mode change 100755 => 100644 site/widgets/header_strip.pyc mode change 100755 => 100644 site/widgets/headerstrip.pyc mode change 100755 => 100644 site/widgets/loginbox.py mode change 100755 => 100644 site/widgets/loginbox.pyc mode change 100755 => 100644 site/widgets/readme mode change 100755 => 100644 site/widgets/tiles.py mode change 100755 => 100644 site/widgets/tiles.pyc diff --git a/LICENSE b/LICENSE old mode 100755 new mode 100644 diff --git a/site/__init__.py b/site/__init__.py old mode 100755 new mode 100644 diff --git a/site/constants.py b/site/constants.py index 878a36b..aeba828 100644 --- a/site/constants.py +++ b/site/constants.py @@ -11,3 +11,7 @@ banner_images = [ tile_images = [ ('/static/template/images/tile-01.jpg',), ('/static/template/images/tile-02.jpg',)] + +rss_feed = [ + ('/static/template/images/background.png', 'http://waistcoatforensicator.blogspot.com/feeds/posts/default?alt=rss'), # simon ridley +] diff --git a/site/generate.py b/site/generate.py index 669c030..7eb65d6 100644 --- a/site/generate.py +++ b/site/generate.py @@ -13,6 +13,8 @@ from scaffold.web import www import constants as site +from libs.rss_fetcher import feed_reader + web = html() web.load_widgets('widgets') web.template.create('Maidstone Hackspace', 'Hackspace for Maidstone, kent. for collaberation and discussion for artists, designers, makers, hackers, programmers, tinkerer, professionals and hobbyists.') @@ -27,7 +29,6 @@ image_path = domain + os.sep + 'template' + os.sep + 'images' + os.sep web.template.css_includes.append('/static/template/default.css') web.template.css_includes.append('/static/template/js/jquery-ui/themes/base/jquery-ui.css') #~ web.template.javascript_includes.append('/static/template/js/jquery-ui/themes/base/jquery-ui.css') -web.template.javascript_includes.append('') def todict(data): new_dict = {} @@ -38,27 +39,27 @@ def todict(data): def dict_to_list(data, keys): return [data.get(k) for k in keys] -class feed_reader: - def __init__(self, url): +#~ class feed_reader: + #~ def __init__(self, url): #~ self.feed = requests.get(url, stream=True) - fp = open('rss_example.xml', 'r') - self.feed = etree.parse(fp) - self.feed = self.feed.getroot() - - self.title = self.feed.xpath('./channel/title/text()')[-1] - self.link = self.feed.xpath('./channel/link/text()')[-1] - self.description = self.feed.xpath('./channel/description/text()')[-1] - - self.channel_image = self.feed.xpath('.//image/url/text()')[-1] - self.channel_image_title = self.feed.xpath('.//image/title/text()')[-1] - self.channel_image_link = self.feed.xpath('.//image/link/text()')[-1] - - def __iter__(self): - for item in self.feed.xpath('.//item'): - title = item.xpath('./title/text()') - link = item.xpath('./link/text()') - description = item.xpath('./description/text()') - yield title, link, description + #~ fp = open('rss_example.xml', 'r') + #~ self.feed = etree.parse(fp) + #~ self.feed = self.feed.getroot() +#~ + #~ self.title = self.feed.xpath('./channel/title/text()')[-1] + #~ self.link = self.feed.xpath('./channel/link/text()')[-1] + #~ self.description = self.feed.xpath('./channel/description/text()')[-1] +#~ + #~ self.channel_image = self.feed.xpath('.//image/url/text()')[-1] + #~ self.channel_image_title = self.feed.xpath('.//image/title/text()')[-1] + #~ self.channel_image_link = self.feed.xpath('.//image/link/text()')[-1] +#~ + #~ def __iter__(self): + #~ for item in self.feed.xpath('.//item'): + #~ title = item.xpath('./title/text()') + #~ link = item.xpath('./link/text()') + #~ description = item.xpath('./description/text()') + #~ yield title, link, description #~ class page: #~ def __enter__(self): @@ -72,6 +73,10 @@ def header(): web.menu * site.page_menu web.template.body.append(web.header_strip.create({}).render()) web.template.body.append(web.menu.render()) + web.template.javascript_includes.append('') + web.template.javascript_includes.append('') + web.template.javascript_includes.append('') + def footer(): web.footer_content.create().append( @@ -85,7 +90,7 @@ def examples(): """ page for testing new components""" header() web.page.create('examples') - web.twitter_feed.create('olymk2') + web.twitter_feed.create(username='MHackspace', widget_id='606798560374484992') web.page.section(web.twitter_feed.render()) web.page.append( @@ -95,13 +100,19 @@ def examples(): ) web.tiles.create() - feed = feed_reader('') + #~ feed = feed_reader('') + + feed_url = 'http://waistcoatforensicator.blogspot.com/feeds/posts/default?alt=rss' + + feed = feed_reader(feed_url) + for row in feed: + print row web.tiles.append( - title = feed.title, - link = feed.link, - image = feed.channel_image, - description = 'lorem ipsum lorem ipsum lorem ipsum lorem ipsum lorem ipsum lorem ipsum lorem ipsum lorem ipsum lorem ipsum lorem ipsum.') + title = '%s By %s' %(row.get('title'), row.get('author')), + link = row.get('link'), + image = row.get('image'), + description = row.get('description')) web.div.append(str(row)) web.page.append(web.tiles.render()) @@ -111,8 +122,8 @@ def examples(): def index(): header() - web.menu.create('/', 'leftNav') - web.menu * site.page_menu + #~ web.menu.create('/', 'leftNav') + #~ web.menu * site.page_menu web.template.body.append(web.header_strip.create({}).render()) web.template.body.append(web.menu.render()) @@ -157,6 +168,7 @@ def index(): web.div.create('').set_classes('panel') + web.twitter_feed.create(username='MHackspace', widget_id='606798560374484992') web.page.append(web.twitter_feed.render()) web.template.body.append(web.page.render()) @@ -168,5 +180,8 @@ if __name__ == "__main__": #~ args = parser.parse_args() #~ print(args.accumulate(args.integers)) - index() - examples() + with open('index.html', 'w') as fp: + fp.write(index()) + with open('examples.html', 'w') as fp: + fp.write(examples()) + diff --git a/site/index.py b/site/index.py index 6135e92..0db8d9f 100644 --- a/site/index.py +++ b/site/index.py @@ -19,3 +19,6 @@ def index(): if __name__ == '__main__': app.run(host='0.0.0.0', port=5000, debug=True) + + +#http://waistcoatforensicator.blogspot.com/feeds/posts/default?alt=rss diff --git a/site/static/template/default.css b/site/static/template/default.css old mode 100755 new mode 100644 index 3090976..1dc261d --- a/site/static/template/default.css +++ b/site/static/template/default.css @@ -75,12 +75,25 @@ button {margin-bottom:20px;background-color: #fff; height: 48px; width:100%; bor .banner-slide .left{text-align:left;padding:6px;font-size:48px;color:#fff;position:absolute;top:122px;left:0px;width:60px;height:60px;background-color: transparent;} .banner-slide .right{text-align:right;padding:6px;font-size:48px;color:#fff;position:absolute;top:122px;right:0px;width:60px;height:60px;background-color: transparent;} +/*slider animation*/ +.slide {position:absolute;left:0px;} + +.slide.ng-hide-add {left:0px;opacity:1;} +.slide.ng-hide-add-active {transition:0.9s linear all;opacity:0;} + +.slide.ng-hide-remove {left:0px;opacity:0;} +.slide.ng-hide-remove-active {transition:0.9s linear all;opacity:1;} + +} + .bullet-list li {margin:10px;} -.tile {background-color:#eee;width:300px;height:350px;margin:10px;float:left;box-shadow: 0px 2px 5px 0px rgba(0, 0, 0, 0.26);} -.tile img{width:300px;height:200px;} +.tile {position:relative;background-color:#eee;width:460px;height:640px;margin-left:20px;margin-bottom:20px;float:left;box-shadow: 0px 2px 5px 0px rgba(0, 0, 0, 0.26);} +.tile-img {width:100%;height:200px;overflow:hidden;background-repeat: no-repeat;background-position: center;background-image:url('/static/template/images/background.png');} +.tile-content {position:absolute;bottom:20px;top:220px;overflow:scroll;left:20px;right:20px;text-align:justify;line-height:150%;font-size:12px;} +.tile img {display:block;margin:auto;width:300px;height:200px;} #footertop {background-color:#00232D;height:48px;} #footerbottom {background-color:#0087A8;height:300px;} #footerbottom div.container {margin:auto;background-color:#0087A8;height:250px;width:960px;} -.twitter-feed {width:460px;margin:10px;} +.twitter-feed {width:460px;margin:20px;} diff --git a/site/static/template/images/background.png b/site/static/template/images/background.png new file mode 100644 index 0000000000000000000000000000000000000000..cc84c1cd66bae3cd25ce9b6cc58414135f6a55e0 GIT binary patch literal 6486 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 C|6Dcz literal 0 HcmV?d00001 diff --git a/site/static/template/images/example-01.jpg b/site/static/template/images/example-01.jpg old mode 100755 new mode 100644 diff --git a/site/static/template/images/example-02.jpg b/site/static/template/images/example-02.jpg old mode 100755 new mode 100644 diff --git a/site/static/template/images/example-03.jpg b/site/static/template/images/example-03.jpg old mode 100755 new mode 100644 diff --git a/site/static/template/images/hackspace.png b/site/static/template/images/hackspace.png old mode 100755 new mode 100644 diff --git a/site/static/template/images/hackspace.svg b/site/static/template/images/hackspace.svg old mode 100755 new mode 100644 diff --git a/site/static/template/images/icon.png b/site/static/template/images/icon.png old mode 100755 new mode 100644 diff --git a/site/static/template/images/tile-01.jpg b/site/static/template/images/tile-01.jpg old mode 100755 new mode 100644 diff --git a/site/static/template/images/tile-02.jpg b/site/static/template/images/tile-02.jpg old mode 100755 new mode 100644 diff --git a/site/widgets/__init__.py b/site/widgets/__init__.py old mode 100755 new mode 100644 diff --git a/site/widgets/__init__.pyc b/site/widgets/__init__.pyc old mode 100755 new mode 100644 diff --git a/site/widgets/banner_slider.py b/site/widgets/banner_slider.py old mode 100755 new mode 100644 index 501ff51..19d8e9d --- a/site/widgets/banner_slider.py +++ b/site/widgets/banner_slider.py @@ -1,3 +1,4 @@ +import os from scaffold.web import www class control(www.default.html_ui): @@ -10,9 +11,12 @@ class control(www.default.html_ui): height=300 width=400 - def javascript(self): - js=("",) - return "\n".join(js) + with open(os.path.abspath('./widgets/banner_slider.js')) as fp: + script = [fp.read()] + + #~ def javascript(self): + #~ return fp.read() + #~ self.script.append() def create(self): self.reset() @@ -27,14 +31,16 @@ class control(www.default.html_ui): self.content.append(htm) def render(self): + #~ self.script.append(self.javascript()) self.count+=1 - htm='
' return htm diff --git a/site/widgets/banner_slider.pyc b/site/widgets/banner_slider.pyc old mode 100755 new mode 100644 index 76606dd14c6b28a28a22bf84d316dbe1f21e6917..db92f7d8235550f5bace3fb41730430feac3cddf GIT binary patch delta 1049 zcmaJ<%}*0S6o0dAx3rW`0TCowHkg!zwigp)Y#Wu68c1AX#ClqGrgY1)U3Z2rv2vhy z0(;bWGx6d9{{jC54<`N}#)CKYy#XX%+}U~aK7VgMem_S~$3*JKK>p*~-6tNLe<@t= z;*?bs9DfD@K;uj|AYia*K*IpWQy>gzr=XpNCIg;^9>5{MvqpxBR*D$}@PFgCe7tJs z$+}OtN5{R}&qW?YKeP+b9sr(!Lq`A61T+Rg3_^Q|fYuo_hT$nU;qfZZ5_)3egBpXjS1}c-3Vxj<+!=WJgntC&lMO%^AjUo~9BB@R)>80P#M}?^WXcB*F;eCJw&ew`lr?+J4MP!^WZ-jQTj6>MTh;8% zy?arlO|KKGxDx~-uGu;%Ui|B^>vEXjwgOA4y+G9L8`8GwKKelZqDbIh^f_;EfE{8H z30IxNS$=5g7*=Aeh1;mvv%Xy1ienL~724N>kc-{ooKMTVPLr+9PR;&bR=w(4tynZ` z_Wr)cF9&|O(Vgz%2CM$&x+P=pGKNOCo7_oXyLpkVd=-dpx4ITvmHLH~3+csvr2I~Z zp$cAOy;^bW$)s7D+Nbl<#o{Tv!1p$4b`*>4;=G+KndOm7Zzy&Zd0(23O7!%K_~~`F zLZzR&CH(c4D$*-DS`3mlgyJOIotec|j-mi#h?#7Jndv+`8^!VDU3TGs&>T$^VvjD= zxSeKG3gys)>5e--S1nD=4suJ;PC8QCk&6K;cGslVDb|d1EEX=;aAz0c5c@QN9U`PN q0?Ajh2t>*z3XkN*r~nvI*eR4!9UpRsu|`PBEhj|vKG*!Tl=l=2e* delta 748 zcmY*X&2AGh5T5aFHrd^zY1$?#RY4FDv`GEofLc{55u%(p6v-7TMB)&|n|7nLO=~xW zDiMeF1tK3gb3#J!1ikPOyaD3Ci33NNF}+~#%+8F*-;6)|%iQmom)@^Z^zD4_MF*~j zNB_qp`T;3LA3`7C0HK9|NgY_g_>IG5()%kCV V&=0*ZSM;}&ob82I0blO4_zPoJcMbpm diff --git a/site/widgets/footer-content.pyc b/site/widgets/footer-content.pyc old mode 100755 new mode 100644 diff --git a/site/widgets/footer.pyc b/site/widgets/footer.pyc old mode 100755 new mode 100644 diff --git a/site/widgets/footer_content.py b/site/widgets/footer_content.py old mode 100755 new mode 100644 diff --git a/site/widgets/footer_content.pyc b/site/widgets/footer_content.pyc old mode 100755 new mode 100644 diff --git a/site/widgets/google_group.pyc b/site/widgets/google_group.pyc old mode 100755 new mode 100644 diff --git a/site/widgets/google_groups.py b/site/widgets/google_groups.py old mode 100755 new mode 100644 diff --git a/site/widgets/google_groups.pyc b/site/widgets/google_groups.pyc old mode 100755 new mode 100644 diff --git a/site/widgets/google_groups_signup.py b/site/widgets/google_groups_signup.py old mode 100755 new mode 100644 index dc43197..677582f --- a/site/widgets/google_groups_signup.py +++ b/site/widgets/google_groups_signup.py @@ -8,10 +8,10 @@ class control(www.default.html_ui): def render(self): htm = '