79 content/news/live.html
View file
@@ -1,4 +1,5 @@
---
<<<<<<< HEAD
layout: master
title: Live news
---
@@ -13,5 +14,83 @@
<!-- UK Scouting twitter feed -->
<div class="tweet_block">
{% twitter_feed UKScouting %}
=======
layout: default
title: Live news
---
<p><a href="{{ site.basedomain }}/news/categories">Categories</a> | <a href="{{ site.basedomain }}/news/">News</a></p>

<script src="http://widgets.twimg.com/j/2/widget.js"></script>
<div class="tweet_block">
<script>
new TWTR.Widget({
version: 2,
type: 'profile',
rpp: 10,
interval: 6000,
width: 250,
height: 300,
theme: {
shell: {
background: '#4d2177',
color: '#ffffff'
},
tweets: {
background: '#4d2177',
color: '#ffffff',
links: '#83a40b'
}
},
features: {
scrollbar: true,
loop: true,
live: true,
hashtags: true,
timestamp: true,
avatars: true,
behavior: 'all'
}
})
.render()
.setUser('7tha_rochdale')
.start();
</script>
</div>

<div class="tweet_block">
<script>
new TWTR.Widget({
version: 2,
type: 'profile',
rpp: 10,
interval: 6000,
width: 250,
height: 300,
theme: {
shell: {
background: '#4d2177',
color: '#ffffff'
},
tweets: {
background: '#4d2177',
color: '#ffffff',
links: '#83a40b'
}
},
features: {
scrollbar: true,
loop: true,
live: true,
hashtags: true,
timestamp: true,
avatars: true,
behavior: 'all'
}
})
.render()
.setUser('UKScouting')
.start();
</script>
>>>>>>> 8af8dd6c0e4b055d3db04a502c105134b5b4f32b
</div>
<div class="blocker"></div>
4 content/print/uniform_cub.html
View file
@@ -2,4 +2,8 @@
layout: print
title: Cub uniform
---
<<<<<<< HEAD
<img src="{{ site.basedomain }}/assests/uniforms/cub.png" alt="Cub sweatshirt" />
=======
<img src="{{ site.basedomain }}/assests/uniforms/cub.png" alt="Beaver sweatshirt" />
>>>>>>> 8af8dd6c0e4b055d3db04a502c105134b5b4f32b
4 content/print/uniform_explorer.html
View file
@@ -2,4 +2,8 @@
layout: print
title: Explorer uniform
---
<<<<<<< HEAD
<img src="{{ site.basedomain }}/assests/uniforms/explorer.png" alt="Explorer shirt" />
=======
<img src="{{ site.basedomain }}/assests/uniforms/explorer.png" alt="Beaver sweatshirt" />
>>>>>>> 8af8dd6c0e4b055d3db04a502c105134b5b4f32b
4 content/print/uniform_scout.html
View file
@@ -2,4 +2,8 @@
layout: print
title: Scout uniform
---
<<<<<<< HEAD
<img src="{{ site.basedomain }}/assests/uniforms/scout.png" alt="Scout shirt" />
=======
<img src="{{ site.basedomain }}/assests/uniforms/scout.png" alt="Beaver sweatshirt" />
>>>>>>> 8af8dd6c0e4b055d3db04a502c105134b5b4f32b
11 doshit.py
View file
@@ -1,4 +1,8 @@
<<<<<<< HEAD
#!/usr/bin/env python
=======
#!/usr/bin/env python2.7
>>>>>>> 8af8dd6c0e4b055d3db04a502c105134b5b4f32b
import os
from Cheetah.Template import Template
from distutils import dir_util
@@ -156,10 +160,17 @@ def build_gallery():
albums[album_dir]["images"] = {}
albums[album_dir]["sub_albums"] = []

<<<<<<< HEAD
albums[album_dir]["name"] = album_name.strip()
albums[album_dir]["path"] = album_dir
albums[album_dir]["url"] = '{{ site.basedomain }}/gallery/%s' % album_dir
albums[album_dir]["parent"] = parent_album_name.strip()
=======
albums[album_dir]["name"] = album_name
albums[album_dir]["path"] = album_dir
albums[album_dir]["url"] = '{{ site.basedomain }}/gallery/%s' % album_dir
albums[album_dir]["parent"] = parent_album_name
>>>>>>> 8af8dd6c0e4b055d3db04a502c105134b5b4f32b
albums[album_dir]["parent_url"] = '{{ site.basedomain }}/gallery/%s' % parent_album_dir

for f in files:
12 templates/album.tpl
View file
@@ -1,5 +1,9 @@
---
<<<<<<< HEAD
layout: master
=======
layout: default
>>>>>>> 8af8dd6c0e4b055d3db04a502c105134b5b4f32b
title: "Gallery - #if $album['name'] != '' then $album['name'] else 'home' #"
---

@@ -17,7 +21,11 @@ title: "Gallery - #if $album['name'] != '' then $album['name'] else 'home' #"
<p>$album['images'][$image]['desc']</p>
</td>

<<<<<<< HEAD
#if $i == 4:
=======
#if $i == 6:
>>>>>>> 8af8dd6c0e4b055d3db04a502c105134b5b4f32b
</tr><tr>
#end if
#set $i += 1
@@ -69,7 +77,11 @@ title: "Gallery - #if $album['name'] != '' then $album['name'] else 'home' #"
#end if

<div id="comments">
<<<<<<< HEAD
{% fb_like %}
=======
<script type="text/javascript">fb_like('{{ site.basedomain }}{{ page.url }}');</script>
>>>>>>> 8af8dd6c0e4b055d3db04a502c105134b5b4f32b
<div id="disqus_thread"></div>
<script type="text/javascript">
var disqus_shortname = '7tharochdale';
8 templates/image.tpl
View file
@@ -1,5 +1,9 @@
---
<<<<<<< HEAD
layout: master
=======
layout: default
>>>>>>> 8af8dd6c0e4b055d3db04a502c105134b5b4f32b
title: "Gallery - #if $albums[$image['album']]['name'] != '' then $albums[$image['album']]['name'] else '' #
#if $image['desc'] and $image['desc'] != '' then ' - ' + $image['desc'] else '' #
---
@@ -12,7 +16,11 @@ title: "Gallery - #if $albums[$image['album']]['name'] != '' then $albums[$image
</div>

<div id="comments">
<<<<<<< HEAD
{% fb_like %}
=======
<script type="text/javascript">fb_like('{{ site.basedomain }}{{ page.url }}');</script>
>>>>>>> 8af8dd6c0e4b055d3db04a502c105134b5b4f32b
<div id="disqus_thread"></div>
<script type="text/javascript">
var disqus_shortname = '7tharochdale';