edb/studio11-theme
Archived
9
0 Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:neuf/studio11-theme

Browse Source
This commit is contained in:
sjurher committed 2011-07-31 17:36:58 +02:00
2 parents 4d6755b8c2 16b930af77
commit b8e32b4b2a
2 files changed
+8 -7
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

header.php
+5 -5
View File
@@ -55,9 +55,7 @@ function showUrlModal(href)
$j.get(href, function(html)
{
var top = $j(window).scrollTop() + "px !important";
var tmp = $j(html);
$j.modal(tmp.find("#content"),
$j.modal($j("#content", html).html(),
{
onOpen: function (dialog) {
dialog.overlay.fadeIn('fast', function () {
@@ -66,6 +64,8 @@ function showUrlModal(href)
dialog.data.slideDown('fast');
});
});
FB.XFBML.parse();
},
onClose: function (dialog) {
setLocationWithoutScrolling(preModal);
@@ -168,11 +168,11 @@ $j(".content .post [href],#header [href]").live('click',function(e)
<img style="position:absolute;left:150px;bottom:0px;" width="50" src="<?php echo get_bloginfo('stylesheet_directory') ?>/img/Ugla.png" alt="STUDiO11" />
<img style="position:absolute;left:0px;bottom:0px;" width="75" src="<?php echo get_bloginfo('stylesheet_directory') ?>/img/Kua.png" alt="STUDiO11" />
<div id="countdown" style="font-size: 0.5em; position:absolute;top:10px;left:250px;color:#808184;"> Studentfestivalen i Oslo - Bare <?php echo ceil((strtotime('2011-08-15') - time()) / 60 / 60 / 24) ?> dager igjen!</div>
<div id="countdown" style="position:absolute;top:10px;left:400px;color:#C32083;">Bare <?php echo ceil((strtotime('2011-08-15') - time()) / 60 / 60 / 24) ?> dager igjen!</div>
<img style="position:absolute;left:460px;bottom:-5px;"http://nintendo.neuf.no/oyvinbak/studio11/wp-content/themes/studio11/img/bjornenmskilt.png src="<?php echo get_bloginfo('stylesheet_directory') ?>/img/bjornenmskilt.png" alt="STUDiO11" usemap="#blifrivillig" />
<map name="blifrivillig">
<area shape="poly" coords="1,144,15,46,50,50,41,66,49,87,61,51,29,39,49,0,111,20,97,64,67,55,52,99,62,124,53,149,31,149," href="http://edb.neuf.no/frivillig/" alt="Bli frivillig!" title="Bli frivillig!" />
<area shape="poly" coords="1,144,15,46,50,50,41,66,49,87,61,51,29,39,49,0,111,20,97,64,67,55,52,99,62,124,53,149,31,149," href="/bli-med" alt="Bli frivillig!" title="Bli frivillig!" />
</map>
<img style="position:absolute;left:550px;bottom:0px;" width="40" src="<?php echo get_bloginfo('stylesheet_directory') ?>/img/Grisen.png" alt="STUDiO11" />
loop-single.php
+3 -2
View File
@@ -52,11 +52,12 @@
<?php endif; ?>
<div class="entry-utility">
<?php twentyten_posted_in(); ?>
<?php //twentyten_posted_in(); ?>
<?php edit_post_link( __( 'Edit', 'twentyten' ), '<span class="edit-link">', '</span>' ); ?>
</div><!-- .entry-utility -->
<fb:comments href="<?php the_permalink() ?>" num_posts="2" width="500"></fb:comments>
<div id="fb-root"></div><script src="http://connect.facebook.net/en_US/all.js#xfbml=1"></script><fb:comments href="<?php the_permalink() ?>" num_posts="2" width="500"></fb:comments>
</div><!-- #post-## -->
<?php /* <div id="nav-below" class="navigation">