diff --git a/wp-content/themes/neuf-old-style/css/border-radius.htc b/wp-content/themes/neuf-old-style/css/border-radius.htc deleted file mode 100644 index c3ae104..0000000 --- a/wp-content/themes/neuf-old-style/css/border-radius.htc +++ /dev/null @@ -1,143 +0,0 @@ ---Do not remove this if you are using-- -Original Author: Remiz Rahnas -Original Author URL: http://www.htmlremix.com -Published date: 2008/09/24 - -Changes by Nick Fetchak: -- IE8 standards mode compatibility -- VML elements now positioned behind original box rather than inside of it - should be less prone to breakage -Published date : 2009/11/18 - - - - - diff --git a/wp-content/themes/neuf-old-style/css/grid.css b/wp-content/themes/neuf-old-style/css/grid.css deleted file mode 100755 index 85bed76..0000000 --- a/wp-content/themes/neuf-old-style/css/grid.css +++ /dev/null @@ -1,388 +0,0 @@ -/* - Variable Grid System. - Learn more ~ http://www.spry-soft.com/grids/ - Based on 960 Grid System - http://960.gs/ - - Licensed under GPL and MIT. - - Looking for a preview of the grid? Check out http://grids.heroku.com/grid?column_width=70&column_amount=12&gutter_width=30 -*/ - -/* - Forces backgrounds to span full width, - even if there is horizontal scrolling. - Increase this if your layout is wider. - - Note: IE6 works fine without this fix. -*/ - -body { - min-width: 1200px; -} - -/* Containers -----------------------------------------------------------------------------------------------------*/ -.container_12 { - margin-left: auto; - margin-right: auto; - width: 1200px; -} - -/* Grid >> Global -----------------------------------------------------------------------------------------------------*/ - -.column, -.sidebar .event, -.grid_1, -.grid_2, -.grid_3, -.grid_4, -.grid_5, -.grid_6, -.grid_7, -.grid_8, -.grid_9, -.grid_10, -.grid_11, -.grid_12 { - display:inline; - float: left; - position: relative; - margin-left: 15px; - margin-right: 15px; -} - - - -.push_1, .pull_1, -.push_2, .pull_2, -.push_3, .pull_3, -.push_4, .pull_4, -.push_5, .pull_5, -.push_6, .pull_6, -.push_7, .pull_7, -.push_8, .pull_8, -.push_9, .pull_9, -.push_10, .pull_10, -.push_11, .pull_11, -.push_12, .pull_12 { - position:relative; -} - - -/* Grid >> Children (Alpha ~ First, Omega ~ Last) -----------------------------------------------------------------------------------------------------*/ - -.alpha { - margin-left: 0; -} - -.omega { - margin-right: 0; -} - -/* Grid >> 12 Columns -----------------------------------------------------------------------------------------------------*/ - - -.container_12 .grid_1 { - width:70px; -} - -.container_12 .grid_2 { - width:170px; -} - -.sidebar .event, -.container_12 .grid_3 { - width:270px; -} - -.container_12 .grid_4 { - width:370px; -} - -.container_12 .grid_5 { - width:470px; -} - -.column, -.container_12 .grid_6 { - width:570px; -} - -.container_12 .grid_7 { - width:670px; -} - -.container_12 .grid_8 { - width:770px; -} - -.container_12 .grid_9 { - width:870px; -} - -.container_12 .grid_10 { - width:970px; -} - -.container_12 .grid_11 { - width:1070px; -} - -.container_12 .grid_12 { - width:1170px; -} - - - - -/* Prefix Extra Space >> 12 Columns -----------------------------------------------------------------------------------------------------*/ - - -.container_12 .prefix_1 { - padding-left:100px; -} - -.container_12 .prefix_2 { - padding-left:200px; -} - -.container_12 .prefix_3 { - padding-left:300px; -} - -.container_12 .prefix_4 { - padding-left:400px; -} - -.container_12 .prefix_5 { - padding-left:500px; -} - -.container_12 .prefix_6 { - padding-left:600px; -} - -.container_12 .prefix_7 { - padding-left:700px; -} - -.container_12 .prefix_8 { - padding-left:800px; -} - -.container_12 .prefix_9 { - padding-left:900px; -} - -.container_12 .prefix_10 { - padding-left:1000px; -} - -.container_12 .prefix_11 { - padding-left:1100px; -} - - - -/* Suffix Extra Space >> 12 Columns -----------------------------------------------------------------------------------------------------*/ - - -.container_12 .suffix_1 { - padding-right:100px; -} - -.container_12 .suffix_2 { - padding-right:200px; -} - -.container_12 .suffix_3 { - padding-right:300px; -} - -.container_12 .suffix_4 { - padding-right:400px; -} - -.container_12 .suffix_5 { - padding-right:500px; -} - -.container_12 .suffix_6 { - padding-right:600px; -} - -.container_12 .suffix_7 { - padding-right:700px; -} - -.container_12 .suffix_8 { - padding-right:800px; -} - -.container_12 .suffix_9 { - padding-right:900px; -} - -.container_12 .suffix_10 { - padding-right:1000px; -} - -.container_12 .suffix_11 { - padding-right:1100px; -} - - - -/* Push Space >> 12 Columns -----------------------------------------------------------------------------------------------------*/ - - -.container_12 .push_1 { - left:100px; -} - -.container_12 .push_2 { - left:200px; -} - -.container_12 .push_3 { - left:300px; -} - -.container_12 .push_4 { - left:400px; -} - -.container_12 .push_5 { - left:500px; -} - -.container_12 .push_6 { - left:600px; -} - -.container_12 .push_7 { - left:700px; -} - -.container_12 .push_8 { - left:800px; -} - -.container_12 .push_9 { - left:900px; -} - -.container_12 .push_10 { - left:1000px; -} - -.container_12 .push_11 { - left:1100px; -} - - - -/* Pull Space >> 12 Columns -----------------------------------------------------------------------------------------------------*/ - - -.container_12 .pull_1 { - left:-100px; -} - -.container_12 .pull_2 { - left:-200px; -} - -.container_12 .pull_3 { - left:-300px; -} - -.container_12 .pull_4 { - left:-400px; -} - -.container_12 .pull_5 { - left:-500px; -} - -.container_12 .pull_6 { - left:-600px; -} - -.container_12 .pull_7 { - left:-700px; -} - -.container_12 .pull_8 { - left:-800px; -} - -.container_12 .pull_9 { - left:-900px; -} - -.container_12 .pull_10 { - left:-1000px; -} - -.container_12 .pull_11 { - left:-1100px; -} - - - - -/* `Clear Floated Elements -----------------------------------------------------------------------------------------------------*/ - -/* http://sonspring.com/journal/clearing-floats */ - -.clear { - clear: both; - display: block; - overflow: hidden; - visibility: hidden; - width: 0; - height: 0; -} - -/* http://www.yuiblog.com/blog/2010/09/27/clearfix-reloaded-overflowhidden-demystified */ - -.hentry:before, -.hentry:after, -#program-3days:before, -#program-3days:after, -#program-6days:before, -#program-6days:after, -.clearfix:before, -.clearfix:after { - content: '\0020'; - display: block; - overflow: hidden; - visibility: hidden; - width: 0; - height: 0; -} - -.hentry:after, -#program-3days:after, -#program-6days:after, -.clearfix:after { - clear: both; -} - -/* - The following zoom:1 rule is specifically for IE6 + IE7. - Move to separate stylesheet if invalid CSS is a problem. -*/ - -.clearfix { - zoom: 1; -} \ No newline at end of file diff --git a/wp-content/themes/neuf-old-style/css/ie.css b/wp-content/themes/neuf-old-style/css/ie.css deleted file mode 100644 index 152e0c8..0000000 --- a/wp-content/themes/neuf-old-style/css/ie.css +++ /dev/null @@ -1,13 +0,0 @@ -/* Border radius hack: - TODO: does not work -*/ -.single-event .event-type:before, -#featured article .event-type:before, -#featured article.type-post h1:before, -#featured #slidernav a span.circle, -.home #digest_news .post a.permalink:before, -.big_bullet, -.btn { - behavior: url(css/border-radius.htc); -} - diff --git a/wp-content/themes/neuf-old-style/css/lightbox.css b/wp-content/themes/neuf-old-style/css/lightbox.css deleted file mode 100755 index fb0f1f5..0000000 --- a/wp-content/themes/neuf-old-style/css/lightbox.css +++ /dev/null @@ -1,111 +0,0 @@ -#lightbox{ position: absolute; left: 0; width: 100%; z-index: 100; text-align: center; line-height: 0;} -#lightbox img{ width: auto; height: auto;} -#lightbox a img{ border: none; } - -#outerImageContainer{ position: relative; background-color: #000; width: 250px; height: 250px; margin: 0 auto; } -#imageContainer{ padding: 10px; } - -#loading{ position: absolute; top: 40%; left: 0%; height: 25%; width: 100%; text-align: center; line-height: 0; } -#hoverNav{ position: absolute; top: 0; left: 0; height: 100%; width: 100%; z-index: 10; } -#imageContainer>#hoverNav{ left: 0;} -#hoverNav a{ outline: none;} - -#prevLink, #nextLink{ width: 49%; height: 100%; background-image: url(data:image/gif;base64,AAAA); /* Trick IE into showing hover */ display: block; } -#prevLink { left: 0; float: left;} -#nextLink { right: 0; float: right;} -#prevLink:hover, #prevLink:visited:hover { background: url(../images/prevlabel.gif) left 15% no-repeat; } -#nextLink:hover, #nextLink:visited:hover { background: url(../images/nextlabel.gif) right 15% no-repeat; } - -#imageDataContainer{ font: 10px Verdana, Helvetica, sans-serif; background-color: #000; margin: 0 auto; line-height: 1.4em; overflow: auto; width: 100% ; } - -#imageData{ padding:0 10px; color: #666; } -#imageData #imageDetails{ width: 70%; float: left; text-align: left; } -#imageData #caption{ font-weight: bold; } -#imageData #numberDisplay{ display: block; clear: left; padding-bottom: 1.0em; } -#imageData #bottomNavClose{ width: 66px; float: right; padding-bottom: 0.7em; outline: none;} - -#overlay{ position: absolute; top: 0; left: 0; z-index: 90; width: 100%; height: 500px; background-color: #000; } - -/* Dark Theme starts here */ -/* -#stimuli_lightbox { - position: absolute; - left: 0; - width: 100%; - z-index: 100; - text-align: center; - line-height: 0; -} - -#stimuli_lightbox a img { border: none; } - -#stimuli_outerImageContainer { - position: relative; - background-color: #000; - width: 250px; - height: 250px; - margin: 0 auto; -} - -#stimuli_imageContainer { - padding: 10px; -} - -#stimuli_loading { - position: absolute; - top: 40%; - left: 0%; - height: 25%; - width: 100%; - text-align: center; - line-height: 0; - background: transparent center url(img/loading.gif) no-repeat; -} -#stimuli_hoverNav { - position: absolute; - top: 0; - left: 0; - height: 100%; - width: 100%; - z-index: 10; -} -#stimuli_imageContainer>#stimuli_hoverNav { left: 0;} -#stimuli_hoverNav a { outline: none;} - -#stimuli_prevLink, #stimuli_nextLink { - width: 49%; - height: 100%; - background: transparent url(img/blank.gif) no-repeat; /* Trick IE into showing hover * / - display: block; -} -#stimuli_prevLink { left: 0; float: left;} -#stimuli_nextLink { right: 0; float: right;} -#stimuli_prevLink:hover, #stimuli_prevLink:visited:hover { background: url(img/prev.gif) left 55% no-repeat; } -#stimuli_nextLink:hover, #stimuli_nextLink:visited:hover { background: url(img/next.gif) right 55% no-repeat; } - - -#stimuli_imageDataContainer { - font: 10px Verdana, Helvetica, sans-serif; - background-color: #000; - margin: 0 auto; - line-height: 1.4em; - overflow: auto; - width: 100% -} - -#stimuli_imageData { padding:0 10px; color: #666; } -#stimuli_imageData #stimuli_imageDetails { width: 70%; float: left; text-align: left; } -#stimuli_imageData #stimuli_caption { font-weight: bold;} -#stimuli_imageData #stimuli_numberDisplay { display: block; clear: left; padding-bottom: 1.0em;} -#stimuli_imageData #stimuli_bottomNavClose { width: 66px; float: right; padding-bottom: 0.7em; background: url(img/closelabel.gif) right 55% no-repeat; padding-top: 1.0em; margin-bottom: 1.0em;} - -#stimuli_overlay { - position: absolute; - top: 0; - left: 0; - z-index: 90; - width: 100%; - height: 500px; - background-color: #000; -} -*/ diff --git a/wp-content/themes/neuf-old-style/css/rebuild.css b/wp-content/themes/neuf-old-style/css/rebuild.css deleted file mode 100755 index 08a16fe..0000000 --- a/wp-content/themes/neuf-old-style/css/rebuild.css +++ /dev/null @@ -1,137 +0,0 @@ -/* -------------------------------------------------------------- - - Rebuild the default browser styles - - Based on work by Blueprint CSS - http://code.google.com/p/blueprintcss/ - --------------------------------------------------------------- */ - - -body { - background: #fff; -} -body, input, textarea { - color: #111; - font: 12px Arial,sans-serif; - line-height: 1.5; -} - - -/* Headings --------------------------------------------------------------- */ - -h1,h2,h3,h4,h5,h6 { - font-weight: normal; - clear: both; -} -hr { - background-color: #999; - border:0; - height: 1px; - margin-bottom: 1.5em; -} - - -/* Text elements --------------------------------------------------------------- */ - -p { - margin-bottom: 1.5em; -} -ul { - margin: 0 0 1.5em 2.5em; -} -ol { - margin: 0 0 1.5em 2.5em; -} -ul { - list-style:disc; -} -ol { - list-style-type: decimal; -} -ol ol { - list-style:upper-alpha; -} -ol ol ol { - list-style:lower-roman; -} -ol ol ol ol { - list-style:lower-alpha; -} -ul ul, ol ol, ul ol, ol ul { - margin-bottom:0; -} -dl { - margin:0 1.5em; -} -dt { - font-weight: bold; -} -dd { - margin-bottom: 1.5em; -} -strong { - font-weight: bold; -} -cite, em, i { - font-style: italic; -} -blockquote { - margin: 0 3em; -} -blockquote em, blockquote i, blockquote cite { - font-style: normal; -} -pre { - font: 11px Monaco, monospace; - line-height: 1.5; - margin-bottom: 1.5em; -} -code { - font: 11px Monaco, monospace; -} -abbr, acronym { - border-bottom: 1px dotted #666; - cursor: help; -} -ins { - text-decoration: none; -} -sup, -sub { - height: 0; - line-height: 1; - vertical-align: baseline; - position: relative; - -} -sup { - bottom: 1ex; -} -sub { - top: .5ex; -} - - -/* - -Adapt the following for use in your Child Themes when using -different font-sizes and line-heights - -body, input, textarea { - font: --px Arial,sans-serif; - line-height:--; -} -p, ul, ol, dd, pre { - margin-bottom:--em; -} -pre, code { - font:--px Monaco, monospace; - line-height:--; -} - -All other styles can be overridden--or ignored!--in Child Theme stylesheets - -*/ \ No newline at end of file diff --git a/wp-content/themes/neuf-old-style/css/reset.css b/wp-content/themes/neuf-old-style/css/reset.css deleted file mode 100755 index cbcd60f..0000000 --- a/wp-content/themes/neuf-old-style/css/reset.css +++ /dev/null @@ -1,63 +0,0 @@ -/* -------------------------------------------------------------- - - Reset default browser CSS. - - Based on work by Eric Meyer: - http://meyerweb.com/eric/tools/css/reset/index.html - --------------------------------------------------------------- */ - -/* v1.0 | 20080212 */ - -html, body, div, span, applet, object, iframe, -h1, h2, h3, h4, h5, h6, p, blockquote, pre, -a, abbr, acronym, address, big, cite, code, -del, dfn, em, font, img, ins, kbd, q, s, samp, -small, strike, strong, sub, sup, tt, var, -b, u, i, center, -dl, dt, dd, ol, ul, li, -fieldset, form, label, legend, -table, caption, tbody, tfoot, thead, tr, th, td { - margin: 0; - padding: 0; - border: 0; - outline: 0; - font-size: 100%; - vertical-align: baseline; - background: transparent; -} -body { - line-height: 1; -} -ol, ul { - list-style: none; -} -blockquote, q { - quotes: none; -} -blockquote:before, blockquote:after, -q:before, q:after { - content: ''; - content: none; -} - -/* remember to define focus styles! */ -:focus { - outline: 0; -} - -/* remember to highlight inserts somehow! */ -ins { - text-decoration: none; -} -del { - text-decoration: line-through; -} - -/* tables still need 'cellspacing="0"' in the markup */ -table { - border-collapse: collapse; - border-spacing: 0; -} - -a img { border: none; } diff --git a/wp-content/themes/neuf-old-style/css/wp.css b/wp-content/themes/neuf-old-style/css/wp.css deleted file mode 100755 index 5593971..0000000 --- a/wp-content/themes/neuf-old-style/css/wp.css +++ /dev/null @@ -1,74 +0,0 @@ -/* -------------------------------------------------------------- - - Basic WordPress Blog Styles - --------------------------------------------------------------- */ - - -/* Images --------------------------------------------------------------- */ - -.entry-content img { - margin: 0 0 1.5em 0; -} -.alignleft, -img.alignleft { - display: inline; - float: left; - margin-right: 1.5em; -} -.alignright, -img.alignright { - display: inline; - float: right; - margin-left: 1.5em; -} -.aligncenter, -img.aligncenter { - clear: both; - display: block; - margin-left: auto !important; - margin-right: auto !important; -} -.wp-caption { - text-align: center; - margin-bottom: 1.5em; -} -.wp-caption img { - border: 0 none; - margin: 0; - padding: 0; -} -.wp-caption p.wp-caption-text { - margin: 0; -} -.wp-smiley { - max-height: 1em; - margin:0 !important; -} -.gallery dl { - margin: 0; -} -.gallery-caption { - margin:0; - font-size:0.8em; -} - - -/* Pullquotes --------------------------------------------------------------- */ - -blockquote.left { - float: left; - margin-left: 0; - margin-right: 20px; - text-align: right; - width: 33%; -} -blockquote.right { - float: right; - margin-left: 20px; - margin-right: 0; - text-align: left; - width: 33%; -} diff --git a/wp-content/themes/neuf-old-style/digest.php b/wp-content/themes/neuf-old-style/digest.php index 1acb8f0..f2c63b3 100755 --- a/wp-content/themes/neuf-old-style/digest.php +++ b/wp-content/themes/neuf-old-style/digest.php @@ -1,62 +1,26 @@ -
+
-

