diabook-theme: some fixes

diff --git a/view/theme/diabook/communityhome.tpl b/view/theme/diabook/communityhome.tpl
index 60d4646cceec115b4b2e17bb96710d0ade213c63..17acc1eab09b618152028cd72005b65d7c73e0c0 100755 (executable)
--- a/view/theme/diabook/communityhome.tpl
+++ b/view/theme/diabook/communityhome.tpl
@@ -33,6 +33,7 @@ just contact me, if you are intesrested in joining</p>
 
 <div id="boxsettings" style="display:none">
 <form id="boxsettingsform" action="network" method="post" >
+<fieldset><legend>$boxsettings.title.1</legend>
 {{inc field_select.tpl with $field=$close_pages}}{{endinc}}
 {{inc field_select.tpl with $field=$close_profiles}}{{endinc}}
 {{inc field_select.tpl with $field=$close_helpers}}{{endinc}}
@@ -46,6 +47,7 @@ just contact me, if you are intesrested in joining</p>
 <div class="settings-submit-wrapper">
 <input id="boxsub" type="submit" value="$sub" class="settings-submit" name="diabook-settings-box-sub"></input>
 </div>
+</fieldset>
 </form>
 </div>
 

diff --git a/view/theme/diabook/config.php b/view/theme/diabook/config.php
index 84dd6483455a64a47fed70cecb9da3c5c7fa5886..2a418909b0254a637d3198f542e6d2ea56467bbf 100644 (file)
--- a/view/theme/diabook/config.php
+++ b/view/theme/diabook/config.php
@@ -143,12 +143,12 @@ function diabook_form(&$a, $font_size, $line_height, $resolution, $color, $TSear
                'dark'=>'dark',                                         
                );
        $close_pagesC = array(
-               '1'=>'hide',    
-               '0'=>'show',                                                    
+               '0'=>'show',    
+               '1'=>'hide',                                                    
                );
        $close_mapqueryC = array(
-               '1'=>'hide',    
-               '0'=>'show',                                                                    
+               '0'=>'show',    
+               '1'=>'hide',                                                                    
                );
        $close_profilesC = array(
                '0'=>'show',    
@@ -167,8 +167,8 @@ function diabook_form(&$a, $font_size, $line_height, $resolution, $color, $TSear
                '1'=>'hide',                                                            
                );
        $close_twitterC = array(
-               '1'=>'hide',    
-               '0'=>'show',                                                            
+               '0'=>'show',    
+               '1'=>'hide',                                                            
                );
        $close_lastusersC = array(
                '0'=>'show',    
@@ -198,16 +198,16 @@ function diabook_form(&$a, $font_size, $line_height, $resolution, $color, $TSear
                '$ELZoom' => array('diabook_ELZoom', t('Set zoomfactor for Earth Layer'), $ELZoom, '', $ELZoom),        
                '$ELPosX' => array('diabook_ELPosX', t('Set longitude (X) for Earth Layer'), $ELPosX, '', $ELPosX),     
                '$ELPosY' => array('diabook_ELPosY', t('Set latitude (Y) for Earth Layer'), $ELPosY, '', $ELPosY),      
-               '$close_pages' => array('diabook_close_pages', t('Show "Cummunity Pages" at right-hand coloumn?'), $close_pages, '', $close_pagesC),    
-               '$close_mapquery' => array('diabook_close_mapquery', t('Show "Earth Layers" at right-hand coloumn?'), $close_mapquery, '', $close_mapqueryC),           
-               '$close_profiles' => array('diabook_close_profiles', t('Show "Cummunity Profiles" at right-hand coloumn?'), $close_profiles, '', $close_profilesC),             
-               '$close_helpers' => array('diabook_close_helpers', t('Show "Help or @NewHere" at right-hand coloumn?'), $close_helpers, '', $close_helpersC),           
-               '$close_services' => array('diabook_close_services', t('Show "Connect Services" at right-hand coloumn?'), $close_services, '', $close_servicesC),                       
-               '$close_friends' => array('diabook_close_friends', t('Show "Find Friends" at right-hand coloumn?'), $close_friends, '', $close_friendsC),                               
-               '$close_twitter' => array('diabook_close_twitter', t('Show "Last Tweets" at right-hand coloumn?'), $close_twitter, '', $close_twitterC),                                
-               '$close_lastusers' => array('diabook_close_lastusers', t('Show "Last Users" at right-hand coloumn?'), $close_lastusers, '', $close_lastusersC),                         
-               '$close_lastphotos' => array('diabook_close_lastphotos', t('Show "Last Photos" at right-hand coloumn?'), $close_lastphotos, '', $close_lastphotosC),                            
-               '$close_lastlikes' => array('diabook_close_lastlikes', t('Show "Last Likes" at right-hand coloumn?'), $close_lastlikes, '', $close_lastlikesC),                         
+               '$close_pages' => array('diabook_close_pages', t('Community Pages'), $close_pages, '', $close_pagesC),  
+               '$close_mapquery' => array('diabook_close_mapquery', t('Earth Layers'), $close_mapquery, '', $close_mapqueryC),         
+               '$close_profiles' => array('diabook_close_profiles', t('Community Profiles'), $close_profiles, '', $close_profilesC),           
+               '$close_helpers' => array('diabook_close_helpers', t('Help or @NewHere ?'), $close_helpers, '', $close_helpersC),               
+               '$close_services' => array('diabook_close_services', t('Connect Services'), $close_services, '', $close_servicesC),                     
+               '$close_friends' => array('diabook_close_friends', t('Find Friends'), $close_friends, '', $close_friendsC),                             
+               '$close_twitter' => array('diabook_close_twitter', t('Last Tweets'), $close_twitter, '', $close_twitterC),                              
+               '$close_lastusers' => array('diabook_close_lastusers', t('Last users'), $close_lastusers, '', $close_lastusersC),                               
+               '$close_lastphotos' => array('diabook_close_lastphotos', t('Last photos'), $close_lastphotos, '', $close_lastphotosC),                          
+               '$close_lastlikes' => array('diabook_close_lastlikes', t('Last likes'), $close_lastlikes, '', $close_lastlikesC),                               
        ));
        return $o;
 }

