Merge branch 'master' of https://github.com/user890104/initfest

css/styles.css

@@ -630,6 +630,9 @@ a:hover { text-decoration: underline; }
  *********************************************/
 
 nav .menu > li { margin: 1px 10px; }
+nav .menu a:hover {
+  color: #000;
+}
 
 /*********************************************
  * Tagline & Sponsors

functions.php

@@ -138,7 +138,7 @@ function partners_shortcode() {
 
 # Create shortcode for transport methods 
 function transport_shortcode() {
-    $result= '<section class="content"><h3>'.pll__('Място').': '.pll__('Интерпред, София, България').'</h3>';
+    $result= '<section class="content"><h3>'.pll__('Място').': '.pll__('VENUE_LOCATION').'</h3>';
 
     $transport_args = array( 'post_type' => 'transportation' );
     $transport = new WP_Query( $transport_args ); 
@@ -156,7 +156,7 @@ function transport_shortcode() {
 ?>
 </section>
 <?php
-    echo do_shortcode( '[ready_google_map id="2" map_language="en" align="center"]' ); 
+    //echo do_shortcode( '[ready_google_map id="2" map_language="en" align="center"]' ); 
 
     $result .= ob_get_contents();
 	ob_end_clean();
@@ -319,12 +319,12 @@ if (function_exists("pll_register_string")) {
 	pll_register_string('Schedule','Програма');
 	pll_register_string('Others','Други');
 	pll_register_string('follow','Последвайте ни в:');
-	pll_register_string('venue','Интерпред, София, България');
+	pll_register_string('venue','VENUE_LOCATION');
 	pll_register_string('venue_w','Място');
 	pll_register_string('sponsors_w','Спонсори');
 	pll_register_string('partners_w','Партньори');
 	pll_register_string('speakers_w','Лектори');
-	pll_register_string('time','1-ви и 2-ри ноември 2014 г.');
+	pll_register_string('time','EVENT_TIME');
 	pll_register_string('publishedon','Публикувано на');
 	pll_register_string('by_w','От');
 	pll_register_string('see_whole_news','виж цялата новина');

header.php

@@ -12,7 +12,8 @@
 		<meta name="description" content="" />
 
 		<meta name="viewport" content="user-scalable=no, width=device-width, initial-scale=1.0, maximum-scale=1.0" />
-		<link rel="icon" type="image/png" href="">
+		<!--<link rel="icon" type="image/png" href="">-->
+    <link rel="shortcut icon" href="<?php echo get_stylesheet_directory_uri(); ?>/favicon.ico" />
 		
 		<title><?php is_front_page() ? (bloginfo('name').e_(' | ').e_('Да споделим свободата')) : wp_title( ' | ', true, 'right' ); ?></title>
 

page.php

@@ -2,7 +2,7 @@
 get_header(); 
 
 /* Some special pages (the ones describing the event, team, etc. need a special submenu */
-if ( preg_match('/^(about|ideas-and-recommendations|feedback|team|history|volunteers)/', $pagename) ) {
+if ( preg_match('/^(about|ideas-and-recommendations|feedback|team|history|volunteers|code-of-conduct)/', $pagename) ) {
     wp_nav_menu( array( 'theme_location' => 'subnav-menu', 'container_class' => 'content subnav cf' ) );
 }
 

sidebar.php

@@ -1,6 +1,6 @@
 <div class="col-right sponsors-frontpage">
 
-<h3><?php pll_e('1-ви и 2-ри ноември 2014 г.');?> <br /> <?php pll_e('Интерпред, София, България');?></h3>
+<h3><?php pll_e('EVENT_TIME');?> <br /> <?php pll_e('VENUE_LOCATION');?></h3>
     <div class="separator"></div>
     <?php echo do_shortcode( '[sponsors]' ); ?>
     <div class="separator"></div>