diff options
Diffstat (limited to 'view/theme/diabook')
| -rwxr-xr-x | view/theme/diabook/communityhome.tpl | 2 | ||||
| -rw-r--r-- | view/theme/diabook/config.php | 36 | ||||
| -rw-r--r-- | view/theme/diabook/diabook-dark/style-network.css | 2 | ||||
| -rw-r--r-- | view/theme/diabook/diabook-dark/style.css | 17 | ||||
| -rw-r--r-- | view/theme/diabook/js/jquery.twitter.search.js | 2 | ||||
| -rwxr-xr-x | view/theme/diabook/theme.php | 53 | ||||
| -rw-r--r-- | view/theme/diabook/theme_settings.tpl | 22 |
7 files changed, 71 insertions, 63 deletions
diff --git a/view/theme/diabook/communityhome.tpl b/view/theme/diabook/communityhome.tpl index 60d4646cc..17acc1eab 100755 --- 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 84dd64834..cc7da1b00 100644 --- 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', @@ -196,18 +196,18 @@ function diabook_form(&$a, $font_size, $line_height, $resolution, $color, $TSear '$color' => array('diabook_color', t('Set color scheme'), $color, '', $colors), '$TSearchTerm' => array('diabook_TSearchTerm', t('Set twitter search term'), $TSearchTerm, '', $TSearchTerm), '$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), + '$ELPosX' => array('diabook_ELPosX', t('Set longitude (X) for Earth Layers'), $ELPosX, '', $ELPosX), + '$ELPosY' => array('diabook_ELPosY', t('Set latitude (Y) for Earth Layers'), $ELPosY, '', $ELPosY), + '$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/diabook-dark/style-network.css b/view/theme/diabook/diabook-dark/style-network.css index d9e2d0094..678e8597c 100644 --- a/view/theme/diabook/diabook-dark/style-network.css +++ b/view/theme/diabook/diabook-dark/style-network.css @@ -831,7 +831,7 @@ ul.menu-popup .empty { box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); } .acpopupitem { - color: #2e2f2e; + color: #eec; padding: 4px; clear: left; } diff --git a/view/theme/diabook/diabook-dark/style.css b/view/theme/diabook/diabook-dark/style.css index 24d319f8a..189bd30bf 100644 --- a/view/theme/diabook/diabook-dark/style.css +++ b/view/theme/diabook/diabook-dark/style.css @@ -3,10 +3,7 @@ * Additional Changes: Michael Vogel <icarus@dabo.de> **/ -/* ========= */ -/* = Admin = */ -/* ========= */ - +/** Fancy Box **/ #fancybox-content { width: 0; height: 0; @@ -19,6 +16,11 @@ background: #2e2e2f !important; } + +/* ========= */ +/* = Admin = */ +/* ========= */ + #adminpage { /* width: 80%;*/ } @@ -633,7 +635,7 @@ header #banner #logo-text { text-decoration: none; } .mail-list-wrapper { - background-color: #eec; + background-color: #333; margin-bottom: 5px; width: 100%; height: auto; @@ -644,6 +646,7 @@ header #banner #logo-text { float: left; width: 20%; overflow: hidden; + background: #2e2e2f; } .mail-list-wrapper .mail-subject { width: 30%; @@ -915,7 +918,7 @@ nav #nav-apps-link.selected { } .notify-seen { - background: none repeat scroll 0 0 #DDDDDD; + background: none repeat scroll 0 0 #666; } ul.menu-popup { @@ -1685,7 +1688,7 @@ body .pageheader{ .wall-item-comment-wrapper .comment-edit-text-full { font-size: 14px; height: 4em; - color: #2e302e; + color: #eec; border: 1px solid #2e302e; } .comment-edit-preview { diff --git a/view/theme/diabook/js/jquery.twitter.search.js b/view/theme/diabook/js/jquery.twitter.search.js index d3ccfe68e..a57bd255d 100644 --- 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 15c0794fa..7336383d7 100755 --- 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>';} @@ -608,9 +608,9 @@ if ($color=="dark") $color_path = "/diabook-dark/"; $ELZoom = get_pconfig(local_user(), 'diabook', 'ELZoom' ); $ELPosX = get_pconfig(local_user(), 'diabook', 'ELPosX' ); $ELPosY = get_pconfig(local_user(), 'diabook', 'ELPosY' ); - $aside['$ELZoom'] = array('diabook_ELZoom', t('Set zoomfactor for Earth Layer'), $ELZoom, '', $ELZoom); - $aside['$ELPosX'] = array('diabook_ELPosX', t('Set longitude (X) for Earth Layer'), $ELPosX, '', $ELPosX); - $aside['$ELPosY'] = array('diabook_ELPosY', t('Set latitude (Y) for Earth Layer'), $ELPosY, '', $ELPosY); + $aside['$ELZoom'] = array('diabook_ELZoom', t('Set zoomfactor for Earth Layers'), $ELZoom, '', $ELZoom); + $aside['$ELPosX'] = array('diabook_ELPosX', t('Set longitude (X) for Earth Layers'), $ELPosX, '', $ELPosX); + $aside['$ELPosY'] = array('diabook_ELPosY', t('Set latitude (Y) for Earth Layers'), $ELPosY, '', $ELPosY); if (isset($_POST['diabook-settings-map-sub']) && $_POST['diabook-settings-map-sub']!=''){ set_pconfig(local_user(), 'diabook', 'ELZoom', $_POST['diabook_ELZoom']); set_pconfig(local_user(), 'diabook', 'ELPosX', $_POST['diabook_ELPosX']); @@ -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 column:'), "", ""); + $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 68b22a168..ad024dfe9 100644 --- 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> |