diff --git a/view/theme/diabook/js/jquery.twitter.search.js b/view/theme/diabook/js/jquery.twitter.search.js
index d3ccfe68e73a23bafe5c52cd394d970703532254..a57bd255d822c1f94281aa5fc99fc29402ab6267 100644 (file)
--- a/view/theme/diabook/js/jquery.twitter.search.js
+++ b/view/theme/diabook/js/jquery.twitter.search.js
@@ -202,7 +202,7 @@
                        // default styling
                        a:     { textDecoration: 'none', color: '#3B5998' },
                        bird:  { width: '50px', height: '20px', position: 'absolute', left: '-30px', top: '-20px', border: 'none' },
-                       container: { overflow: 'hidden', backgroundColor: '', height: '600px' },
+                       container: { overflow: 'hidden', backgroundColor: '', height: '600px', width: '170px' },
                        fail:  { background: '#6cc5c3 url(http://cloud.github.com/downloads/malsup/twitter/failwhale.png) no-repeat 50% 50%', height: '100%', padding: '10px' },
                        frame: { border: '0px solid #C2CFF1', borderRadius: '0px', '-moz-border-radius': '0px', '-webkit-border-radius': '0px' },
                        tweet: { padding: '5px 10px', clear: 'left' },

diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php
index 15c0794fa030e71a0ea8753d170c411f0ed3379d..f1e4d0ba024fb753de3ddd08433643e0b3b32943 100755 (executable)
--- a/view/theme/diabook/theme.php
+++ b/view/theme/diabook/theme.php
@@ -391,8 +391,8 @@ if ($color=="dark") $color_path = "/diabook-dark/";
        );
        
        function open_boxsettings() {
-               $("div#boxsettings").attr("style","display: block;height:500px;width:450px;");
-               $("label").attr("style","width: 350px;");
+               $("div#boxsettings").attr("style","display: block;height:500px;width:300px;");
+               $("label").attr("style","width: 150px;");
                };
         
        </script>';}
@@ -660,26 +660,28 @@ if ($color=="dark") $color_path = "/diabook-dark/";
        $close_lastusers = get_pconfig(local_user(), 'diabook', 'close_lastusers' );
        $close_lastphotos = get_pconfig(local_user(), 'diabook', 'close_lastphotos' );
        $close_lastlikes = get_pconfig(local_user(), 'diabook', 'close_lastlikes' );