Aktuelt

+

Aktuelt

-
have_posts() ) : while ( $digest_news->have_posts() ) : $digest_news->the_post(); ?> - +
">
> - -
-
-
+ +
+ +
-
-
-
- -
-

Program

- - '_neuf_events_starttime', - 'value' => date( 'U' , strtotime( '-8 hours' ) ), - 'compare' => '>', - 'type' => 'numeric' - ); - - $args = array( - 'post_type' => 'event', - 'meta_query' => array( $meta_query ), - 'posts_per_page' => 10, - 'orderby' => 'meta_value_num', - 'meta_key' => '_neuf_events_starttime', - 'order' => 'ASC' - ); - - $digest_events = new WP_Query( $args ); - if ( $digest_events->have_posts() ) : while ( $digest_events->have_posts() ) : $digest_events->the_post(); - ?> - - - - -
> -
-
- diff --git a/wp-content/themes/neuf-old-style/eventmeta-single.php b/wp-content/themes/neuf-old-style/eventmeta-single.php index 8933cf2..0853a6a 100755 --- a/wp-content/themes/neuf-old-style/eventmeta-single.php +++ b/wp-content/themes/neuf-old-style/eventmeta-single.php @@ -7,22 +7,16 @@ if ( 'Annet' != $post->neuf_event_venue ) {

-
-
- -
-
- - - - - CC: - - Kjøp billett' : ""; ?> -
-
- neuf_event_venue; ?> -
-
+ +
+ + + - + CC: + + Kjøp billett' : ""; ?> +
+ neuf_event_venue; ?> diff --git a/wp-content/themes/neuf-old-style/footer.php b/wp-content/themes/neuf-old-style/footer.php index c0ef8e1..3acfe06 100755 --- a/wp-content/themes/neuf-old-style/footer.php +++ b/wp-content/themes/neuf-old-style/footer.php @@ -4,43 +4,23 @@
-

Det Norske Studentersamfund

+

Konsertforeningen Betong

- Studentene i Oslo har sitt naturlige tilholdssted på Det Norske Studentersamfund, i hyggelige lokaler på Chateau Neuf øverst på Majorstuen. Her er det åpent alle dager unntatt søndag, og enten man ønsker en tur i baren, på kafé, på debatt, på konsert, teater eller kino, har man muligheten på Det Norske Studentersamfund. + Konsertforeningen Betong er ansvarlige for konsertdriften på Det Norske Studentersamfund i Oslo, også kjent som Chateau Neuf. Vi disponerer konsertscenene Betong og Klubbscenen, to av byens største og beste av sitt slag. Tidligere har blant annet White Stripes, Ramones, Pearl Jam, Frank Zappa, Xzibit og Sigur Rós gjestet Det Norske Studentersamfund.

- Kart | Kontakt -
-
+
-

Bilder fra flickr

+

Bilder fra flickr

    -
    -
    - -
    - Universitetet i Oslo eier Chateau Neuf -
    - -
    - Norsk Rockforbund sponser Studentersamfundet -
    - -
    - Akademika sponser Studentersamfundet -
    - -
    -
    -
    Det Norske Studentersamfund | Slemdalsveien 15, 0369 Oslo | Webdesign av EDB-gjengen og Designerne i KAK. diff --git a/wp-content/themes/neuf-old-style/front-page.php b/wp-content/themes/neuf-old-style/front-page.php index 4d045cc..09be157 100755 --- a/wp-content/themes/neuf-old-style/front-page.php +++ b/wp-content/themes/neuf-old-style/front-page.php @@ -13,9 +13,7 @@ get_header(); - - - +
    diff --git a/wp-content/themes/neuf-old-style/functions.php b/wp-content/themes/neuf-old-style/functions.php index fb37631..c166ea9 100644 --- a/wp-content/themes/neuf-old-style/functions.php +++ b/wp-content/themes/neuf-old-style/functions.php @@ -7,12 +7,9 @@ $content_width = 770; add_image_size( 'two-column-thumb' , 170 , 69 , true ); add_image_size( 'four-column-thumb' , 370 , 150 , true ); -add_image_size( 'four-column-promo' , 370 , 322 , true ); add_image_size( 'six-column-promo' , 570 , 322 , true ); add_image_size( 'six-column-slim' , 570 , 161 , true ); add_image_size( 'association-thumb' , 270 , 250, false ); -add_image_size( 'extra-large' , 1600 , 1600 , false); -add_image_size( 'newsletter-wide' , 620, 80, false); /** * Register navigation menus. @@ -34,14 +31,12 @@ function neuf_enqueue_scripts() { wp_register_script( 'jquery' , 'http://ajax.googleapis.com/ajax/libs/jquery/1.6/jquery.min.js' ); wp_register_script( 'program' , get_template_directory_uri() . '/js/program.js', array( 'jquery' ) ); wp_register_script( 'cycle' , get_template_directory_uri() . '/js/jquery.cycle.all.js', array( 'jquery' ), '0.9.8' ); - wp_register_script( 'front-page', get_template_directory_uri() . '/js/front-page.js', array('cycle','moment-lang') ); + wp_register_script( 'front-page', get_template_directory_uri() . '/js/front-page.js', array('cycle') ); wp_register_script( 'application', get_template_directory_uri() . '/js/application.js', array('jquery') ); wp_register_script( 'underscore', get_template_directory_uri() . '/js/underscore.js'); wp_register_script( 'knockout', get_template_directory_uri() . '/js/knockout-2.0.0.js'); wp_register_script( 'util', get_template_directory_uri() . '/js/neuf/util/util.js' ); wp_register_script( 'date.js', get_template_directory_uri() . '/js/neuf/util/date-nb-NO.js'); - wp_register_script( 'moment', get_template_directory_uri() . '/js/moment.min.js'); - wp_register_script( 'moment-lang', get_template_directory_uri() . '/js/lang/nb.js', array('moment')); wp_register_script( 'eventProgram', get_template_directory_uri() . '/js/neuf/eventProgram.js', array('jquery', 'underscore', 'knockout', 'date.js', 'util') ); wp_register_script( 'footer', get_template_directory_uri() . '/js/footer.js', array('jquery') ); @@ -60,18 +55,19 @@ add_action( 'wp_enqueue_scripts' , 'neuf_enqueue_scripts' ); * Denies uploads of images smaller (in pixels) than given width and height values. */ function neuf_handle_upload_prefilter( $file ) { - - $minimum = array( 'width' => 640, 'height' => 480); + $width = 640; + $height = 480; $img = getimagesize( $file['tmp_name'] ); + $minimum = array( 'width' => $width , 'height' => $height ); $width = $img[0]; - $height = $img[1]; + $height =$img[1]; if ( $width < $minimum['width'] ) return array( "error" => "Image dimensions are too small. Minimum width is {$minimum['width']}px. Uploaded image width is $width px" ); elseif ($height < $minimum['height']) - return array( "error" => "Image dimensions are too small. Minimum height is {$minimum['height']}px. Uploaded image height is $height px" ); + return array( "error" => "Image dimensions are too small. Minimum height is {$minimum['height']}px. Uploaded image width is $width px" ); else return $file; } @@ -289,7 +285,7 @@ function neuf_get_attachment_count() { */ function neuf_maybe_display_gallery() { if ( 2 < neuf_get_attachment_count() ) - echo do_shortcode( '[gallery link="file" size="four-column-promo"]' ); + echo do_shortcode( '[gallery]' ); } function neuf_event_format_date($timestamp) { diff --git a/wp-content/themes/neuf-old-style/header.php b/wp-content/themes/neuf-old-style/header.php index 048ba4d..b28e3e4 100755 --- a/wp-content/themes/neuf-old-style/header.php +++ b/wp-content/themes/neuf-old-style/header.php @@ -21,20 +21,22 @@ >
    - + +
    Det Norske Studentersamfund
    Gå direkte til innholdet
    -
    - +
    + +
    diff --git a/wp-content/themes/neuf-old-style/img/bird_twitter.png b/wp-content/themes/neuf-old-style/img/bird_twitter.png index fa238b4..2137a17 100644 Binary files a/wp-content/themes/neuf-old-style/img/bird_twitter.png and b/wp-content/themes/neuf-old-style/img/bird_twitter.png differ diff --git a/wp-content/themes/neuf-old-style/img/facebook.png b/wp-content/themes/neuf-old-style/img/facebook.png new file mode 100644 index 0000000..a9573db Binary files /dev/null and b/wp-content/themes/neuf-old-style/img/facebook.png differ diff --git a/wp-content/themes/neuf-old-style/img/twitter.png b/wp-content/themes/neuf-old-style/img/twitter.png new file mode 100644 index 0000000..82de313 Binary files /dev/null and b/wp-content/themes/neuf-old-style/img/twitter.png differ diff --git a/wp-content/themes/neuf-old-style/js/application.js b/wp-content/themes/neuf-old-style/js/application.js index d8076a7..94c817f 100644 --- a/wp-content/themes/neuf-old-style/js/application.js +++ b/wp-content/themes/neuf-old-style/js/application.js @@ -19,7 +19,7 @@ $(document).ready( function() { * $url = "http://api.flickr.com/services/feeds/groups_pool.gne?format=json&id=" . $groupid; * $url = "http://api.flickr.com/services/feeds/groups_pool.gne?id=1292860@N21&lang=en-us&format=json"; */ - var flickr_feed_url = 'http://api.flickr.com/services/feeds/groups_pool.gne?format=json&id=1292860@N21&jsoncallback=?'; + var flickr_feed_url = 'http://api.flickr.com/services/feeds/photos_public.gne?id=48351899@N07&tags=betong&format=json&jsoncallback=?'; $.getJSON(flickr_feed_url, function(result) { var html = ""; diff --git a/wp-content/themes/neuf-old-style/js/front-page.js b/wp-content/themes/neuf-old-style/js/front-page.js index fd98d63..5b4c4cf 100755 --- a/wp-content/themes/neuf-old-style/js/front-page.js +++ b/wp-content/themes/neuf-old-style/js/front-page.js @@ -10,14 +10,9 @@ function addTwitter() { jQuery.each(results, function(i) { if (count-- > 0) { var id = results[i].id_str; - var time = results[i].created_at.slice(4) /* without weekday */ - /* relative tweet time */ - moment.lang('en'); // parse english month name - var when = moment(time, "MMM DD HH:mm:ss Z YYYY"); - moment.lang('nb'); // format in norwegian locale - var rel_when = when.fromNow(); + /* relative tweet time */ /* Format tweet */ - jQuery('#twitter_feed').append('

    ' + results[i].text + '
    ' + rel_when +' • svar • retweet

    '); + jQuery('#twitter_feed').append('

    ' + results[i].text + '
    * • svar • retweet

    '); } }); diff --git a/wp-content/themes/neuf-old-style/js/neuf/eventProgram.js b/wp-content/themes/neuf-old-style/js/neuf/eventProgram.js index 1e77718..18a05c7 100644 --- a/wp-content/themes/neuf-old-style/js/neuf/eventProgram.js +++ b/wp-content/themes/neuf-old-style/js/neuf/eventProgram.js @@ -63,9 +63,6 @@ $(document).ready(function () { }); programModel.eventTypes.push(eventType); }); - - - ko.applyBindings(programModel); $('#load-spinner').hide(); $('#content').fadeIn(); } @@ -75,28 +72,18 @@ $(document).ready(function () { this.title = rawEvent.title; this.author = rawEvent.author; this.content = rawEvent.content; - this.url = rawEvent.url; + this.uri = rawEvent.uri; this.startTime = new Date(parseInt(rawEvent.custom_fields._neuf_events_starttime[0]) * 1000); this.time = this.startTime.toString("HH:mm"); this.endTime = new Date(parseInt(rawEvent.custom_fields._neuf_events_endtime[0]) * 1000); this.venue = rawEvent.custom_fields._neuf_events_venue[0]; this.thumbnailURI = rawEvent.attachments.length > 0 ? rawEvent.attachments[0].images["two-column-thumb"].url : undefined; this.eventType = rawEvent.event; - - this.visible = ko.computed(function () { - var checkedEvents = programModel.checkedEvents(); - - if (checkedEvents.length === 0) { - return true; - } - - return _.contains(checkedEvents, this.eventType); - }, this); } var Week = function(id, days) { this.id = id; - this.days = days; + this.days = days } var Day = function (id, dateAsHeader, events, programModel) { @@ -105,60 +92,33 @@ $(document).ready(function () { this.events = ko.observableArray(events); this.programModel = programModel; - this.hasNoDisplayableEvents = ko.computed(function () { - var checkedEvents = this.programModel.checkedEvents(); + var that = this; + this.filteredEvents = ko.computed(function () { + var checkedEvents = that.programModel.checkedEvents(); if (checkedEvents.length == 0) { - return this.events().length == 0; + return that.events(); } - - var filtered = ko.utils.arrayFilter(this.events(), function (event) { + + return ko.utils.arrayFilter(that.events(), function (event) { return _.contains(checkedEvents, event.eventType); }); - - return filtered.length == 0; }, this); + + this.hideElement = function(elem) { + if (elem.nodeType === 1) $(elem).slideUp(function() { $(elem).remove(); }) + } } var EventType = function(name) { this.name = name; this.checked = ko.observable(false); - this.icon = imagePath(name); - this.id = "event_type_" + name; - this.shouldDisplayAsChecked = ko.computed(function () { - if (programModel.checkedEvents().length === 0) { - return true; - } - - return this.checked(); - }, this); - } - - function imagePath(eventTypeName) { - var imageDir = "../wp/wp-content/themes/neuf-old-style/img/"; - var imageMap = { - "default": imageDir+'tilesvisning.png', - "debatt": imageDir+'ikon_debatt-50x50.png', - "fest": imageDir+'ikon_fest-50x50.png', - "film": imageDir+'ikon_film-50x50.png', - "foredrag": imageDir+'ikon_foredrag-50x50.png', - "konsert": imageDir+'ikon_konsert-50x50.png', - "quiz": imageDir+'ikon_quiz-50x50.png', - "teater": imageDir+'ikon_teater-50x50.png' - } - - if (_.has(imageMap, eventTypeName.toLowerCase())) { - return imageMap[eventTypeName.toLowerCase()]; - } - - return imageMap["default"]; } //Fill view model with empty days that will be filled as events are fetched from the server var programModel = {}; var days = {}; - //Next five weeks var nextWeeks = ko.observableArray(); @@ -166,17 +126,11 @@ $(document).ready(function () { programModel.events = ko.observableArray(); programModel.checkedEvents = ko.observableArray(); - programModel.eventTypes = eventTypes; - if (Date.today().is().sunday()) { - startDate = Date.today().add(1).day(); - } - else { - startDate = Date.today(); - } for (var i = 0; i < 5; i = i + 1) { - var week = new Date(startDate).add(i).weeks(); + var week = Date.today().add(i).weeks(); + //Make sure the week Date object is set to the monday of the current week if (!week.is().monday()) { week = week.previous().monday(); } @@ -184,11 +138,11 @@ $(document).ready(function () { var weekDays = ko.observableArray(); for (var j = 0; j < 6; j = j + 1) { //Ignore sundays var thisDay; - if (new Date(startDate).is().monday()) { - thisDay = new Date(startDate).add(i).weeks().add(j).days(); + if (Date.today().is().monday()) { + thisDay = Date.today().add(i).weeks().add(j).days(); } else { - thisDay = new Date(startDate).previous().monday().add(i).weeks().add(j).days() + thisDay = Date.today().previous().monday().add(i).weeks().add(j).days() } var dayId = dateToId(thisDay); var day = new Day(dayId, neuf.util.capitalize(thisDay.toString("dddd d/M")), [], programModel); @@ -200,18 +154,24 @@ $(document).ready(function () { } programModel.weeks = nextWeeks; + programModel.eventTypes = eventTypes; programModel.days = days; - ko.bindingHandlers.fadeElement = { - init: function(element, valueAccessor) { + ko.bindingHandlers.fadeVisible = { + init: function (element, valueAccessor) { + // Initially set the element to be instantly visible/hidden depending on the value + console.log("init"); var value = valueAccessor(); - $(element).toggle(ko.utils.unwrapObservable(value)); + $(element).toggle(ko.utils.unwrapObservable(value)); // Use "unwrapObservable" so we can handle values that may or may not be observable }, - update: function(element, valueAccessor) { + update: function (element, valueAccessor) { + // Whenever the value subsequently changes, slowly fade the element in or out var value = valueAccessor(); - ko.utils.unwrapObservable(value) ? $(element).slideDown() : $(element).slideUp(); + ko.utils.unwrapObservable(value) ? $(element).fadeIn() : $(element).fadeOut(); + console.log("teh"); } - }; + } + ko.applyBindings(programModel); getEvents(programModel); }); diff --git a/wp-content/themes/neuf-old-style/js/program.js b/wp-content/themes/neuf-old-style/js/program.js index 0e042aa..3d1f2ee 100755 --- a/wp-content/themes/neuf-old-style/js/program.js +++ b/wp-content/themes/neuf-old-style/js/program.js @@ -40,7 +40,7 @@ function toggleActive(mode) { } function showTiles() { - tiles = $("#program-calendar"); + tiles = $("#program_tiles"); list = $("#program_list"); tiles.removeClass("hidden"); @@ -48,7 +48,7 @@ function showTiles() { } function showList() { - tiles = $("#program-calendar"); + tiles = $("#program_tiles"); list = $("#program_list"); tiles.addClass("hidden"); @@ -262,8 +262,8 @@ $(window).load(function(){ } /* Only now can we really show them*/ - $("#program-style-selector").removeClass('hidden'); - $("#program-calendar").removeAttr('style'); + /*$("#program-style-selector").removeClass('hidden');*/ + $("#program_tiles").removeAttr('style'); $("#program_list").removeAttr('style'); $("#load-spinner").addClass('hidden'); @@ -289,7 +289,7 @@ $(window).unload(function() { } /* Find what view the user was using last (tiles/list): */ - var tiles = $("#program-calendar"); + var tiles = $("#program_tiles"); var hasUsedList = tiles.hasClass('hidden'); sessionStorage.setItem('useList', hasUsedList); sessionStorage.setItem('useTiles', !hasUsedList); diff --git a/wp-content/themes/neuf-old-style/loop-single.php b/wp-content/themes/neuf-old-style/loop-single.php index 50fb500..9a06ca6 100755 --- a/wp-content/themes/neuf-old-style/loop-single.php +++ b/wp-content/themes/neuf-old-style/loop-single.php @@ -11,7 +11,7 @@ echo $homepage ? '
    Nettside: '.$homepage.'
    ' : ''; ?> -
    av , kl
    +
    Av | Publisert:
    @@ -22,9 +22,6 @@
    'display:block;margin:auto;' ) ); ?> - -
    post_excerpt; ?> -
    diff --git a/wp-content/themes/neuf-old-style/menu.php b/wp-content/themes/neuf-old-style/menu.php index c4816de..b8e6902 100755 --- a/wp-content/themes/neuf-old-style/menu.php +++ b/wp-content/themes/neuf-old-style/menu.php @@ -1,29 +1,7 @@ -
    -
      -
    • Åpningstider ▾ -
        -
      • - - - - - - - - - - - - - - - -
        Man - ons11.00 - 01.00
        Tors - fre11.00 - 03.00
        Lørdag16.00 - 03.00
        -
        • -
      -
      • -
    - - 'main-menu', 'container' => 'false' ) ); ?> - +
    +
      +
      • +
      • +
    + 'main-menu', 'container' => 'false' ) ); ?>
    diff --git a/wp-content/themes/neuf-old-style/newsletter.php b/wp-content/themes/neuf-old-style/newsletter.php index a9286c5..1d21cd4 100644 --- a/wp-content/themes/neuf-old-style/newsletter.php +++ b/wp-content/themes/neuf-old-style/newsletter.php @@ -2,118 +2,113 @@ require( '../../../wp-load.php' ); $meta_query = array( - 'relation' => 'AND', - array( - 'key' => '_neuf_events_starttime', - 'value' => date( 'U' , strtotime( '-8 hours' ) ), - 'compare' => '>', - 'type' => 'numeric' - ), - array( - 'key' => '_neuf_events_promo_period', - 'value' => array( 'Month' , 'semester' ), - 'compare' => 'IN', - ) + 'key' => '_neuf_events_starttime', + 'value' => date( 'U' , strtotime( '-8 hours' ) ), + 'compare' => '>', + 'type' => 'numeric' ); $args = array( - 'post_type' => 'event', - 'meta_query' => $meta_query, - 'posts_per_page' => 4 + 'post_type' => 'event', + 'meta_query' => array( $meta_query ), + 'posts_per_page' => 4 ); - -$top_events = new WP_Query( $args ); - -$meta_query = array( - 'key' => '_neuf_events_starttime', - 'value' => array(date( 'U' , strtotime( '-8 hours' )), date( 'U' , strtotime( '+1 week' ))), - 'type' => 'numeric', - 'compare' => 'BETWEEN' -); - -$args = array( - 'post_type' => 'event', - 'meta_query' => array($meta_query), - 'posts_per_page' => 150, - 'orderby' => 'meta_value_num', - 'meta_key' => '_neuf_events_starttime', - 'order' => 'ASC' -); - $events = new WP_Query( $args ); - -$news = new WP_Query( 'type=post' ); +/* */ +define('SITE_ROOT', 'http://studentersamfunnet.no/'); ?> - - + + + - Det Norske Studentersamfund - Nyhetsbrev - - + Ukesprogram for Det Norske Studentersamfund + + - - - - - -
    - - - - - - have_posts()) : $news->the_post(); ?> - - have_posts() ?> - -
    Det Norske Studentersamfund
    > - -
    - - - -     -
    - - - have_posts()) : $top_events->the_post(); ?> - - have_posts() ?> - -
    > - -
    - -     -
    - - - - - - mandag, tirsdag ?> - - - have_posts()) : $events->the_post(); ?> - > - - - - - - - - have_posts() ?> -

    Program denne uken

    mandag

    20.00 - - 60/60KonsertBetongKjøp billett
    - - - - -
    Akademika
    -
    + +
    + + +

    + Det Norske Studentersamfund +

    + + + + + have_posts() && $counter < 3) : $events->the_post(); ?> + + + + + +
    +
    +

    name; ?>

    +

    + time)); ?> +

    +
    +
    + picture): ?> + + +
    +
    +

    + intro; ?> +

    +

    + Les mer» +

    +
    +
    + +
     
    +
    +

    + pretext; ?> +

    +
    +
    + +
    + + + + + +
    +
    +
    +
    +

    posttext; ?>

    +
    +
    + +
    +

    Vår samarbeidspartner:

    + Akademika +
    +
    +

    Det Norske Studentersamfund

    +

    www.studentersamfundet.no

    +

    Chateau Neuf, Slemdalsveien 15, 0369 Oslo, tlf: 22 84 45 11

    +
    +
    diff --git a/wp-content/themes/neuf-old-style/page-program.php b/wp-content/themes/neuf-old-style/page-program.php index c8cbeec..65fe730 100755 --- a/wp-content/themes/neuf-old-style/page-program.php +++ b/wp-content/themes/neuf-old-style/page-program.php @@ -1,7 +1,6 @@ @@ -20,33 +19,24 @@ wp_enqueue_script('eventProgram'); .table-image { opacity: 0.1; } - - .event:not(:first-child) > img { - display: none; - } - - .event-program-6days { - padding-top:15px; - border-top:1px solid #ff9e29; - } - - .float-right { - float: right; - } -
    - +

    + + +
    +
    You will hopefully not see this. -
    +
    +
    Rutenett @@ -56,41 +46,6 @@ wp_enqueue_script('eventProgram'); Liste
    - -
    -
    -
    - - -
    -
    - - - - - - - -
    -
    -

    -
    -
    - - - -
    -
    -
    -
    - -
    -
    -
    have_posts() ) : /* All posts */ ?>
    -
    have_posts() ) : $events->the_post(); /* set previous day */ @@ -195,7 +149,7 @@ if ( $events->have_posts() ) : the_post_thumbnail ('two-column-thumb' ); } ?> -

    >ID , '_neuf_events_starttime' , true ) ); ?> >

    +

    >ID , '_neuf_events_starttime' , true ) ); ?> >

    have_posts() ) : } ?> -

    >ID , '_neuf_events_starttime' , true ) ); ?> >

    +

    >ID , '_neuf_events_starttime' , true ) ); ?> >

    @@ -232,9 +186,9 @@ if ( $events->have_posts() ) : '_neuf_events_starttime', - 'value' => array(date( 'U' , strtotime( '-8 hours' )), date( 'U' , strtotime( '+1 year' ))), + 'value' => date( 'U' , strtotime( '-8 hours' )), // start 'type' => 'numeric', - 'compare' => 'BETWEEN' + 'compare' => '>' ); $args = array( @@ -256,74 +210,70 @@ if ( $events->have_posts() ) : /* All posts */ ?> -
    -
    +
    + + + have_posts() ) : $events->the_post(); + $date = get_post_meta( $post->ID , '_neuf_events_starttime' , true ); -
    -
    - - have_posts() ) : $events->the_post(); - $date = get_post_meta( $post->ID , '_neuf_events_starttime' , true ); + $previous_month = $current_month; + $current_month = date_i18n( 'F' , $date); + $newmonth = $previous_month != $current_month; - $previous_month = $current_month; - $current_month = date_i18n( 'F' , $date); - $newmonth = $previous_month != $current_month; + $datel = date_i18n( 'l j/n' , $date); + ($price = neuf_get_price( $post )) ? : $price = '-'; + $venue = get_post_meta( $post->ID , '_neuf_events_venue' , true ); + $ticket = get_post_meta( $post->ID , '_neuf_events_bs_url' , true ); + $ticket = $ticket ? 'Kjøp billett' : ''; + /* event type class */ + $event_array = get_the_terms( $post->ID , 'event_type' ); + $event_types = array(); + $event_types_real = array(); + foreach ( $event_array as $event_type ) { + if ($event_type->parent === "0") { + $event_types[] = $event_type->name; + } else { + $id = (int)$event_type->parent; + $parent = get_term( $id, 'event_type' ); + $event_types[] = $parent->name; + } + $event_types_real[] = $event_type->name; + } + $event_type_real = $event_types_real ? "".implode(", ", $event_types_real) : ""; + $event_type_class = $event_types ? "class=\"".implode(" ", $event_types)."\"" : ""; + + /* set current day */ + $previous_day = $current_day; + $current_day = date_i18n( 'Y-m-d' , $date); + $newday = $previous_day != $current_day; - $datel = date_i18n( 'l j/n' , $date); - ($price = neuf_get_price( $post )) ? : $price = '-'; - $venue = get_post_meta( $post->ID , '_neuf_events_venue' , true ); - $ticket = get_post_meta( $post->ID , '_neuf_events_bs_url' , true ); - $ticket = $ticket ? 'Kjøp billett' : ''; - /* event type class */ - $event_array = get_the_terms( $post->ID , 'event_type' ); - $event_types = array(); - $event_types_real = array(); - foreach ( $event_array as $event_type ) { - if ($event_type->parent === "0") { - $event_types[] = $event_type->name; - } else { - $id = (int)$event_type->parent; - $parent = get_term( $id, 'event_type' ); - $event_types[] = $parent->name; - } - $event_types_real[] = $event_type->name; - } - $event_type_real = $event_types_real ? "".implode(", ", $event_types_real) : ""; - $event_type_class = $event_types ? "class=\"".implode(" ", $event_types)."\"" : ""; + /* everything is everything is not everything if everything is nothing */ + $alt = $alt == " alt" ? "" : " alt"; - /* set current day */ - $previous_day = $current_day; - $current_day = date_i18n( 'Y-m-d' , $date); - $newday = $previous_day != $current_day; - - /* everything is everything is not everything if everything is nothing */ - $alt = $alt == " alt" ? "" : " alt"; - - if($newmonth) { ?> - - - - - - - - - - - - - - - - - - - - - - -

    DatoArrangementCCTypeStedBillett
    >
    -
    + if($newmonth) { ?> + +

    + + + Dato + Arrangement + CC + Type + Sted + Billett + + + + + + + > + + + + + +
    diff --git a/wp-content/themes/neuf-old-style/program-3days.php b/wp-content/themes/neuf-old-style/program-3days.php index 65d7157..613ffbb 100755 --- a/wp-content/themes/neuf-old-style/program-3days.php +++ b/wp-content/themes/neuf-old-style/program-3days.php @@ -62,13 +62,13 @@ if ( $events->have_posts() ) : - + -

    ID , '_neuf_events_starttime' , true ) ); ?>

    +

    ID , '_neuf_events_starttime' , true ) ); ?>

    have_posts(); ?> diff --git a/wp-content/themes/neuf-old-style/program-6days.php b/wp-content/themes/neuf-old-style/program-6days.php index 1e70b4e..dadf6e1 100755 --- a/wp-content/themes/neuf-old-style/program-6days.php +++ b/wp-content/themes/neuf-old-style/program-6days.php @@ -67,7 +67,7 @@ if ( $events->have_posts() ) : -

    ID , '_neuf_events_starttime' , true ) ); ?>

    +

    ID , '_neuf_events_starttime' , true ) ); ?>

    have_posts(); ?> diff --git a/wp-content/themes/neuf-old-style/search.php b/wp-content/themes/neuf-old-style/search.php index 6232f1c..d01cd96 100755 --- a/wp-content/themes/neuf-old-style/search.php +++ b/wp-content/themes/neuf-old-style/search.php @@ -5,10 +5,11 @@
    > -
    + +

    -
    Av | Publisert
    +
    @@ -33,7 +34,6 @@
    -
    diff --git a/wp-content/themes/neuf-old-style/studentmedia.php b/wp-content/themes/neuf-old-style/studentmedia.php index 957a8c0..63ce0e1 100755 --- a/wp-content/themes/neuf-old-style/studentmedia.php +++ b/wp-content/themes/neuf-old-style/studentmedia.php @@ -6,6 +6,11 @@
    +
    +

    Radio Nova

    + Lytt til Radio Nova (FM 99,3) +
    +
    @@ -14,10 +19,6 @@
    -
    -

    Radio Nova

    - Lytt til Radio Nova (FM 99,3) -
    diff --git a/wp-content/themes/neuf-old-style/style.css b/wp-content/themes/neuf-old-style/style.css index c2da447..4259f36 100644 --- a/wp-content/themes/neuf-old-style/style.css +++ b/wp-content/themes/neuf-old-style/style.css @@ -4,7 +4,7 @@ Theme URI: http://wordpress.org/extend/themes/twentyeleven Author: Nikolai Kristiansen Author URI: http://edb.neuf.no/ Description: Teater Neuf 2012 -Version: 0.1 +Version: 0.2 License: GNU General Public License v2 or later License URI: http://www.gnu.org/licenses/gpl-2.0.html Text Domain: teaterneuf