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

merge fucking?

Browse Source
This commit is contained in:
Øyvind Bakkeli committed 2011-07-31 17:27:36 +02:00
2 parents ccfa08c84e 0d4662f3fb
commit d20276a6f9
6 files changed
+1956 -1889
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

front-page.php
+129 -129
View File
@@ -1,129 +1,129 @@
<?php <?php
get_header(); ?> get_header(); ?>
<style type="text/css"> <style type="text/css">
#container #container
{ {
background-color:transparent; background-color:transparent;
padding:0px; padding:0px;
} }
.content .content
{ {
margin-bottom:50px; margin-bottom:50px;
background-color:#12b259; background-color:#f1ede7;
background-color:rgba(18,178,89,0.8); background-color:rgba(18,178,89,0.8);
padding:10px; padding:10px;
} }
</style> </style>
<div id="container"> <div id="container">
<div id="content" role="main"> <div id="content" role="main">
<?php <?php
$items = wp_get_nav_menu_items('5'); $items = wp_get_nav_menu_items('3');
foreach($items as $item) foreach($items as $item)
{ {
wp_reset_postdata(); wp_reset_postdata();
$pre = ''; $pre = '';
switch($item->object) switch($item->object)
{ {
case 'page': case 'page':
$loop = 'page'; $loop = 'page';
$query = array('page_id'=>$item->object_id); $query = array('page_id'=>$item->object_id);
break; break;
case 'post': case 'post':
$loop = 'post'; $loop = 'post';
$query = array('p'=>$item->object_id); $query = array('p'=>$item->object_id);
break; break;
case 'category': case 'category':
$cat = get_category($item->object_id); $cat = get_category($item->object_id);
$pre = '<h1>' . $cat->name . '</h1>'; $pre = '<h1>' . $cat->name . '</h1>';
$loop = 'category'; $loop = 'category';
$query = array('cat'=>$item->object_id,'posts_per_page'=>5); $query = array('cat'=>$item->object_id,'posts_per_page'=>5);
if($wp->query_vars['paged']) if($wp->query_vars['paged'])
$query['paged'] = $wp->query_vars['paged']; $query['paged'] = $wp->query_vars['paged'];
break; break;
default: default:
$query = false; $query = false;
} }
if($query) if($query)
{ {
$id = strtolower(preg_replace('#[^\w]+#', '', $item->title)); $id = strtolower(preg_replace('#[^\w]+#', '', $item->title));
echo "<div class=\"content\" id=\"{$id}\">"; echo "<div class=\"content\" id=\"{$id}\">";
if($pre) echo $pre; if($pre) echo $pre;
query_posts($query); query_posts($query);
get_template_part( 'loop', $loop); get_template_part( 'loop', $loop);
echo '</div>'; echo '</div>';
} }
} }
?> ?>
<script type="text/javascript"> <script type="text/javascript">
$j(function() $j(function()
{ {
var $ = $j; var $ = $j;
$j("#right-menu a").click(function(e){ $j("#right-menu a").click(function(e){
if(this.href.match(/^<?php echo preg_quote(home_url(),'/') ?>\/#/)) if(this.href.match(/^<?php echo preg_quote(home_url(),'/') ?>\/#/))
{ {
e.preventDefault(); e.preventDefault();
id="#" + $(this).text().replace(/[^\w]/g, "").toLowerCase(); id="#" + $(this).text().replace(/[^\w]/g, "").toLowerCase();
items = $j(id); items = $j(id);
setLocationWithoutScrolling(this.href); setLocationWithoutScrolling(this.href);
var targetOffset = items.offset().top - 30; var targetOffset = items.offset().top - 30;
$j("html,body").animate({scrollTop:targetOffset}, 500); $j("html,body").animate({scrollTop:targetOffset}, 500);
} }
}); });
$(".content .navigation a").live('click', function(e) $(".content .navigation a").live('click', function(e)
{ {
e.preventDefault(); e.preventDefault();
p = this.parentNode; p = this.parentNode;
while(p != null && p.className != "content") while(p != null && p.className != "content")
p = p.parentNode; p = p.parentNode;
/* /*
durl = $("a[href^=\"<?php echo home_url()?>/category/\"]",p).attr('href'); durl = $("a[href^=\"<?php echo home_url()?>/category/\"]",p).attr('href');
durl += this.href.substr((window.location.origin + window.location.pathname).length); durl += this.href.substr((window.location.origin + window.location.pathname).length);
*/ */
/* /*
$.get(this.href, function(html){ $.get(this.href, function(html){
nev = '<div class="scroller" style="float:left;">' + $("#" + p.id, html).html() + '</div>'; nev = '<div class="scroller" style="float:left;">' + $("#" + p.id, html).html() + '</div>';
first = $('' + $(p).html() + '</div>') first = $('' + $(p).html() + '</div>')
$(p).html(first); $(p).html(first);
if(this.parentNode.className == 'nav-previous') if(this.parentNode.className == 'nav-previous')
first.css('position','absolute'); first.css('position','absolute');
first.animate({left:800},500); first.animate({left:800},500);
}); });
*/ */
$.get(this.href, function(html){ $.get(this.href, function(html){
$(p).html($("#" + p.id, html).html()); $(p).html($("#" + p.id, html).html());
}); });
}); });
}); });
</script> </script>
</div><!-- #content --> </div><!-- #content -->
</div><!-- #container --> </div><!-- #container -->
<?php get_sidebar(); ?> <?php get_sidebar(); ?>
<?php get_footer(); ?> <?php get_footer(); ?>
functions.php
+2 -2
View File
@@ -64,12 +64,12 @@ class Artist_Widget extends WP_Widget {
$studart->the_post(); $studart->the_post();
// event-lenka // event-lenka
$event = get_post_meta($post->ID, 'studio_artist_event', true) != ""; $event = get_post_meta($post->ID, 'studio_artist_event', true);
// ekstern lenke for artisten // ekstern lenke for artisten
if (get_post_meta($post->ID, 'studio_artist_link', true)) if (get_post_meta($post->ID, 'studio_artist_link', true))
$link = ' <a href="'.get_post_meta($post->ID, 'studio_artist_link', true).'">ekst</a>'; $link = ' <a href="'.get_post_meta($post->ID, 'studio_artist_link', true).'">ekst</a>';
else $link = ""; else $link = "";
echo '<p style="font-size:'.get_post_meta($post->ID, 'studio_artist_font', true).'px"><a href="' . $event . '">' . get_the_title() . '</a>'.$link.'</p>'; echo '<p class="'.get_post_meta($post->ID, 'studio_artist_font', true).'"><a href="' . $event . '">' . get_the_title() . '</a>'.$link.'</p>';
} }
} echo $args['after_widget']; } echo $args['after_widget'];
header.php
+1 -1
View File
@@ -64,7 +64,7 @@ function showUrlModal(href)
dialog.data.slideDown('fast'); dialog.data.slideDown('fast');
}); });
}); });
FB.XFBML.parse();
}, },
onClose: function (dialog) { onClose: function (dialog) {
setLocationWithoutScrolling(preModal); setLocationWithoutScrolling(preModal);
sidebar.php
+39 -36
View File
@@ -1,36 +1,39 @@
<?php <?php
/** /**
* The Sidebar containing the primary and secondary widget areas. * The Sidebar containing the primary and secondary widget areas.
* *
* @package WordPress * @package WordPress
* @subpackage Twenty_Ten * @subpackage Twenty_Ten
* @since Twenty Ten 1.0 * @since Twenty Ten 1.0
*/ */
?> ?>
<div id="left-column"> <div id="left-column">
<ul class="xoxo"> <ul class="xoxo">
<?php dynamic_sidebar( 'left-column' ) ?> <li id="right-menu">
</ul>
</div> <a href="<?php echo home_url( '/' ); ?>" title="<?php echo esc_attr( get_bloginfo( 'name', 'display' ) ); ?>" rel="home">
<img style="position:absolute;left:40px;top:-80px;border:0px; z-index:-1;" height="100" src="<?php echo get_bloginfo('stylesheet_directory') ?>/img/strutsen.png" alt="STUDiO11" />
<div id="right-column"> <?php //bloginfo( 'name' ); ?>
<ul class="xoxo"> <img style="float:none;border:0px;padding-top: 15px; padding-left:10px;" width="150" src="<?php echo get_bloginfo('stylesheet_directory') ?>/img/STUDiO_logo_gra.png" alt="STUDiO11" />
<li id="right-menu">
</a>
<a href="<?php echo home_url( '/' ); ?>" title="<?php echo esc_attr( get_bloginfo( 'name', 'display' ) ); ?>" rel="home">
<img style="position:absolute;left:40px;top:-80px;border:0px;" height="100" src="<?php echo get_bloginfo('stylesheet_directory') ?>/img/strutsen.png" alt="STUDiO11" /> <?php wp_nav_menu( array( 'container_class' => 'menu-sidebar', 'theme_location' => 'primary' ) ); ?>
<?php //bloginfo( 'name' ); ?>
<img style="float:none;border:0px;" width="150" src="<?php echo get_bloginfo('stylesheet_directory') ?>/img/STUDiO_logo_gra.png" alt="STUDiO11" /> </li>
</a>
<?php dynamic_sidebar( 'left-column' ) ?>
<?php wp_nav_menu( array( 'container_class' => 'menu-sidebar', 'theme_location' => 'primary' ) ); ?> </ul>
</div>
</li>
<?php dynamic_sidebar( 'right-column' ) ?> <div id="right-column">
</ul> <ul class="xoxo">
</div>
<div id="float_stopper"></div> <?php dynamic_sidebar( 'right-column' ) ?>
</ul>
</div>
<div id="float_stopper"></div>
studio.css
+427 -362
View File
@@ -1,362 +1,427 @@
h1 {
#left-primary text-transform: uppercase;
{ letter-spacing: 2px;
position:absolute; }
width:150px;
} .content {
padding: 40px;
#primary }
{
float:right; .meta-sep{
} display: none;
}
#primary .xoxo
{ .author {
position:fixed; display: none;
} }
#container .entry-utility {
{ display: none;
float:left; }
margin-left:150px !important;
width: 640px; #footer #first
min-height:700px; {
} width:100%;
#studiotwitter ul }
{
margin:0px !important; #sponsors
} {
text-align:center;
.artist-list }
{
margin:0px; #sponsors .sponsor
} {
.artist-list li display:inline;
{ margin:50px;
clear:left; }
list-style:none !important;
}
#left-primary
.artist-list li img {
{ position:absolute;
position:absolute; width:150px;
} }
.artist-list li a:hover #primary
{ {
background-color:rgba(200,200,200,0.5); float:right;
} }
.artist-list li a #primary .xoxo
{ {
display:block; position:fixed;
min-height:32px; }
width:100%;
margin:1px; #container
} {
float:left;
.artist-list .event_title margin-left:150px !important;
{ width: 680px;
margin-left:37px; min-height:700px;
} }
#wrapper #studiotwitter ul
{ {
padding-top:20px; margin:0px !important;
} }
body { .artist-list
/*color: #646567; */ {
/*webkit-transition-property: color, background; margin:0px;
-webkit-transition-duration: 1s, 1s; }
-webkit-transition-timing-function: linear, ease-in;*/ .artist-list li
background: fixed url('/oyvinbak/studio11/wp-content/themes/studio11/img/bakgrunn.png') no-repeat; {
width: auto; clear:left;
height: auto; list-style:none !important;
font-family:courier; }
}
#main .artist-list li img
{ {
width:1020px; position:absolute;
} }
#wrapper
{ .artist-list li a:hover
background-color:transparent; {
width:1020px; background-color:rgba(200,200,200,0.5);
margin-top:0px; }
padding-top:0px;
} .artist-list li a
/* {
.home #content display:block;
{ min-height:32px;
float:left; width:100%;
width:400px; margin:1px;
margin:0px; }
}*/
.artist-list .event_title
#front-feed {
{ margin-left:37px;
float:right; }
width:200px;
} #wrapper
{
#left-column padding-top:20px;
{ }
float:left;
width:200px; body {
position:absolute; /*color: #646567; */
} /*webkit-transition-property: color, background;
-webkit-transition-duration: 1s, 1s;
#left-column, #right-column -webkit-transition-timing-function: linear, ease-in;*/
{ background: fixed url('/oyvinbak/studio11/wp-content/themes/studio11/img/bakgrunn.png') no-repeat;
margin-top:60px; width: auto;
} height: auto;
font-family:Futura;
#left-column ul, #right-column ul }
{ #main
padding:0px; {
margin:0px; width:1080px;
} }
#wrapper
#left-column > ul > li, #right-column > ul > li {
{ background-color:transparent;
list-style:none !important; width:1080px;
margin:0px; margin-top:0px;
margin-bottom:20px; padding-top:0px;
} }
/*
#left-column .widget-container, #right-column .widget-container .home #content
{ {
padding:10px; float:left;
} width:400px;
margin:0px;
#left-column .widget_text }*/
{
padding:0px; #front-feed
/*margin:-10px; {
margin-bottom:60px;*/ float:right;
} width:200px;
}
#left-column li, #right-column li #left-column
{ {
list-style:none !important; float:left;
} width:200px;
position:absolute;
.widget_artist_widget }
{
background-color:#c32083; #left-column, #right-column
background-color:rgba(195, 32, 131,0.9); {
} margin-top:0px;
}
.home .entry-image
{ #left-column ul, #right-column ul
max-height:200px; {
overflow:hidden; padding:0px;
} margin:0px;
}
.home .therest .hentry
{ #left-column > ul > li, #right-column > ul > li
width:230px; {
float:left; list-style:none !important;
display:block; margin:0px;
} margin-bottom:20px;
}
.widget_artist_widget a
{ #left-column .widget-container, #right-column .widget-container
{
color:rgb(255,165,0) !important;
text-decoration:none; }
}
#left-column .widget_text
{
padding:0px;
#right-menu /*margin:-10px;
{ margin-bottom:60px;*/
position:fixed;
background-color:#fba61c; }
background-color:rgba(251,166,28,0.9);
padding:5px;
} #left-column li, #right-column li
{
.current-menu-item a list-style:none !important;
{ }
color:white; .widget_artist_widget
} {
background-color:#c32083;
#right-menu background-color:rgba(195, 32, 131,0.9);
{ }
text-align:center;
width:200px !important; .home .entry-image
} {
max-height:200px;
#right-menu div.menu overflow:hidden;
{ }
width:auto !important; .home .therest .hentry
} {
width:230px;
#right-menu div.menu li float:left;
{ display:block;
float:none !important; }
clear:both;
} .widget_artist_widget a
{
#right-menu a
{ color:rgb(255,165,0) !important;
color:gray; text-decoration:none;
font-weight:bolder; }
font-size:150%;
text-decoration:none;
} #right-menu
{
position:fixed;
background-color:#fba61c;
#fb-all background-color:rgba(251,166,28,0.9);
{ text-transform: uppercase;
padding:5px; line-height: 20px;
background-color:#bababa; }
}
.current-menu-item a
#right-column {
{ color:white;
float:left; }
width:200px;
margin-left:20px;
} .menu-item {
padding-left: 10px;
#container }
{
width: 550px; .x{
margin-left:220px !important; display: block;
background-color:#12b259; }
background-color:rgba(18,178,89,0.8);
padding:15px;
overflow:hidden; .menu-item:hover {
background-color: #333;
} color:rgba(251,166,28,0.9);
}
.twtr-widget h3,.twtr-widget h4
{
clear:none;
} #right-menu
{
#float_stopper text-align:left;
{ width:210px !important;
clear:left; }
}
#right-menu div.menu
.twtr-doc {
{
-moz-border-radius:0px !important; width:auto !important;
-webkit-border-radius:0px !important; }
border-radius:0px !important;
} #right-menu div.menu li
{
#main float:none !important;
{ clear:both;
margin-bottom:20px; }
padding-top:0px;
} #right-menu a
#access {
{ color:gray;
background-color:rgba(251,182,89,0.9); font-weight:bolder;
} font-size:150%;
.menu-header text-decoration:none;
{
display:none; }
}
.widget_artist_widget{
#access a padding: 5px;
{ }
color:black;
font-weight:bold;
} #fb-all
{
#header width: auto;
{ padding: 5px;
height:200px; background-color:#bababa;
margin:0px; }
padding:0px !important;
margin-left:220px; #right-column
} {
float:left;
#header img width:200px;
{ margin-left:10px;
border:0px; }
}
#container
{
#simplemodal-overlay width: 600px;
{ margin-left:220px !important;
background:black; background-color:#12b259;
opacity:0.7 !important; background-color:rgba(18,178,89,0.8);
} padding:15px;
overflow:hidden;
#simplemodal-container
{ }
width:600px;
height:auto !important; .twtr-widget h3,.twtr-widget h4
background-color:white; {
padding:20px; clear:none;
position:absolute !important; }
/*top:100px !important;*/
margin-top:100px; #float_stopper
margin-bottom:100px; {
overflow:visible; clear:left;
}
}
.twtr-doc
.simplemodal-wrap {
{ -moz-border-radius:0px !important;
overflow:visible !important; -webkit-border-radius:0px !important;
} border-radius:0px !important;
}
#simplemodal-container a.modalCloseImg {
background:url(/wp-content/themes/studio11/img/x.png) no-repeat; /* adjust url as required */ #main
width:25px; {
height:29px; margin-bottom:20px;
display:inline; padding-top:0px;
z-index:3200; }
position:absolute; #access
top:-15px; {
right:-18px; background-color:rgba(251,182,89,0.9);
cursor:pointer; }
} .menu-header
{
/* display:none;
@media (max-width: 940px){ }
.menu-header
{ #access a
display:block !important; {
} color:black;
font-weight:bold;
#left-column }
{
position:static; #header
float:none; {
width:100%; height:200px;
} margin:0px;
padding:0px !important;
margin-left:220px;
#right-column }
{
display:none; #header img
} {
border:0px;
#content, #container }
{
margin: auto !important;
#simplemodal-overlay
width:580px !important; {
} background:black;
opacity:0.7 !important;
#wrapper, #main }
{
width:580px !important; #simplemodal-container
margin: auto !important; {
} width:600px;
}*/ height:auto !important;
background-color:white;
padding:20px;
position:absolute !important;
/*top:100px !important;*/
margin-top:100px;
margin-bottom:100px;
overflow:visible;
}
.simplemodal-wrap
{
overflow:visible !important;
}
#simplemodal-container a.modalCloseImg {
background:url(/wp-content/themes/studio11/img/x.png) no-repeat; /* adjust url as required */
width:25px;
height:29px;
display:inline;
z-index:3200;
position:absolute;
top:-15px;
right:-18px;
cursor:pointer;
}
.category-nyhet {
line-height: 15px;
}
/*
@media (max-width: 940px){
.menu-header
{
display:block !important;
}
#left-column
{
position:static;
float:none;
width:100%;
}
#right-column
{
display:none;
}
#content, #container
{
margin: auto !important;
width:550px !important;
}
#wrapper, #main
{
width:580px !important;
margin: auto !important;
}
}*/
style.css
+1358 -1359
View File
File diff suppressed because it is too large. Load diff