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