-       $close_pagesC = array('1'=>'hide',      '0'=>'show',);
-       $close_mapqueryC = array('1'=>'hide',   '0'=>'show',);
-       $close_profilesC = array('0'=>'show',   '1'=>'hide',);
-       $close_helpersC = array('0'=>'show',    '1'=>'hide',);
-       $close_servicesC = array('0'=>'show',   '1'=>'hide',);
-       $close_friendsC = array('0'=>'show',    '1'=>'hide',);
-       $close_twitterC = array('1'=>'hide',    '0'=>'show',);
-       $close_lastusersC = array('0'=>'show',  '1'=>'hide',);
-       $close_lastphotosC = array('0'=>'show','1'=>'hide',);
-       $close_lastlikesC = array('0'=>'show',  '1'=>'hide',);
-       $aside['$close_pages'] = array('diabook_close_pages', t('Show "Cummunity Pages" at right-hand coloumn?'), $close_pages, '', $close_pagesC);     
-       $aside['$close_mapquery'] = array('diabook_close_mapquery', t('Show "Earth Layers" at right-hand coloumn?'), $close_mapquery, '', $close_mapqueryC);            
-       $aside['$close_profiles'] = array('diabook_close_profiles', t('Show "Cummunity Profiles" at right-hand coloumn?'), $close_profiles, '', $close_profilesC);              
-       $aside['$close_helpers'] = array('diabook_close_helpers', t('Show "Help or @NewHere" at right-hand coloumn?'), $close_helpers, '', $close_helpersC);
-       $aside['$close_services'] = array('diabook_close_services', t('Show "Connect Services" at right-hand coloumn?'), $close_services, '', $close_servicesC);                        
-       $aside['$close_friends'] = array('diabook_close_friends', t('Show "Find Friends" at right-hand coloumn?'), $close_friends, '', $close_friendsC);        
-       $aside['$close_twitter'] = array('diabook_close_twitter', t('Show "Last Tweets" at right-hand coloumn?'), $close_twitter, '', $close_twitterC);                 
-       $aside['$close_lastusers'] = array('diabook_close_lastusers', t('Show "Last Users" at right-hand coloumn?'), $close_lastusers, '', $close_lastusersC);                          
-       $aside['$close_lastphotos'] = array('diabook_close_lastphotos', t('Show "Last Photos" at right-hand coloumn?'), $close_lastphotos, '', $close_lastphotosC);                             
-       $aside['$close_lastlikes'] = array('diabook_close_lastlikes', t('Show "Last Likes" at right-hand coloumn?'), $close_lastlikes, '', $close_lastlikesC);          
+       $close_pagesC = array('1'=>t("don't show"),     '0'=>t("show"),);
+       $close_mapqueryC = array('1'=>t("don't show"),  '0'=>t("show"),);
+       $close_profilesC = array('1'=>t("don't show"),  '0'=>t("show"),);
+       $close_helpersC = array('1'=>t("don't show"),   '0'=>t("show"),);
+       $close_servicesC = array('1'=>t("don't show"),  '0'=>t("show"),);
+       $close_friendsC = array('1'=>t("don't show"),   '0'=>t("show"),);
+       $close_twitterC = array('1'=>t("don't show"),   '0'=>t("show"),);
+       $close_lastusersC = array('1'=>t("don't show"), '0'=>t("show"),);
+       $close_lastphotosC = array('1'=>t("don't show"),        '0'=>t("show"),);
+       $close_lastlikesC = array('1'=>t("don't show"), '0'=>t("show"),);
+       $boxsettings['title'] = Array("", t('Show/hide boxes at right-hand coloumn:'), "", "");
+       $aside['$boxsettings'] = $boxsettings;
+       $aside['$close_pages'] = array('diabook_close_pages', t('Community Pages'), $close_pages, '', $close_pagesC);   
+       $aside['$close_mapquery'] = array('diabook_close_mapquery', t('Earth Layers'), $close_mapquery, '', $close_mapqueryC);          
+       $aside['$close_profiles'] = array('diabook_close_profiles', t('Community Profiles'), $close_profiles, '', $close_profilesC);            
+       $aside['$close_helpers'] = array('diabook_close_helpers', t('Help or @NewHere ?'), $close_helpers, '', $close_helpersC);
+       $aside['$close_services'] = array('diabook_close_services', t('Connect Services'), $close_services, '', $close_servicesC);                      
+       $aside['$close_friends'] = array('diabook_close_friends', t('Find Friends'), $close_friends, '', $close_friendsC);      
+       $aside['$close_twitter'] = array('diabook_close_twitter', t('Last Tweets'), $close_twitter, '', $close_twitterC);                       
+       $aside['$close_lastusers'] = array('diabook_close_lastusers', t('Last users'), $close_lastusers, '', $close_lastusersC);                                
+       $aside['$close_lastphotos'] = array('diabook_close_lastphotos', t('Last photos'), $close_lastphotos, '', $close_lastphotosC);                           
+       $aside['$close_lastlikes'] = array('diabook_close_lastlikes', t('Last likes'), $close_lastlikes, '', $close_lastlikesC);                
    $aside['$sub'] = t('Submit');
    $baseurl = $a->get_baseurl($ssl_state); 
    $aside['$baseurl'] = $baseurl;
