Merge origin/geotag into geotag

diff --git a/boot.php b/boot.php
index 5f633fd87877b37cb9ba531cdcd5b5477ca7441d..b395d3423a586cde34ecdd7df0ad87858a427cae 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -408,6 +408,7 @@ if(! class_exists('App')) {
                public  $videoheight = 350;
                public  $force_max_items = 0;
                public  $theme_thread_allow = true;
+               public  $theme_events_in_profile = true;
 
                // An array for all theme-controllable parameters
                // Mostly unimplemented yet. Only options 'stylesheet' and

diff --git a/include/identity.php b/include/identity.php
index 0fba0c592f02d60f214d34838837e58befd96590..b4bc79e00f3c5795cfbbc3abcc69d47b08397fca 100644 (file)
--- a/include/identity.php
+++ b/include/identity.php
@@ -501,7 +501,7 @@ if(! function_exists('get_events')) {
                                }
 
                                $today = ((substr($strt,0,10) === datetime_convert('UTC',$a->timezone,'now','Y-m-d')) ? true : false);
-                               
+
                                $rr['title'] = $title;
                                $rr['description'] = $desciption;
                                $rr['date'] = day_translate(datetime_convert('UTC', $rr['adjust'] ? $a->timezone : 'UTC', $rr['start'], $bd_format)) . (($today) ?  ' ' . t('[today]') : '');
@@ -533,21 +533,21 @@ function advanced_profile(&$a) {
        if($a->profile['name']) {
 
                $tpl = get_markup_template('profile_advanced.tpl');
-               
+
                $profile = array();
-               
+
                $profile['fullname'] = array( t('Full Name:'), $a->profile['name'] ) ;
-               
+
                if($a->profile['gender']) $profile['gender'] = array( t('Gender:'),  $a->profile['gender'] );
-               
+
 
                if(($a->profile['dob']) && ($a->profile['dob'] != '0000-00-00')) {
-               
+
                        $year_bd_format = t('j F, Y');
                        $short_bd_format = t('j F');
 
-               
-                       $val = ((intval($a->profile['dob'])) 
+
+                       $val = ((intval($a->profile['dob']))
                                ? day_translate(datetime_convert('UTC','UTC',$a->profile['dob'] . ' 00:00 +00:00',$year_bd_format))
                                : day_translate(datetime_convert('UTC','UTC','2001-' . substr($a->profile['dob'],5) . ' 00:00 +00:00',$short_bd_format)));
 
@@ -556,7 +556,7 @@ function advanced_profile(&$a) {
                }
 
                if($age = age($a->profile['dob'],$a->profile['timezone'],''))  $profile['age'] = array( t('Age:'), $age );
-                       
+
 
                if($a->profile['marital']) $profile['marital'] = array( t('Status:'), $a->profile['marital']);
 
@@ -591,7 +591,7 @@ function advanced_profile(&$a) {
                if($txt = prepare_text($a->profile['contact'])) $profile['contact'] = array( t('Contact information and Social Networks:'), $txt);
 
                if($txt = prepare_text($a->profile['music'])) $profile['music'] = array( t('Musical interests:'), $txt);
-               
+
                if($txt = prepare_text($a->profile['book'])) $profile['book'] = array( t('Books, literature:'), $txt);
 
                if($txt = prepare_text($a->profile['tv'])) $profile['tv'] = array( t('Television:'), $txt);
@@ -599,14 +599,14 @@ function advanced_profile(&$a) {
                if($txt = prepare_text($a->profile['film'])) $profile['film'] = array( t('Film/dance/culture/entertainment:'), $txt);
 
                if($txt = prepare_text($a->profile['romance'])) $profile['romance'] = array( t('Love/Romance:'), $txt);
-               
+
                if($txt = prepare_text($a->profile['work'])) $profile['work'] = array( t('Work/employment:'), $txt);
 
                if($txt = prepare_text($a->profile['education'])) $profile['education'] = array( t('School/education:'), $txt );
-               
+
                if ($a->profile['uid'] == local_user())
                        $profile['edit'] = array($a->get_baseurl(). '/profiles/'.$a->profile['id'], t('Edit profile'),"", t('Edit profile'));
-               
+
                return replace_macros($tpl, array(
                        '$title' => t('Profile'),
                        '$profile' => $profile
@@ -664,14 +664,15 @@ if(! function_exists('profile_tabs')){
                );
 
                if ($is_owner){
-                       $tabs[] = array(
-                               'label' => t('Events'),
-                               'url'   => $a->get_baseurl() . '/events',
-                               'sel'   =>((!isset($tab)&&$a->argv[0]=='events')?'active':''),
-                               'title' => t('Events and Calendar'),
-                               'id' => 'events-tab',
-                               'accesskey' => 'e',
-                       );
+                       if ($a->theme_events_in_profile)
+                               $tabs[] = array(
+                                       'label' => t('Events'),
+                                       'url'   => $a->get_baseurl() . '/events',
+                                       'sel'   =>((!isset($tab)&&$a->argv[0]=='events')?'active':''),
+                                       'title' => t('Events and Calendar'),
+                                       'id' => 'events-tab',
+                                       'accesskey' => 'e',
+                               );
                        $tabs[] = array(
                                'label' => t('Personal Notes'),
                                'url'   => $a->get_baseurl() . '/notes',
@@ -737,8 +738,8 @@ function zrl($s,$force = false) {
 
 // Used from within PCSS themes to set theme parameters. If there's a
 // puid request variable, that is the "page owner" and normally their theme
-// settings take precedence; unless a local user sets the "always_my_theme" 
-// system pconfig, which means they don't want to see anybody else's theme 
+// settings take precedence; unless a local user sets the "always_my_theme"
+// system pconfig, which means they don't want to see anybody else's theme
 // settings except their own while on this site.
 
 function get_theme_uid() {

diff --git a/include/nav.php b/include/nav.php
index 972a6248c1defca27b3aa9ac9f0eb50d8bd72def..7fa9754ef15f0e4a8e4b000c6a5ae0b4bfd1d442 100644 (file)
--- a/include/nav.php
+++ b/include/nav.php
@@ -240,6 +240,7 @@ function nav_set_selected($item){
                'settings'              => null,
                'contacts'              => null,
                'manage'        => null,
+               'events'        => null,
                'register'      => null,
        );
        $a->nav_sel[$item] = 'selected';

diff --git a/mod/events.php b/mod/events.php
index ff615141705ceb0c3af8f04747396a7af4f4fae0..e601ce8e4e82bf9332184aebca452ff23b7972da 100644 (file)
--- a/mod/events.php
+++ b/mod/events.php
@@ -179,14 +179,17 @@ function events_content(&$a) {
                );
        }
 
+       if ($a->theme_events_in_profile)
+               nav_set_selected('home');
+       else
+               nav_set_selected('events');
 
        $editselect = 'none';
        if( feature_enabled(local_user(), 'richtext') )
                $editselect = 'textareas';
 
        // First day of the week (0 = Sunday)
-       // To-Do: Needs to be configurable
-       $firstDay = 0;
+       $firstDay = get_pconfig(local_user(),'system','first_day_of_week');
 
        $i18n = array(
                        "firstDay" => $firstDay,
@@ -249,7 +252,8 @@ function events_content(&$a) {
 
        $o ="";
        // tabs
-       $tabs = profile_tabs($a, True);
+       if ($a->theme_events_in_profile)
+               $tabs = profile_tabs($a, True);
 
 
 

diff --git a/mod/notes.php b/mod/notes.php
index b96092495607996af5a2172b25b5dc4b0d68df36..73c1507e3e044d8ea62538192104eafdc9d1cd0f 100644 (file)
--- a/mod/notes.php
+++ b/mod/notes.php
@@ -9,6 +9,8 @@ function notes_init(&$a) {
 
        $which = $a->user['nickname'];
 
+       nav_set_selected('home');
+
 //     profile_load($a,$which,$profile);
 
 }

diff --git a/mod/photos.php b/mod/photos.php
index 834fab33fdb7459b6e324f8b833a0db3a825b31b..03021e55018ba678805c701d7065580b77e237ae 100644 (file)
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -18,6 +18,8 @@ function photos_init(&$a) {
                return;
        }
 
+       nav_set_selected('home');
+
        $o = '';
 
        if($a->argc > 1) {
@@ -546,7 +548,7 @@ function photos_post(&$a) {
                                                        if(count($links)) {
                                                                foreach($links as $link) {
                                                                        if($link['@attributes']['rel'] === 'http://webfinger.net/rel/profile-page')
-                                                       $profile = $link['@attributes']['href'];
+                                                                               $profile = $link['@attributes']['href'];
                                                                        if($link['@attributes']['rel'] === 'salmon') {
                                                                                $salmon = '$url:' . str_replace(',','%sc',$link['@attributes']['href']);
                                                                                if(strlen($inform))

diff --git a/mod/settings.php b/mod/settings.php
index 556fb63e8ad294c35dae29fe6131cdf7971afba3..6601858ee41b2bc8e234a1d0a9359b1818cd11c8 100644 (file)
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -284,6 +284,7 @@ function settings_post(&$a) {
                $theme = ((x($_POST,'theme')) ? notags(trim($_POST['theme']))  : $a->user['theme']);
                $mobile_theme = ((x($_POST,'mobile_theme')) ? notags(trim($_POST['mobile_theme']))  : '');
                $nosmile = ((x($_POST,'nosmile')) ? intval($_POST['nosmile'])  : 0);
+               $first_day_of_week = ((x($_POST,'first_day_of_week')) ? intval($_POST['first_day_of_week'])  : 0);
                $noinfo = ((x($_POST,'noinfo')) ? intval($_POST['noinfo'])  : 0);
                $infinite_scroll = ((x($_POST,'infinite_scroll')) ? intval($_POST['infinite_scroll'])  : 0);
                $no_auto_update = ((x($_POST,'no_auto_update')) ? intval($_POST['no_auto_update'])  : 0);
@@ -308,6 +309,7 @@ function settings_post(&$a) {
                set_pconfig(local_user(),'system','itemspage_network', $itemspage_network);
                set_pconfig(local_user(),'system','itemspage_mobile_network', $itemspage_mobile_network);
                set_pconfig(local_user(),'system','no_smilies',$nosmile);
+               set_pconfig(local_user(),'system','first_day_of_week',$first_day_of_week);
                set_pconfig(local_user(),'system','ignore_info',$noinfo);
                set_pconfig(local_user(),'system','infinite_scroll',$infinite_scroll);
                set_pconfig(local_user(),'system','no_auto_update',$no_auto_update);
@@ -915,6 +917,10 @@ function settings_content(&$a) {
                $nosmile = get_pconfig(local_user(),'system','no_smilies');
                $nosmile = (($nosmile===false)? '0': $nosmile); // default if not set: 0
 
+               $first_day_of_week = get_pconfig(local_user(),'system','first_day_of_week');
+               $first_day_of_week = (($first_day_of_week===false)? '0': $first_day_of_week); // default if not set: 0
+               $weekdays = array(0 => t("Sunday"), 1 => t("Monday"));
+
                $noinfo = get_pconfig(local_user(),'system','ignore_info');
                $noinfo = (($noinfo===false)? '0': $noinfo); // default if not set: 0
 
@@ -944,6 +950,8 @@ function settings_content(&$a) {
                        '$itemspage_network'   => array('itemspage_network',  t("Number of items to display per page:"), $itemspage_network, t('Maximum of 100 items')),
                        '$itemspage_mobile_network'   => array('itemspage_mobile_network',  t("Number of items to display per page when viewed from mobile device:"), $itemspage_mobile_network, t('Maximum of 100 items')),
                        '$nosmile'      => array('nosmile', t("Don't show emoticons"), $nosmile, ''),
+                       '$calendar_title' => t('Calendar'),
+                       '$first_day_of_week'    => array('first_day_of_week', t('Beginning of week:'), $first_day_of_week, '', $weekdays, false),
                        '$noinfo'       => array('noinfo', t("Don't show notices"), $noinfo, ''),
                        '$infinite_scroll'      => array('infinite_scroll', t("Infinite scroll"), $infinite_scroll, ''),
                        '$no_auto_update'       => array('no_auto_update', t("Automatic updates only at the top of the network page"), $no_auto_update, 'When disabled, the network page is updated all the time, which could be confusing while reading.'),

diff --git a/mod/videos.php b/mod/videos.php
index df47262f1de1db34a2a436dca19ed8c39ae0cf5f..a7d48cb751200fc47dac47e1f75fa71733f535b6 100644 (file)
--- a/mod/videos.php
+++ b/mod/videos.php
@@ -15,6 +15,8 @@ function videos_init(&$a) {
                return;
        }
 
+       nav_set_selected('home');
+
        $o = '';
 
        if($a->argc > 1) {

diff --git a/view/templates/settings_display.tpl b/view/templates/settings_display.tpl
index ac41c1c27c7e220df3a99523c16b7181a443df7a..8b15563bda936cb08b752316a0557b2c5a09e399 100644 (file)
--- a/view/templates/settings_display.tpl
+++ b/view/templates/settings_display.tpl
@@ -13,6 +13,8 @@
 {{include file="field_checkbox.tpl" field=$nosmile}}
 {{include file="field_checkbox.tpl" field=$noinfo}}
 {{include file="field_checkbox.tpl" field=$infinite_scroll}}
+<h2>{{$calendar_title}}</h2>
+{{include file="field_select.tpl" field=$first_day_of_week}}
 
 
 <div class="settings-submit-wrapper" >

diff --git a/view/theme/vier/narrow.css b/view/theme/vier/narrow.css
new file mode 100644 (file)
index 0000000..09f0e2f
--- /dev/null
+++ b/view/theme/vier/narrow.css
@@ -0,0 +1,12 @@
+#nav-user-linklabel {
+  display: none;
+}
+
+nav ul li .menu-popup {
+  left: auto;
+  right: 0px;
+}
+
+nav #search-box #search-text {
+  width: 100px;
+}

diff --git a/view/theme/vier/style.php b/view/theme/vier/style.php
index e118d1ef0905cf77b11001f65156a11732c5fba0..72731a9bebc9843d3c7949c7a53e7a9abfe16593 100644 (file)
--- a/view/theme/vier/style.php
+++ b/view/theme/vier/style.php
@@ -26,5 +26,3 @@ else if ($style == "dark")
        $stylecss = file_get_contents('view/theme/vier/dark.css');
 
 echo $stylecss;
-
-

diff --git a/view/theme/vier/theme.php b/view/theme/vier/theme.php
index 7c94f001aa2ac9570980b027a3daa7915647baa2..af7cd0275f605f8aea8ea0ed5c11b3ad3d7ebf65 100644 (file)
--- a/view/theme/vier/theme.php
+++ b/view/theme/vier/theme.php
@@ -10,6 +10,9 @@
  */
 
 function vier_init(&$a) {
+
+$a->theme_events_in_profile = false;
+
 set_template_engine($a, 'smarty3');
 
 $baseurl = $a->get_baseurl();
@@ -17,6 +20,7 @@ $baseurl = $a->get_baseurl();
 $a->theme_info = array();
 
 $a->page['htmlhead'] .= <<< EOT
+<link rel='stylesheet' media='screen and (max-width: 1100px)' href='view/theme/vier/narrow.css' />
 <script type="text/javascript">
 
 function insertFormatting(comment,BBcode,id) {