@@ -694,7 +696,6 @@ if ($color=="dark") $color_path = "/diabook-dark/";
                set_pconfig(local_user(), 'diabook', 'close_lastusers', $_POST['diabook_close_lastusers']);
                set_pconfig(local_user(), 'diabook', 'close_lastphotos', $_POST['diabook_close_lastphotos']);
                set_pconfig(local_user(), 'diabook', 'close_lastlikes', $_POST['diabook_close_lastlikes']);     
-               header("Location: network");
                }
        }
    $close = t('Settings');

diff --git a/view/theme/diabook/theme_settings.tpl b/view/theme/diabook/theme_settings.tpl
index 68b22a16853d8b520e89633bce01f532bdd87ae5..ad024dfe998f033384abf3234db9768f800eae88 100644 (file)
--- a/view/theme/diabook/theme_settings.tpl
+++ b/view/theme/diabook/theme_settings.tpl
@@ -6,18 +6,11 @@
 
 {{inc field_select.tpl with $field=$resolution}}{{endinc}}
 
-{{inc field_input.tpl with $field=$TSearchTerm}}{{endinc}}
-
-{{inc field_input.tpl with $field=$ELPosX}}{{endinc}}
-
-{{inc field_input.tpl with $field=$ELPosY}}{{endinc}}
-
-{{inc field_input.tpl with $field=$ELZoom}}{{endinc}}
-
 <div class="settings-submit-wrapper">
        <input type="submit" value="$submit" class="settings-submit" name="diabook-settings-submit" />
 </div>
-
+<br>
+<h3>Show/hide boxes at right-hand column</h3>
 {{inc field_select.tpl with $field=$close_pages}}{{endinc}}
 {{inc field_select.tpl with $field=$close_profiles}}{{endinc}}
 {{inc field_select.tpl with $field=$close_helpers}}{{endinc}}
@@ -27,13 +20,22 @@
 {{inc field_select.tpl with $field=$close_lastphotos}}{{endinc}}
 {{inc field_select.tpl with $field=$close_lastlikes}}{{endinc}}
 {{inc field_select.tpl with $field=$close_twitter}}{{endinc}}
+{{inc field_input.tpl with $field=$TSearchTerm}}{{endinc}}
 {{inc field_select.tpl with $field=$close_mapquery}}{{endinc}}
 
+{{inc field_input.tpl with $field=$ELPosX}}{{endinc}}
+
+{{inc field_input.tpl with $field=$ELPosY}}{{endinc}}
+
+{{inc field_input.tpl with $field=$ELZoom}}{{endinc}}
+
 <div class="settings-submit-wrapper">
        <input type="submit" value="$submit" class="settings-submit" name="diabook-settings-submit" />
 </div>
 
+<br>
+
 <div class="field select">
-<a onClick="restore_boxes()" title="Restore order at right-hand column" style="cursor: pointer;">Restore order at right-hand column</a>
+<a onClick="restore_boxes()" title="Restore boxorder at right-hand column" style="cursor: pointer;">Restore boxorder at right-hand column</a>
 </div>