diff options
| author | zottel <github@zottel.net> | 2012-04-15 14:11:11 +0200 |
|---|---|---|
| committer | zottel <github@zottel.net> | 2012-04-15 14:11:11 +0200 |
| commit | a2c4ce74871dbe9e640cdeafc1574bda5b7fe144 (patch) | |
| tree | fce1c1b2d497adae72d77e09c6bf005c8900256b /view | |
| parent | 0bad8de0562a50fa93b0af5fd4cf8d7123a11b46 (diff) | |
| parent | f299749758112361ee6384cd75d11b2c3a57352a (diff) | |
| download | volse-hubzilla-a2c4ce74871dbe9e640cdeafc1574bda5b7fe144.tar.gz volse-hubzilla-a2c4ce74871dbe9e640cdeafc1574bda5b7fe144.tar.bz2 volse-hubzilla-a2c4ce74871dbe9e640cdeafc1574bda5b7fe144.zip | |
Merge remote branch 'upstream/master'
Diffstat (limited to 'view')
304 files changed, 4431 insertions, 4394 deletions
diff --git a/view/admin_plugins_details.tpl b/view/admin_plugins_details.tpl index cbaef2d66..aaa366f65 100644 --- a/view/admin_plugins_details.tpl +++ b/view/admin_plugins_details.tpl @@ -17,7 +17,7 @@ </p> {{ if $screenshot }} - <a href="$screenshot.0" ><img src="$screenshot.0" width="320" height="240" alt="$screenshot.1" /></a> + <a href="$screenshot.0" class='screenshot'><img src="$screenshot.0" alt="$screenshot.1" /></a> {{ endif }} {{ if $admin_form }} diff --git a/view/admin_site.tpl b/view/admin_site.tpl index 01fe893c6..9de6bd9c5 100644 --- a/view/admin_site.tpl +++ b/view/admin_site.tpl @@ -1,3 +1,39 @@ +<script> + $(function(){ + + $("#cnftheme").fancybox({ + width: 800, + autoDimensions: false, + onStart: function(){ + var theme = $("#id_theme :selected").val(); + $("#cnftheme").attr('href',"$baseurl/admin/themes/"+theme); + }, + onComplete: function(){ + $("div#fancybox-content form").submit(function(e){ + var url = $(this).attr('action'); + // can't get .serialize() to work... + var data={}; + $(this).find("input").each(function(){ + data[$(this).attr('name')] = $(this).val(); + }); + $(this).find("select").each(function(){ + data[$(this).attr('name')] = $(this).children(":selected").val(); + }); + console.log(":)", url, data); + + $.post(url, data, function(data) { + if(timer) clearTimeout(timer); + NavUpdate(); + $.fancybox.close(); + }) + + return false; + }); + + } + }); + }); +</script> <div id='adminpage'> <h1>$title - $page</h1> @@ -17,7 +53,6 @@ {{ inc field_checkbox.tpl with $field=$no_multi_reg }}{{ endinc }} {{ inc field_checkbox.tpl with $field=$no_openid }}{{ endinc }} - {{ inc field_checkbox.tpl with $field=$no_gravatar }}{{ endinc }} {{ inc field_checkbox.tpl with $field=$no_regfullname }}{{ endinc }} <div class="submit"><input type="submit" name="page_site" value="$submit" /></div> diff --git a/view/auto_request.tpl b/view/auto_request.tpl index 2958397c9..961de9bb3 100644 --- a/view/auto_request.tpl +++ b/view/auto_request.tpl @@ -7,7 +7,7 @@ $page_desc<br /> <li><a href="http://friendica.com" title="$friendica">$friendica</a></li> <li><a href="http://joindiaspora.com" title="$diaspora">$diaspora</a> $diasnote</li> <li><a href="http://ostatus.org" title="$public_net" >$statusnet</a></li> -<li>$emailnet</li> +{{ if $emailnet }}<li>$emailnet</li>{{ endif }} </ul> </p> <p> diff --git a/view/contact_head.tpl b/view/contact_head.tpl index a76293a68..9cfd81710 100644 --- a/view/contact_head.tpl +++ b/view/contact_head.tpl @@ -2,10 +2,9 @@ src="$baseurl/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js"></script> <script language="javascript" type="text/javascript"> - tinyMCE.init({ theme : "advanced", - mode : "exact", + mode : "$editselect", elements: "contact-edit-info", plugins : "bbcode", theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor", diff --git a/view/de/messages.po b/view/de/messages.po index c67aebb76..c834ec328 100644 --- a/view/de/messages.po +++ b/view/de/messages.po @@ -4161,7 +4161,7 @@ msgstr "Fehler: der angegebene API Schlüssel scheint nicht korrekt zu sein (Zug #: ../../addon/facebook/facebook.php:665 msgid "The given API Key seems to work correctly." -msgstr "Der angegebene API Schlüssel scheint nicht korrekt zu funktionieren." +msgstr "Der angegebene API Schlüssel scheint korrekt zu funktionieren." #: ../../addon/facebook/facebook.php:667 msgid "" @@ -6405,7 +6405,7 @@ msgstr "Willkommen zurück " #: ../../include/security.php:329 msgid "" "The form security token was not correct. This probably happened because the " -"form has been opened for too long (>3 hours) before subitting it." +"form has been opened for too long (>3 hours) before submitting it." msgstr "Der Formular-Sicherheits-Token war nicht korrekt. Der Grund ist wahrscheinlich, dass das Formular zu lange (>3 Stunden) offen war, bevor es abgeschickt wurde." #: ../../include/Contact.php:137 ../../include/conversation.php:813 diff --git a/view/de/strings.php b/view/de/strings.php index 3b9601aca..6a43f049e 100644 --- a/view/de/strings.php +++ b/view/de/strings.php @@ -777,7 +777,7 @@ $a->strings["{0} tagged %s's post with #%s"] = "{0} hat %ss Beitrag mit dem Schl $a->strings["{0} mentioned you in a post"] = "{0} hat dich in einem Beitrag erwähnt"; $a->strings["OpenID protocol error. No ID returned."] = "OpenID Protokollfehler. Keine ID zurückgegeben."; $a->strings["Account not found and OpenID registration is not permitted on this site."] = "Account wurde nicht gefunden und OpenID Registrierung auf diesem Server nicht gestattet."; -$a->strings["Login failed."] = "Annmeldung fehlgeschlagen."; +$a->strings["Login failed."] = "Anmeldung fehlgeschlagen."; $a->strings["Connect URL missing."] = "Connect-URL fehlt"; $a->strings["This site is not configured to allow communications with other networks."] = "Diese Seite ist so konfiguriert, dass keine Kommunikation mit anderen Netzwerken erfolgen kann."; $a->strings["No compatible communication protocols or feeds were discovered."] = "Es wurden keine kompatiblen Kommunikationsprotokolle oder Feeds gefunden."; @@ -924,7 +924,7 @@ $a->strings["Facebook Connector Settings"] = "Facebook-Verbindungseinstellungen" $a->strings["Facebook API Key"] = "Facebook API Schlüssel"; $a->strings["Error: it appears that you have specified the App-ID and -Secret in your .htconfig.php file. As long as they are specified there, they cannot be set using this form.<br><br>"] = "Fehler: du scheinst die App-ID und das App-Geheimnis in deiner .htconfig.php Datei angegeben zu haben. Solange sie dort festgelegt werden kannst du dieses Formular hier nicht verwenden.<br><br>"; $a->strings["Error: the given API Key seems to be incorrect (the application access token could not be retrieved)."] = "Fehler: der angegebene API Schlüssel scheint nicht korrekt zu sein (Zugriffstoken konnte nicht empfangen werden)."; -$a->strings["The given API Key seems to work correctly."] = "Der angegebene API Schlüssel scheint nicht korrekt zu funktionieren."; +$a->strings["The given API Key seems to work correctly."] = "Der angegebene API Schlüssel scheint korrekt zu funktionieren."; $a->strings["The correctness of the API Key could not be detected. Somthing strange's going on."] = "Die Echtheit des API Schlüssels konnte nicht überprüft werden. Etwas Merkwürdiges ist hier im Gange."; $a->strings["App-ID / API-Key"] = "App-ID / API-Key"; $a->strings["Application secret"] = "Anwendungs-Geheimnis"; @@ -1441,7 +1441,7 @@ $a->strings["image/photo"] = "Bild/Foto"; $a->strings["Welcome "] = "Willkommen "; $a->strings["Please upload a profile photo."] = "Bitte lade ein Profilbild hoch."; $a->strings["Welcome back "] = "Willkommen zurück "; -$a->strings["The form security token was not correct. This probably happened because the form has been opened for too long (>3 hours) before subitting it."] = "Der Formular-Sicherheits-Token war nicht korrekt. Der Grund ist wahrscheinlich, dass das Formular zu lange (>3 Stunden) offen war, bevor es abgeschickt wurde."; +$a->strings["The form security token was not correct. This probably happened because the form has been opened for too long (>3 hours) before submitting it."] = "Der Formular-Sicherheits-Token war nicht korrekt. Der Grund ist wahrscheinlich, dass das Formular zu lange (>3 Stunden) offen war, bevor es abgeschickt wurde."; $a->strings["View status"] = "Status anzeigen"; $a->strings["View profile"] = "Profil anzeigen"; $a->strings["View photos"] = "Fotos ansehen"; @@ -1511,3 +1511,4 @@ $a->strings["[today]"] = "[heute]"; $a->strings["Event Reminders"] = "Veranstaltungserinnerungen"; $a->strings["Events this week:"] = "Veranstaltungen diese Woche"; $a->strings["[No description]"] = "[keine Beschreibung]"; +$a->strings['Update Error at %s'] = 'Fehler beim Updaten von %s'; diff --git a/view/de/update_fail_eml.tpl b/view/de/update_fail_eml.tpl new file mode 100644 index 000000000..26be1786f --- /dev/null +++ b/view/de/update_fail_eml.tpl @@ -0,0 +1,12 @@ +Hey,
+Ich bin's, $sitename.
+Die Friendica-Entwickler haben gerade Update $update freigegeben,
+aber als ich es installieren wollte, ist irgendetwas schief gegangen.
+Das sollte schnell repariert werden und alleine schaffe ich es nicht.
+Wende dich bitte an einen Friendica-Entwickler, wenn du mir nicht selbst helfen kannst.
+Meine Datenbank könnte ziemlich durcheinander sein.
+
+Die Fehlermeldung ist '$error'.
+
+Tut mir leid,
+dein Friendica Server unter $siteurl
\ No newline at end of file diff --git a/view/dfrn_request.tpl b/view/dfrn_request.tpl index d8aa8b181..bd3bcbc42 100644 --- a/view/dfrn_request.tpl +++ b/view/dfrn_request.tpl @@ -7,7 +7,7 @@ $page_desc<br /> <li><a href="http://friendica.com" title="$friendica">$friendica</a></li> <li><a href="http://joindiaspora.com" title="$diaspora">$diaspora</a> $diasnote</li> <li><a href="http://ostatus.org" title="$public_net" >$statusnet</a></li> -<li>$emailnet</li> +{{ if $emailnet }}<li>$emailnet</li>{{ endif }} </ul> $invite_desc </p> diff --git a/view/field_checkbox.tpl b/view/field_checkbox.tpl index 725df4cdf..afab29243 100644 --- a/view/field_checkbox.tpl +++ b/view/field_checkbox.tpl @@ -1,6 +1,6 @@ <div class='field checkbox'> <label for='id_$field.0'>$field.1</label> - <input type="checkbox" name='$field.0' id='id_$field.0' value="1" {{ if $field.2 }}checked="true"{{ endif }}> + <input type="checkbox" name='$field.0' id='id_$field.0' value="1" {{ if $field.2 }}checked="checked"{{ endif }}> <span class='field_help'>$field.3</span> </div> diff --git a/view/field_themeselect.tpl b/view/field_themeselect.tpl index f9f99492c..5847d8664 100644 --- a/view/field_themeselect.tpl +++ b/view/field_themeselect.tpl @@ -1,4 +1,4 @@ - + <script>$(function(){ previewTheme($("#id_$field.0")[0]); });</script> <div class='field select'> <label for='id_$field.0'>$field.1</label> <select name='$field.0' id='id_$field.0' onchange="previewTheme(this);" > diff --git a/view/generic_links_widget.tpl b/view/generic_links_widget.tpl new file mode 100644 index 000000000..45813b876 --- /dev/null +++ b/view/generic_links_widget.tpl @@ -0,0 +1,11 @@ +<div class="widget"> + {{if $title}}<h3>$title</h3>{{endif}} + {{if $desc}}<div class="desc">$desc</div>{{endif}} + + <ul> + {{ for $items as $item }} + <li class="tool"><a href="$item.url" class="{{ if $item.selected }}selected{{ endif }}">$item.label</a></li> + {{ endfor }} + </ul> + +</div> diff --git a/view/group_side.tpl b/view/group_side.tpl index 0353b1d2c..ebb194d9c 100644 --- a/view/group_side.tpl +++ b/view/group_side.tpl @@ -23,6 +23,11 @@ <div id="sidebar-new-group"> <a href="group/new">$createtext</a> </div> + {{ if $ungrouped }} + <div id="sidebar-ungrouped"> + <a href="nogroup">$ungrouped</a> + </div> + {{ endif }} </div> diff --git a/view/lang_selector.tpl b/view/lang_selector.tpl new file mode 100644 index 000000000..b3a527b40 --- /dev/null +++ b/view/lang_selector.tpl @@ -0,0 +1,10 @@ +<div id="lang-select-icon" class="icon s22 language" title="$title" onclick="openClose('language-selector');" >lang</div> +<div id="language-selector" style="display: none;" > + <form action="#" method="post" > + <select name="system_language" onchange="this.form.submit();" > + {{ for $langs.0 as $v=>$l }} + <option value="$v" {{if $v==$langs.1}}selected="selected"{{endif}}>$l</option> + {{ endfor }} + </select> + </form> +</div> diff --git a/view/nogroup-template.tpl b/view/nogroup-template.tpl new file mode 100644 index 000000000..dd00ed097 --- /dev/null +++ b/view/nogroup-template.tpl @@ -0,0 +1,12 @@ +<h1>$header</h1> + +{{ for $contacts as $contact }} + {{ inc contact_template.tpl }}{{ endinc }} +{{ endfor }} +<div id="contact-edit-end"></div> + +$paginate + + + + diff --git a/view/peoplefind.tpl b/view/peoplefind.tpl index eeae2a29a..3c2692d25 100644 --- a/view/peoplefind.tpl +++ b/view/peoplefind.tpl @@ -6,6 +6,7 @@ </form> <div class="side-link" id="side-match-link"><a href="match" >$similar</a></div> <div class="side-link" id="side-suggest-link"><a href="suggest" >$suggest</a></div> + <div class="side-link" id="side-random-profile-link" ><a href="randprof" target="extlink" >$random</a></div> {{ if $inv }} <div class="side-link" id="side-invite-link" ><a href="invite" >$inv</a></div> {{ endif }} diff --git a/view/profed_head.tpl b/view/profed_head.tpl index a3267d591..2477654b3 100644 --- a/view/profed_head.tpl +++ b/view/profed_head.tpl @@ -5,7 +5,7 @@ tinyMCE.init({ theme : "advanced", - mode : "textareas", + mode : "$editselect", plugins : "bbcode,paste", theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code", theme_advanced_buttons2 : "", diff --git a/view/profile_edit.tpl b/view/profile_edit.tpl index e5c7162d0..2139fcf13 100644 --- a/view/profile_edit.tpl +++ b/view/profile_edit.tpl @@ -159,7 +159,7 @@ $sexual $lbl_about </p> -<textarea rows="10" cols="72" id="profile-jot-text" name="about" >$about</textarea> +<textarea rows="10" cols="72" id="profile-about-text" name="about" >$about</textarea> </div> <div id="about-jot-end"></div> diff --git a/view/settings.tpl b/view/settings.tpl index 8753474af..59c669a87 100644 --- a/view/settings.tpl +++ b/view/settings.tpl @@ -1,5 +1,3 @@ -$tabs - <h1>$ptitle</h1> $nickname_block @@ -101,7 +99,13 @@ $unkmail <h3 class="settings-heading">$h_not</h3> -<div id="settings-notify-desc">$lbl_not </div> +<strong>$activity_options</strong> + +{{inc field_checkbox.tpl with $field=$post_newfriend }}{{endinc}} +{{inc field_checkbox.tpl with $field=$post_profilechange }}{{endinc}} + + +<div id="settings-notify-desc"><strong>$lbl_not </strong></div> <div class="group"> {{inc field_intcheckbox.tpl with $field=$notify1 }}{{endinc}} diff --git a/view/settings_addons.tpl b/view/settings_addons.tpl index 28fca5362..84171dc8d 100644 --- a/view/settings_addons.tpl +++ b/view/settings_addons.tpl @@ -1,5 +1,3 @@ -$tabs - <h1>$title</h1> diff --git a/view/settings_connectors.tpl b/view/settings_connectors.tpl index 43c0346bb..bd3d60f0f 100644 --- a/view/settings_connectors.tpl +++ b/view/settings_connectors.tpl @@ -1,5 +1,3 @@ -$tabs - <h1>$title</h1> <div class="connector_statusmsg">$diasp_enabled</div> diff --git a/view/settings_display.tpl b/view/settings_display.tpl index fc7a56c8a..70895a1f8 100644 --- a/view/settings_display.tpl +++ b/view/settings_display.tpl @@ -1,5 +1,3 @@ -$tabs - <h1>$ptitle</h1> <form action="settings/display" id="settings-form" method="post" autocomplete="off" > diff --git a/view/settings_oauth.tpl b/view/settings_oauth.tpl index da1398ab9..890c4ee6c 100644 --- a/view/settings_oauth.tpl +++ b/view/settings_oauth.tpl @@ -1,5 +1,3 @@ -$tabs - <h1>$title</h1> diff --git a/view/settings_oauth_edit.tpl b/view/settings_oauth_edit.tpl index d29341386..e6f2abdc2 100644 --- a/view/settings_oauth_edit.tpl +++ b/view/settings_oauth_edit.tpl @@ -1,5 +1,3 @@ -$tabs - <h1>$title</h1> <form method="POST"> diff --git a/view/theme/diabook-aerith/comment_item.tpl b/view/theme/diabook-aerith/comment_item.tpl new file mode 100644 index 000000000..47046c371 --- /dev/null +++ b/view/theme/diabook-aerith/comment_item.tpl @@ -0,0 +1,41 @@ + <div class="comment-wwedit-wrapper" id="comment-edit-wrapper-$id" style="display: block;"> + <form class="comment-edit-form" id="comment-edit-form-$id" action="item" method="post" onsubmit="post_comment($id); return false;"> + <input type="hidden" name="type" value="$type" /> + <input type="hidden" name="profile_uid" value="$profile_uid" /> + <input type="hidden" name="parent" value="$parent" /> + <input type="hidden" name="return" value="$return_path" /> + <input type="hidden" name="jsreload" value="$jsreload" /> + <input type="hidden" name="preview" id="comment-preview-inp-$id" value="0" /> + + <div class="comment-edit-photo" id="comment-edit-photo-$id" > + <a class="comment-edit-photo-link" href="$mylink" title="$mytitle"><img class="my-comment-photo" src="$myphoto" alt="$mytitle" title="$mytitle" /></a> + </div> + <div class="comment-edit-photo-end"></div> + <textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);tautogrow($id)" onBlur="commentClose(this,$id);" >$comment</textarea> + <a class="icon bb-image" onclick="insertFormatting('$comment','img',$id);">img</a> + <a class="icon bb-url" onclick="insertFormatting('$comment','url',$id);">url</a> + <a class="icon bb-video" onclick="insertFormatting('$comment','video',$id);">video</a> + <a class="icon underline" onclick="insertFormatting('$comment','u',$id);">u</a> + <a class="icon italic" onclick="insertFormatting('$comment','i',$id);">i</a> + <a class="icon bold" onclick="insertFormatting('$comment','b',$id);">b</a> + <a class="icon quote" onclick="insertFormatting('$comment','quote',$id);">quote</a> + {{ if $qcomment }} + <select id="qcomment-select-$id" name="qcomment-$id" class="qcomment" onchange="qCommentInsert(this,$id);" > + <option value=""></option> + {{ for $qcomment as $qc }} + <option value="$qc">$qc</option> + {{ endfor }} + </select> + {{ endif }} + + <div class="comment-edit-text-end"></div> + <div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-$id" style="display: none;" > + <input type="submit" onclick="post_comment($id); return false;" id="comment-edit-submit-$id" class="comment-edit-submit" name="submit" value="$submit" /> + <span onclick="preview_comment($id);" id="comment-edit-preview-link-$id" class="fakelink">$preview</span> + <div id="comment-edit-preview-$id" class="comment-edit-preview" style="display:none;"></div> + </div> + + <div class="comment-edit-end"></div> + </form> + + </div> diff --git a/view/theme/diabook-aerith/communityhome.tpl b/view/theme/diabook-aerith/communityhome.tpl index 4873cdd14..4873cdd14 100755..100644 --- a/view/theme/diabook-aerith/communityhome.tpl +++ b/view/theme/diabook-aerith/communityhome.tpl diff --git a/view/theme/diabook-aerith/config.php b/view/theme/diabook-aerith/config.php new file mode 100644 index 000000000..afd3119f2 --- /dev/null +++ b/view/theme/diabook-aerith/config.php @@ -0,0 +1,71 @@ +<?php +/** + * Theme settings + */ + + + +function theme_content(&$a){ + if(!local_user()) + return; + + $font_size = get_pconfig(local_user(), 'diabook-aerith', 'font_size' ); + $line_height = get_pconfig(local_user(), 'diabook-aerith', 'line_height' ); + + return diabook_form($a,$font_size, $line_height); +} + +function theme_post(&$a){ + if(! local_user()) + return; + + if (isset($_POST['diabook-aerith-settings-submit'])){ + set_pconfig(local_user(), 'diabook-aerith', 'font_size', $_POST['diabook-aerith_font_size']); + set_pconfig(local_user(), 'diabook-aerith', 'line_height', $_POST['diabook-aerith_line_height']); + } +} + + +function theme_admin(&$a){ + $font_size = get_config('diabook-aerith', 'font_size' ); + $line_height = get_config('diabook-aerith', 'line_height' ); + + return diabook_form($a,$font_size, $line_height); +} + +function theme_admin_post(&$a){ + if (isset($_POST['diabook-aerith-settings-submit'])){ + set_config('diabook-aerith', 'font_size', $_POST['diabook-aerith_font_size']); + set_config('diabook-aerith', 'line_height', $_POST['diabook-aerith_line_height']); + } +} + + +function diabook_form(&$a, $font_size, $line_height){ + $line_heights = array( + "1.4"=>"1.4", + "1.3"=>"1.3", + "1.2"=>"1.2", + "1.1"=>"1.1", + ); + + $font_sizes = array( + '14'=>'14', + '13.5'=>'13.5', + '13'=>'13', + '12.5'=>'12.5', + '12'=>'12', + ); + + + + $t = file_get_contents( dirname(__file__). "/theme_settings.tpl" ); + $o .= replace_macros($t, array( + '$submit' => t('Submit'), + '$baseurl' => $a->get_baseurl(), + '$title' => t("Theme settings"), + '$font_size' => array('diabook-aerith_font_size', t('Set font-size for posts and comments'), $font_size, '', $font_sizes), + '$line_height' => array('diabook-aerith_line_height', t('Set line-height for posts and comments'), $line_height, '', $line_heights), + )); + return $o; +} diff --git a/view/theme/diabook-aerith/contact_template.tpl b/view/theme/diabook-aerith/contact_template.tpl index 48930b48a..48930b48a 100755..100644 --- a/view/theme/diabook-aerith/contact_template.tpl +++ b/view/theme/diabook-aerith/contact_template.tpl diff --git a/view/theme/diabook-aerith/directory_item.tpl b/view/theme/diabook-aerith/directory_item.tpl index db1936e4b..db1936e4b 100755..100644 --- a/view/theme/diabook-aerith/directory_item.tpl +++ b/view/theme/diabook-aerith/directory_item.tpl diff --git a/view/theme/diabook-aerith/fpostit/fpostit.js b/view/theme/diabook-aerith/fpostit/fpostit.js index d183c7573..d183c7573 100755..100644 --- a/view/theme/diabook-aerith/fpostit/fpostit.js +++ b/view/theme/diabook-aerith/fpostit/fpostit.js diff --git a/view/theme/diabook-aerith/generic_links_widget.tpl b/view/theme/diabook-aerith/generic_links_widget.tpl new file mode 100644 index 000000000..001c1395e --- /dev/null +++ b/view/theme/diabook-aerith/generic_links_widget.tpl @@ -0,0 +1,11 @@ +<div id="widget_$title"> + {{if $title}}<h3 style="border-bottom: 1px solid #D2D2D2;">$title</h3>{{endif}} + {{if $desc}}<div class="desc">$desc</div>{{endif}} + + <ul class="rs_tabs"> + {{ for $items as $item }} + <li><a href="$item.url" class="rs_tab button {{ if $item.selected }}selected{{ endif }}">$item.label</a></li> + {{ endfor }} + </ul> + +</div> diff --git a/view/theme/diabook-aerith/group_side.tpl b/view/theme/diabook-aerith/group_side.tpl index af183d04d..642019049 100755..100644 --- a/view/theme/diabook-aerith/group_side.tpl +++ b/view/theme/diabook-aerith/group_side.tpl @@ -1,18 +1,18 @@ -<div id="group-sidebar" class="widget"> - <div class="title tool"> - <h3 class="label">$title</h3> - <a href="group/new" title="$createtext" class="action"><span class="icon text s16 add"></span></a> +<div id="profile_side" > + <div class=""> + <h3 style="margin-left: 2px;">$title<a href="group/new" title="$createtext" class="icon text_add"></a></h3> </div> <div id="sidebar-group-list"> - <ul> + <ul class="menu-profile-side"> {{ for $groups as $group }} - <li class="tool {{ if $group.selected }}selected{{ endif }}"> - <a href="$group.href" class="label"> + <li class="menu-profile-list"> + <span class="menu-profile-icon {{ if $group.selected }}group_selected{{else}}group_unselected{{ endif }}"></span> + <a href="$group.href" class="menu-profile-list-item"> $group.text </a> {{ if $group.edit }} - <a href="$group.edit.href" class="action"><span class="icon text s10 edit"></span></a> + <a href="$group.edit.href" class="action"><span class="icon text_edit" ></span></a> {{ endif }} {{ if $group.cid }} <input type="checkbox" diff --git a/view/theme/diabook-aerith/icons/attach.png b/view/theme/diabook-aerith/icons/attach.png Binary files differindex 1958041cf..1958041cf 100755..100644 --- a/view/theme/diabook-aerith/icons/attach.png +++ b/view/theme/diabook-aerith/icons/attach.png diff --git a/view/theme/diabook-aerith/icons/audio.png b/view/theme/diabook-aerith/icons/audio.png Binary files differindex 8d779a409..8d779a409 100755..100644 --- a/view/theme/diabook-aerith/icons/audio.png +++ b/view/theme/diabook-aerith/icons/audio.png diff --git a/view/theme/diabook-aerith/icons/bb-image.png b/view/theme/diabook-aerith/icons/bb-image.png Binary files differnew file mode 100644 index 000000000..9a1b32113 --- /dev/null +++ b/view/theme/diabook-aerith/icons/bb-image.png diff --git a/view/theme/diabook-aerith/icons/bb-url.png b/view/theme/diabook-aerith/icons/bb-url.png Binary files differnew file mode 100644 index 000000000..071fc1865 --- /dev/null +++ b/view/theme/diabook-aerith/icons/bb-url.png diff --git a/view/theme/diabook-aerith/icons/bb-video.png b/view/theme/diabook-aerith/icons/bb-video.png Binary files differnew file mode 100644 index 000000000..bd323531e --- /dev/null +++ b/view/theme/diabook-aerith/icons/bb-video.png diff --git a/view/theme/diabook-aerith/icons/bold.png b/view/theme/diabook-aerith/icons/bold.png Binary files differnew file mode 100644 index 000000000..8fab2a10f --- /dev/null +++ b/view/theme/diabook-aerith/icons/bold.png diff --git a/view/theme/diabook-aerith/icons/camera.png b/view/theme/diabook-aerith/icons/camera.png Binary files differindex a5c7f1236..a5c7f1236 100755..100644 --- a/view/theme/diabook-aerith/icons/camera.png +++ b/view/theme/diabook-aerith/icons/camera.png diff --git a/view/theme/diabook-aerith/icons/close_box.png b/view/theme/diabook-aerith/icons/close_box.png Binary files differindex 28e2675b8..28e2675b8 100755..100644 --- a/view/theme/diabook-aerith/icons/close_box.png +++ b/view/theme/diabook-aerith/icons/close_box.png diff --git a/view/theme/diabook-aerith/icons/com_side.png b/view/theme/diabook-aerith/icons/com_side.png Binary files differindex bc5969ef1..00186ba05 100644 --- a/view/theme/diabook-aerith/icons/com_side.png +++ b/view/theme/diabook-aerith/icons/com_side.png diff --git a/view/theme/diabook-aerith/icons/contacts.png b/view/theme/diabook-aerith/icons/contacts.png Binary files differindex cd0e289a7..79f6d497c 100644 --- a/view/theme/diabook-aerith/icons/contacts.png +++ b/view/theme/diabook-aerith/icons/contacts.png diff --git a/view/theme/diabook-aerith/icons/contacts3.png b/view/theme/diabook-aerith/icons/contacts3.png Binary files differnew file mode 100644 index 000000000..cd0e289a7 --- /dev/null +++ b/view/theme/diabook-aerith/icons/contacts3.png diff --git a/view/theme/diabook-aerith/icons/drop.png b/view/theme/diabook-aerith/icons/drop.png Binary files differindex 2abb82ef2..2abb82ef2 100755..100644 --- a/view/theme/diabook-aerith/icons/drop.png +++ b/view/theme/diabook-aerith/icons/drop.png diff --git a/view/theme/diabook-aerith/icons/events.png b/view/theme/diabook-aerith/icons/events.png Binary files differindex 4a0b3f3f1..cf195fbb6 100644 --- a/view/theme/diabook-aerith/icons/events.png +++ b/view/theme/diabook-aerith/icons/events.png diff --git a/view/theme/diabook-aerith/icons/file_as.png b/view/theme/diabook-aerith/icons/file_as.png Binary files differindex 16713fa53..16713fa53 100755..100644 --- a/view/theme/diabook-aerith/icons/file_as.png +++ b/view/theme/diabook-aerith/icons/file_as.png diff --git a/view/theme/diabook-aerith/icons/home.png b/view/theme/diabook-aerith/icons/home.png Binary files differindex be47a48fc..5c610805f 100644 --- a/view/theme/diabook-aerith/icons/home.png +++ b/view/theme/diabook-aerith/icons/home.png diff --git a/view/theme/diabook-aerith/icons/italic.png b/view/theme/diabook-aerith/icons/italic.png Binary files differnew file mode 100644 index 000000000..bf4b2b81d --- /dev/null +++ b/view/theme/diabook-aerith/icons/italic.png diff --git a/view/theme/diabook-aerith/icons/link.png b/view/theme/diabook-aerith/icons/link.png Binary files differindex 0ef666a67..0ef666a67 100755..100644 --- a/view/theme/diabook-aerith/icons/link.png +++ b/view/theme/diabook-aerith/icons/link.png diff --git a/view/theme/diabook-aerith/icons/lock.png b/view/theme/diabook-aerith/icons/lock.png Binary files differindex 7e34bf279..7e34bf279 100755..100644 --- a/view/theme/diabook-aerith/icons/lock.png +++ b/view/theme/diabook-aerith/icons/lock.png diff --git a/view/theme/diabook-aerith/icons/lupe.png b/view/theme/diabook-aerith/icons/lupe.png Binary files differindex f8b228347..f8b228347 100755..100644 --- a/view/theme/diabook-aerith/icons/lupe.png +++ b/view/theme/diabook-aerith/icons/lupe.png diff --git a/view/theme/diabook-aerith/icons/mess_side.png b/view/theme/diabook-aerith/icons/mess_side.png Binary files differindex 49ef896bc..5295e2e74 100644 --- a/view/theme/diabook-aerith/icons/mess_side.png +++ b/view/theme/diabook-aerith/icons/mess_side.png diff --git a/view/theme/diabook-aerith/icons/messages.png b/view/theme/diabook-aerith/icons/messages.png Binary files differindex e2bf7d24d..c83ba186a 100755..100644 --- a/view/theme/diabook-aerith/icons/messages.png +++ b/view/theme/diabook-aerith/icons/messages.png diff --git a/view/theme/diabook-aerith/icons/messages2.png b/view/theme/diabook-aerith/icons/messages2.png Binary files differindex e2bf7d24d..e2bf7d24d 100755..100644 --- a/view/theme/diabook-aerith/icons/messages2.png +++ b/view/theme/diabook-aerith/icons/messages2.png diff --git a/view/theme/diabook-aerith/icons/messages3.png b/view/theme/diabook-aerith/icons/messages3.png Binary files differnew file mode 100644 index 000000000..e2bf7d24d --- /dev/null +++ b/view/theme/diabook-aerith/icons/messages3.png diff --git a/view/theme/diabook-aerith/icons/next.png b/view/theme/diabook-aerith/icons/next.png Binary files differindex 7b5e25b90..7b5e25b90 100755..100644 --- a/view/theme/diabook-aerith/icons/next.png +++ b/view/theme/diabook-aerith/icons/next.png diff --git a/view/theme/diabook-aerith/icons/notes.png b/view/theme/diabook-aerith/icons/notes.png Binary files differindex 7d4afca90..28dca30a3 100644 --- a/view/theme/diabook-aerith/icons/notes.png +++ b/view/theme/diabook-aerith/icons/notes.png diff --git a/view/theme/diabook-aerith/icons/notifications.png b/view/theme/diabook-aerith/icons/notifications.png Binary files differindex 2b4fbb818..2bcd74927 100755..100644 --- a/view/theme/diabook-aerith/icons/notifications.png +++ b/view/theme/diabook-aerith/icons/notifications.png diff --git a/view/theme/diabook-aerith/icons/notifications3.png b/view/theme/diabook-aerith/icons/notifications3.png Binary files differnew file mode 100644 index 000000000..2b4fbb818 --- /dev/null +++ b/view/theme/diabook-aerith/icons/notifications3.png diff --git a/view/theme/diabook-aerith/icons/notify.png b/view/theme/diabook-aerith/icons/notify.png Binary files differindex 9765bfd53..159cd2c59 100755..100644 --- a/view/theme/diabook-aerith/icons/notify.png +++ b/view/theme/diabook-aerith/icons/notify.png diff --git a/view/theme/diabook-aerith/icons/notify2.png b/view/theme/diabook-aerith/icons/notify2.png Binary files differindex 9765bfd53..9765bfd53 100755..100644 --- a/view/theme/diabook-aerith/icons/notify2.png +++ b/view/theme/diabook-aerith/icons/notify2.png diff --git a/view/theme/diabook-aerith/icons/notify3.png b/view/theme/diabook-aerith/icons/notify3.png Binary files differnew file mode 100644 index 000000000..9765bfd53 --- /dev/null +++ b/view/theme/diabook-aerith/icons/notify3.png diff --git a/view/theme/diabook-aerith/icons/pencil.png b/view/theme/diabook-aerith/icons/pencil.png Binary files differindex 772e49b17..772e49b17 100755..100644 --- a/view/theme/diabook-aerith/icons/pencil.png +++ b/view/theme/diabook-aerith/icons/pencil.png diff --git a/view/theme/diabook-aerith/icons/photo-menu.jpg b/view/theme/diabook-aerith/icons/photo-menu.jpg Binary files differindex fde5eb535..fde5eb535 100755..100644 --- a/view/theme/diabook-aerith/icons/photo-menu.jpg +++ b/view/theme/diabook-aerith/icons/photo-menu.jpg diff --git a/view/theme/diabook-aerith/icons/prev.png b/view/theme/diabook-aerith/icons/prev.png Binary files differindex 55c1464ba..55c1464ba 100755..100644 --- a/view/theme/diabook-aerith/icons/prev.png +++ b/view/theme/diabook-aerith/icons/prev.png diff --git a/view/theme/diabook-aerith/icons/pscontacts.png b/view/theme/diabook-aerith/icons/pscontacts.png Binary files differindex acf857f32..23a78bcac 100644 --- a/view/theme/diabook-aerith/icons/pscontacts.png +++ b/view/theme/diabook-aerith/icons/pscontacts.png diff --git a/view/theme/diabook-aerith/icons/pubgroups.png b/view/theme/diabook-aerith/icons/pubgroups.png Binary files differindex 6d9539610..ae04194b1 100644 --- a/view/theme/diabook-aerith/icons/pubgroups.png +++ b/view/theme/diabook-aerith/icons/pubgroups.png diff --git a/view/theme/diabook-aerith/icons/quote.png b/view/theme/diabook-aerith/icons/quote.png Binary files differnew file mode 100644 index 000000000..a464f2859 --- /dev/null +++ b/view/theme/diabook-aerith/icons/quote.png diff --git a/view/theme/diabook-aerith/icons/recycle.png b/view/theme/diabook-aerith/icons/recycle.png Binary files differindex c3b8d2bf4..c3b8d2bf4 100755..100644 --- a/view/theme/diabook-aerith/icons/recycle.png +++ b/view/theme/diabook-aerith/icons/recycle.png diff --git a/view/theme/diabook-aerith/icons/remote.png b/view/theme/diabook-aerith/icons/remote.png Binary files differindex a560cc55e..a560cc55e 100755..100644 --- a/view/theme/diabook-aerith/icons/remote.png +++ b/view/theme/diabook-aerith/icons/remote.png diff --git a/view/theme/diabook-aerith/icons/scroll_top.png b/view/theme/diabook-aerith/icons/scroll_top.png Binary files differindex 0e7f7ae6a..0e7f7ae6a 100755..100644 --- a/view/theme/diabook-aerith/icons/scroll_top.png +++ b/view/theme/diabook-aerith/icons/scroll_top.png diff --git a/view/theme/diabook-aerith/icons/selected.png b/view/theme/diabook-aerith/icons/selected.png Binary files differindex 2a30ae252..3fcb95c29 100755..100644 --- a/view/theme/diabook-aerith/icons/selected.png +++ b/view/theme/diabook-aerith/icons/selected.png diff --git a/view/theme/diabook-aerith/icons/star.png b/view/theme/diabook-aerith/icons/star.png Binary files differindex 0b00cb189..0b00cb189 100755..100644 --- a/view/theme/diabook-aerith/icons/star.png +++ b/view/theme/diabook-aerith/icons/star.png diff --git a/view/theme/diabook-aerith/icons/starred.png b/view/theme/diabook-aerith/icons/starred.png Binary files differindex 2b82dfca3..2b82dfca3 100755..100644 --- a/view/theme/diabook-aerith/icons/starred.png +++ b/view/theme/diabook-aerith/icons/starred.png diff --git a/view/theme/diabook-aerith/icons/tagged.png b/view/theme/diabook-aerith/icons/tagged.png Binary files differindex 144649ef8..144649ef8 100755..100644 --- a/view/theme/diabook-aerith/icons/tagged.png +++ b/view/theme/diabook-aerith/icons/tagged.png diff --git a/view/theme/diabook-aerith/icons/underline.png b/view/theme/diabook-aerith/icons/underline.png Binary files differnew file mode 100644 index 000000000..b1b4d3574 --- /dev/null +++ b/view/theme/diabook-aerith/icons/underline.png diff --git a/view/theme/diabook-aerith/icons/unlock.png b/view/theme/diabook-aerith/icons/unlock.png Binary files differindex a0cda0ae5..a0cda0ae5 100755..100644 --- a/view/theme/diabook-aerith/icons/unlock.png +++ b/view/theme/diabook-aerith/icons/unlock.png diff --git a/view/theme/diabook-aerith/icons/unselected.png b/view/theme/diabook-aerith/icons/unselected.png Binary files differnew file mode 100644 index 000000000..9e9cead4b --- /dev/null +++ b/view/theme/diabook-aerith/icons/unselected.png diff --git a/view/theme/diabook-aerith/icons/unstarred.png b/view/theme/diabook-aerith/icons/unstarred.png Binary files differindex ba3183f5c..ba3183f5c 100755..100644 --- a/view/theme/diabook-aerith/icons/unstarred.png +++ b/view/theme/diabook-aerith/icons/unstarred.png diff --git a/view/theme/diabook-aerith/icons/video.png b/view/theme/diabook-aerith/icons/video.png Binary files differindex a03d1d818..a03d1d818 100755..100644 --- a/view/theme/diabook-aerith/icons/video.png +++ b/view/theme/diabook-aerith/icons/video.png diff --git a/view/theme/diabook-aerith/icons/weblink.png b/view/theme/diabook-aerith/icons/weblink.png Binary files differindex 216e78344..216e78344 100755..100644 --- a/view/theme/diabook-aerith/icons/weblink.png +++ b/view/theme/diabook-aerith/icons/weblink.png diff --git a/view/theme/diabook-aerith/jot.tpl b/view/theme/diabook-aerith/jot.tpl index ee30da7bf..ee30da7bf 100755..100644 --- a/view/theme/diabook-aerith/jot.tpl +++ b/view/theme/diabook-aerith/jot.tpl diff --git a/view/theme/diabook-aerith/js/jquery.autogrow.textarea.js b/view/theme/diabook-aerith/js/jquery.autogrow.textarea.js new file mode 100644 index 000000000..806e34f51 --- /dev/null +++ b/view/theme/diabook-aerith/js/jquery.autogrow.textarea.js @@ -0,0 +1,46 @@ +(function($) { + + /* + * Auto-growing textareas; technique ripped from Facebook + */ + $.fn.autogrow = function(options) { + + this.filter('textarea').each(function() { + + var $this = $(this), + minHeight = $this.height(), + lineHeight = $this.css('lineHeight'); + + var shadow = $('<div></div>').css({ + position: 'absolute', + top: -10000, + left: -10000, + width: $(this).width(), + fontSize: $this.css('fontSize'), + fontFamily: $this.css('fontFamily'), + lineHeight: $this.css('lineHeight'), + resize: 'none' + }).appendTo(document.body); + + var update = function() { + + var val = this.value.replace(/</g, '<') + .replace(/>/g, '>') + .replace(/&/g, '&') + .replace(/\n/g, '<br/>'); + + shadow.html(val); + $(this).css('height', Math.max(shadow.height() + 20, minHeight)); + } + + $(this).change(update).keyup(update).keydown(update); + + update.apply(this); + + }); + + return this; + + } + +})(jQuery);
\ No newline at end of file diff --git a/view/theme/diabook-aerith/mail_conv.tpl b/view/theme/diabook-aerith/mail_conv.tpl index 989f17878..989f17878 100755..100644 --- a/view/theme/diabook-aerith/mail_conv.tpl +++ b/view/theme/diabook-aerith/mail_conv.tpl diff --git a/view/theme/diabook-aerith/nets.tpl b/view/theme/diabook-aerith/nets.tpl new file mode 100644 index 000000000..5addf38b1 --- /dev/null +++ b/view/theme/diabook-aerith/nets.tpl @@ -0,0 +1,11 @@ +<div id="nets-sidebar" class="widget"> + <h3>$title</h3> + <div id="nets-desc">$desc</div> + + <ul class="nets-ul"> + <li class="tool"><a style="text-decoration: none;" href="$base" class="nets-link{{ if $sel_all }} nets-selected{{ endif }} nets-all">$all</a></li> + {{ for $nets as $net }} + <li class="tool"><a href="$base?nets=$net.ref" class="nets-link{{ if $net.selected }} nets-selected{{ endif }}">$net.name</a></li> + {{ endfor }} + </ul> +</div> diff --git a/view/theme/diabook-aerith/photo_view.tpl b/view/theme/diabook-aerith/photo_view.tpl index 071972e0c..071972e0c 100755..100644 --- a/view/theme/diabook-aerith/photo_view.tpl +++ b/view/theme/diabook-aerith/photo_view.tpl diff --git a/view/theme/diabook-aerith/profile_side.tpl b/view/theme/diabook-aerith/profile_side.tpl index 94396300f..01e80f238 100644 --- a/view/theme/diabook-aerith/profile_side.tpl +++ b/view/theme/diabook-aerith/profile_side.tpl @@ -7,13 +7,13 @@ </div> <ul id="profile-side-menu" class="menu-profile-side"> - <li id="profile-side-status" class="menu-profile-list home"><a class="menu-profile-list-item" href="$ps.usermenu.status.0">$ps.usermenu.status.1</a></li> - <li id="profile-side-photos" class="menu-profile-list photos"><a class="menu-profile-list-item" href="$ps.usermenu.photos.0">$ps.usermenu.photos.1</a></li> - <li id="profile-side-photos" class="menu-profile-list pscontacts"><a class="menu-profile-list-item" href="$ps.usermenu.contacts.0">$ps.usermenu.contacts.1</a></li> - <li id="profile-side-events" class="menu-profile-list events"><a class="menu-profile-list-item" href="$ps.usermenu.events.0">$ps.usermenu.events.1</a></li> - <li id="profile-side-notes" class="menu-profile-list notes"><a class="menu-profile-list-item" href="$ps.usermenu.notes.0">$ps.usermenu.notes.1</a></li> - <li id="profile-side-foren" class="menu-profile-list foren"><a class="menu-profile-list-item" href="$ps.usermenu.pgroups.0" target="blanc">$ps.usermenu.pgroups.1</a></li> - <li id="profile-side-foren" class="menu-profile-list com_side"><a class="menu-profile-list-item" href="$ps.usermenu.community.0">$ps.usermenu.community.1</a></li> + <li id="profile-side-status" class="menu-profile-list"><a class="menu-profile-list-item" href="$ps.usermenu.status.0">$ps.usermenu.status.1<span class="menu-profile-icon home"></span></a></li> + <li id="profile-side-photos" class="menu-profile-list photos"><a class="menu-profile-list-item" href="$ps.usermenu.photos.0">$ps.usermenu.photos.1<span class="menu-profile-icon photos"></span></a></li> + <li id="profile-side-photos" class="menu-profile-list pscontacts"><a class="menu-profile-list-item" href="$ps.usermenu.contacts.0">$ps.usermenu.contacts.1<span class="menu-profile-icon pscontacts"></span></a></li> + <li id="profile-side-events" class="menu-profile-list events"><a class="menu-profile-list-item" href="$ps.usermenu.events.0">$ps.usermenu.events.1<span class="menu-profile-icon events"></span></a></li> + <li id="profile-side-notes" class="menu-profile-list notes"><a class="menu-profile-list-item" href="$ps.usermenu.notes.0">$ps.usermenu.notes.1<span class="menu-profile-icon notes"></span></a></li> + <li id="profile-side-foren" class="menu-profile-list foren"><a class="menu-profile-list-item" href="$ps.usermenu.pgroups.0" target="blanc">$ps.usermenu.pgroups.1<span class="menu-profile-icon foren"></span></a></li> + <li id="profile-side-foren" class="menu-profile-list com_side"><a class="menu-profile-list-item" href="$ps.usermenu.community.0">$ps.usermenu.community.1<span class="menu-profile-icon com_side"></span></a></li> </ul> </div> diff --git a/view/theme/diabook-aerith/rs_common_tabs.tpl b/view/theme/diabook-aerith/rs_common_tabs.tpl deleted file mode 100755 index 6a1c5c71b..000000000 --- a/view/theme/diabook-aerith/rs_common_tabs.tpl +++ /dev/null @@ -1,6 +0,0 @@ -<h3 style="border-bottom: 1px solid #D2D2D2;">Settings Menu</h3> -<ul class="rs_tabs"> - {{ for $tabs as $tab }} - <li><a href="$tab.url" class="rs_tab button $tab.sel">$tab.label</a></li> - {{ endfor }} -</ul> diff --git a/view/theme/diabook-aerith/search_item.tpl b/view/theme/diabook-aerith/search_item.tpl index 123834064..123834064 100755..100644 --- a/view/theme/diabook-aerith/search_item.tpl +++ b/view/theme/diabook-aerith/search_item.tpl diff --git a/view/theme/diabook-aerith/style-network.css b/view/theme/diabook-aerith/style-network.css index 07bda6a24..17335389d 100644 --- a/view/theme/diabook-aerith/style-network.css +++ b/view/theme/diabook-aerith/style-network.css @@ -482,8 +482,9 @@ code { } #saved-search-ul .tool:hover, #nets-sidebar .tool:hover, -#sidebar-group-list .tool:hover { - background: #EEE; +#sidebar-group-list .tool:hover , +#fileas-sidebar .tool:hover { + background: aliceBlue; } .tool .label { float: left; @@ -940,44 +941,58 @@ ul.menu-popup .empty { } .menu-profile-list{ height: auto; - overflow: auto; - padding-top: 3px; - padding-bottom: 3px; - padding-left: 16px; + overflow: auto; min-height: 16px; list-style: none; } .menu-profile-list:hover{ - background: #EEE; + background: aliceBlue; } .menu-profile-list-item{ padding-left: 5px; + vertical-align: middle; } .menu-profile-list-item:hover{ text-decoration: none; } /*http://prothemedesign.com/circular-icons/*/ -.menu-profile-list.home{ +.menu-profile-icon.home{ background: url("../../../view/theme/diabook-aerith/icons/home.png") no-repeat; + float: left; + height: 22px; + width: 22px; } -.menu-profile-list.photos{ +.menu-profile-icon.photos{ background: url("../../../view/theme/diabook-aerith/icons/mess_side.png") no-repeat; - } -.menu-profile-list.events{ + float: left; + height: 22px; + width: 22px;} +.menu-profile-icon.events{ background: url("../../../view/theme/diabook-aerith/icons/events.png") no-repeat; - } -.menu-profile-list.notes{ + float: left; + height: 22px; + width: 22px;} +.menu-profile-icon.notes{ background: url("../../../view/theme/diabook-aerith/icons/notes.png") no-repeat; - } -.menu-profile-list.foren{ + float: left; + height: 22px; + width: 22px;} +.menu-profile-icon.foren{ background: url("../../../view/theme/diabook-aerith/icons/pubgroups.png") no-repeat; - } -.menu-profile-list.com_side{ + float: left; + height: 22px; + width: 22px;} +.menu-profile-icon.com_side{ background: url("../../../view/theme/diabook-aerith/icons/com_side.png") no-repeat; - } -.menu-profile-list.pscontacts{ + float: left; + height: 22px; + width: 22px;} +.menu-profile-icon.pscontacts{ background: url("../../../view/theme/diabook-aerith/icons/pscontacts.png") no-repeat; - } + float: left; + height: 22px; + width: 22px;} + /* aside */ aside { display: table-cell; @@ -1298,6 +1313,7 @@ transition: all 0.2s ease-in-out; padding: 5px; margin-bottom: 0px; width: 575px; + padding-top: 10px; } .tread-wrapper a{ color: #3465A4; @@ -1364,10 +1380,10 @@ transition: all 0.2s ease-in-out; } .wall-item-container .wall-item-content { - font-size: 12.5px; + max-width: 420px; word-wrap: break-word; - line-height: 1.2; + margin-bottom: 14px; } @@ -1447,7 +1463,7 @@ transition: all 0.2s ease-in-out; } .wall-item-comment-wrapper { - margin: 1px 0px 0px 80px; + margin: 1px 5px 17px 80px; background-color: #fff; width: 500px; } diff --git a/view/theme/diabook-aerith/style-profile.css b/view/theme/diabook-aerith/style-profile.css index 8909f0870..3dea20697 100644 --- a/view/theme/diabook-aerith/style-profile.css +++ b/view/theme/diabook-aerith/style-profile.css @@ -1291,6 +1291,7 @@ transition: all 0.2s ease-in-out; padding: 5px; margin-bottom: 0px; width: 575px; + padding-top: 10px; } .tread-wrapper a{ color: #3465A4; @@ -1357,10 +1358,10 @@ transition: all 0.2s ease-in-out; } .wall-item-container .wall-item-content { - font-size: 12.5px; + max-width: 420px; word-wrap: break-word; - line-height: 1.2; + margin-bottom: 14px; } @@ -1439,7 +1440,7 @@ transition: all 0.2s ease-in-out; padding-left: 12px; } .wall-item-comment-wrapper { - margin: 1px 5px 1px 80px; + margin: 1px 5px 17px 80px; } .wall-item-comment-wrapper .comment-edit-photo { display: none; diff --git a/view/theme/diabook-aerith/style.css b/view/theme/diabook-aerith/style.css index 23ae05940..a9269f21d 100644 --- a/view/theme/diabook-aerith/style.css +++ b/view/theme/diabook-aerith/style.css @@ -83,6 +83,35 @@ #adminpage .selectall { text-align: right; } /* icons */ +.icon.bb-url{ + background-image: url("../../../view/theme/diabook-aerith/icons/bb-url.png"); + float: right; + margin-top: 2px;} +.icon.quote{ + background-image: url("../../../view/theme/diabook-aerith/icons/quote.png"); + float: right; + margin-top: 2px;} +.icon.bold{ + background-image: url("../../../view/theme/diabook-aerith/icons/bold.png"); + float: right; + margin-top: 2px;} +.icon.underline{ + background-image: url("../../../view/theme/diabook-aerith/icons/underline.png"); + float: right; + margin-top: 2px;} +.icon.italic{ + background-image: url("../../../view/theme/diabook-aerith/icons/italic.png"); + float: right; + margin-top: 2px;} +.icon.bb-image{ + background-image: url("../../../view/theme/diabook-aerith/icons/bb-image.png"); + float: right; + margin-top: 2px;} +.icon.bb-video{ + background-image: url("../../../view/theme/diabook-aerith/icons/bb-video.png"); + float: right; + margin-top: 2px;} + .icon.contacts { background-image: url("../../../view/theme/diabook-aerith/icons/contacts.png");} .icon.notifications { @@ -498,8 +527,9 @@ code { } #saved-search-ul .tool:hover, #nets-sidebar .tool:hover, -#sidebar-group-list .tool:hover { - background: #EEE; +#sidebar-group-list .tool:hover, +#fileas-sidebar .tool:hover { + background: aliceBlue; } .tool .label { float: left; @@ -1032,44 +1062,57 @@ ul.menu-popup .empty { } .menu-profile-list{ height: auto; - overflow: auto; - padding-top: 3px; - padding-bottom: 3px; - padding-left: 16px; + overflow: auto; min-height: 16px; list-style: none; } .menu-profile-list:hover{ - background: #EEE; + background: aliceBlue; } .menu-profile-list-item{ padding-left: 5px; + vertical-align: middle; } .menu-profile-list-item:hover{ text-decoration: none; } /*http://prothemedesign.com/circular-icons/*/ -.menu-profile-list.home{ +.menu-profile-icon.home{ background: url("../../../view/theme/diabook-aerith/icons/home.png") no-repeat; + float: left; + height: 22px; + width: 22px; } -.menu-profile-list.photos{ +.menu-profile-icon.photos{ background: url("../../../view/theme/diabook-aerith/icons/mess_side.png") no-repeat; - } -.menu-profile-list.events{ + float: left; + height: 22px; + width: 22px;} +.menu-profile-icon.events{ background: url("../../../view/theme/diabook-aerith/icons/events.png") no-repeat; - } -.menu-profile-list.notes{ + float: left; + height: 22px; + width: 22px;} +.menu-profile-icon.notes{ background: url("../../../view/theme/diabook-aerith/icons/notes.png") no-repeat; - } -.menu-profile-list.foren{ + float: left; + height: 22px; + width: 22px;} +.menu-profile-icon.foren{ background: url("../../../view/theme/diabook-aerith/icons/pubgroups.png") no-repeat; - } -.menu-profile-list.com_side{ + float: left; + height: 22px; + width: 22px;} +.menu-profile-icon.com_side{ background: url("../../../view/theme/diabook-aerith/icons/com_side.png") no-repeat; - } -.menu-profile-list.pscontacts{ + float: left; + height: 22px; + width: 22px;} +.menu-profile-icon.pscontacts{ background: url("../../../view/theme/diabook-aerith/icons/pscontacts.png") no-repeat; - } + float: left; + height: 22px; + width: 22px;} /* aside */ aside { display: table-cell; @@ -1187,6 +1230,50 @@ aside #likes a:hover{ float: left; margin-right: 20px; } +.group_selected { + background: url("../../../view/theme/diabook/icons/selected.png") no-repeat left center; + float: left; + height: 22px; + width: 22px; +} +.group_unselected { + background: url("../../../view/theme/diabook/icons/unselected.png") no-repeat left center; + float: left; + height: 22px; + width: 22px; +} +.icon.text_add { + background-image: url("../../../images/icons/16/add.png"); + float: right; + opacity: 0.1; + margin-right: 14px; + } +.icon.text_add:hover { + background-image: url("../../../images/icons/16/add.png"); + float: right; + cursor: pointer; + margin-right: 14px; + opacity: 1; +-webkit-transition: all 0.2s ease-in-out; +-moz-transition: all 0.2s ease-in-out; +-o-transition: all 0.2s ease-in-out; +-ms-transition: all 0.2s ease-in-out; +transition: all 0.2s ease-in-out; + } +.icon.text_edit { + background-image: url("../../../images/icons/10/edit.png"); + opacity: 0.1; + margin-top: 6px; + float: right; + height: 10px; +} +.icon.text_edit:hover { + background-image: url("../../../images/icons/10/edit.png"); + opacity: 1; + margin-top: 6px; + float: right; + height: 10px; +} /* widget */ .widget { margin-bottom: 2em; @@ -1331,6 +1418,7 @@ body .pageheader{ padding: 5px; margin-bottom: 0px; width: 775px; + padding-top: 10px; } .tread-wrapper a{ color: #3465A4; @@ -1366,10 +1454,10 @@ body .pageheader{ color: #999; } .wall-item-photo-container .wall-item-content { - font-size: 12.5px; + max-width: 720px; word-wrap: break-word; - line-height: 1.2; + margin-bottom: 14px; } .wall-item-photo-container .wall-item-content img { @@ -1511,10 +1599,10 @@ body .pageheader{ } .wall-item-container .wall-item-content { - font-size: 12.5px; + max-width: 720px; word-wrap: break-word; - line-height: 1.2; + margin-bottom: 14px; } @@ -1592,7 +1680,7 @@ body .pageheader{ padding-left: 12px; } .wall-item-comment-wrapper { - margin: 1px 5px 1px 80px; + margin: 1px 5px 17px 80px; } .wall-item-comment-wrapper .comment-edit-photo { display: none; @@ -2117,6 +2205,41 @@ ul.tabs li .active { box-shadow: 2px 2px 2px #CFCFCF; margin-left: 5px; } +//settings tabs +ul.rs_tabs { + list-style-type: none; + font-size: 11px; +} +ul.rs_tabs li { + float: left; + margin-bottom: 30px; + clear: both; +} +ul.rs_tabs li .selected { + background-color: #3465A4; + border: 1px solid #777777; + color: white; + border-radius: 3px 3px 3px 3px; + box-shadow: 2px 2px 2px #CFCFCF; + font-size: 13px; +} +.rs_tabs { + list-style-type: none; + font-size: 11px; + background-position: 0 -20px; + background-repeat: repeat-x; + height: 27px; + padding: 0; + } +.rs_tab.button { + /*background: none repeat scroll 0 0 #F8F8F8;*/ + border: 1px solid #CCCCCC; + border-radius: 3px 3px 3px 3px; + font-weight: bolder; + padding: 3px; + color: #333333; + text-decoration: none; + } /** * Form fields */ diff --git a/view/theme/diabook-aerith/style.php b/view/theme/diabook-aerith/style.php new file mode 100644 index 000000000..1ae62503c --- /dev/null +++ b/view/theme/diabook-aerith/style.php @@ -0,0 +1,120 @@ +<?php + $line_height=false; + $diabook_font_size=false; + $site_line_height = get_config("diabook-aerith","line_height"); + $site_diabook_font_size = get_config("diabook-aerith", "font_size" ); + + if (local_user()) { + $line_height = get_pconfig(local_user(), "diabook-aerith","line_height"); + $diabook_font_size = get_pconfig(local_user(), "diabook-aerith", "font_size"); + } + + if ($line_height===false) $line_height=$site_line_height; + if ($line_height===false) $line_height="1.3"; + if ($diabook_font_size===false) $diabook_font_size=$site_diabook_font_size; + if ($diabook_font_size===false) $diabook_font_size="13"; + + + if (file_exists("$THEMEPATH/style.css")){ + echo file_get_contents("$THEMEPATH/style.css"); + } + + if($diabook_font_size == "14"){ + echo " + .wall-item-container .wall-item-content { + font-size: 14px; + } + + .wall-item-photo-container .wall-item-content { + font-size: 14px; + } + "; + } + if($diabook_font_size == "13.5"){ + echo " + .wall-item-container .wall-item-content { + font-size: 13.5px; + } + + .wall-item-photo-container .wall-item-content { + font-size: 13.5px; + } + "; + } + if($diabook_font_size == "13"){ + echo " + .wall-item-container .wall-item-content { + font-size: 13px; + } + + .wall-item-photo-container .wall-item-content { + font-size: 13px; + } + "; + } + if($diabook_font_size == "12.5"){ + echo " + .wall-item-container .wall-item-content { + font-size: 12.5px; + } + + .wall-item-photo-container .wall-item-content { + font-size: 12.5px; + } + "; + } + if($diabook_font_size == "12"){ + echo " + .wall-item-container .wall-item-content { + font-size: 12px; + } + + .wall-item-photo-container .wall-item-content { + font-size: 12px; + } + "; + } + if($line_height == "1.4"){ + echo " + .wall-item-container .wall-item-content { + line-height: 1.4; + } + + .wall-item-photo-container .wall-item-content { + line-height: 1.4; + } + "; + } + if($line_height == "1.3"){ + echo " + .wall-item-container .wall-item-content { + line-height: 1.3; + } + + .wall-item-photo-container .wall-item-content { + line-height: 1.3; + } + "; + } + if($line_height == "1.2"){ + echo " + .wall-item-container .wall-item-content { + line-height: 1.2; + } + + .wall-item-photo-container .wall-item-content { + line-height: 1.2; + } + "; + } + if($line_height == "1.1"){ + echo " + .wall-item-container .wall-item-content { + line-height: 1.1; + } + + .wall-item-photo-container .wall-item-content { + line-height: 1.1; + } + "; + } diff --git a/view/theme/diabook-aerith/theme.php b/view/theme/diabook-aerith/theme.php index 40093e545..907865207 100755..100644 --- a/view/theme/diabook-aerith/theme.php +++ b/view/theme/diabook-aerith/theme.php @@ -3,13 +3,13 @@ /* * Name: Diabook-aerith * Description: Diabook-aerith : report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu - * Version: (Version: 1.015) + * Version: (Version: 1.018) * Author: */ //print diabook-version for debugging -$diabook_version = "Diabook-aerith (Version: 1.015)"; +$diabook_version = "Diabook-aerith (Version: 1.018)"; $a->page['htmlhead'] .= sprintf('<script "%s" ></script>', $diabook_version); @@ -22,7 +22,6 @@ $cssFile = null; */ function diabook_aerith_community_info(){ $a = get_app(); - //right_aside at networkpages // last 12 users $aside['$lastusers_title'] = t('Last users'); @@ -280,55 +279,6 @@ if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname']){ } } -//tabs at right_aside on settings page -if ($a->argv[0] === "settings"){ - - $tabs = array( - array( - 'label' => t('Account settings'), - 'url' => $a->get_baseurl(true).'/settings', - 'sel' => (($a->argc == 1)?'active':''), - ), - array( - 'label' => t('Display settings'), - 'url' => $a->get_baseurl(true).'/settings/display', - 'sel' => (($a->argc > 1) && ($a->argv[1] === 'display')?'active':''), - ), - array( - 'label' => t('Edit/Manage Profiles'), - 'url' => $a->get_baseurl(true).'/profiles', - ), - array( - 'label' => t('Connector settings'), - 'url' => $a->get_baseurl(true).'/settings/connectors', - 'sel' => (($a->argc > 1) && ($a->argv[1] === 'connectors')?'active':''), - ), - array( - 'label' => t('Plugin settings'), - 'url' => $a->get_baseurl(true).'/settings/addon', - 'sel' => (($a->argc > 1) && ($a->argv[1] === 'addon')?'active':''), - ), - array( - 'label' => t('Connections'), - 'url' => $a->get_baseurl(true) . '/settings/oauth', - 'sel' => (($a->argc > 1) && ($a->argv[1] === 'oauth')?'active':''), - ), - array( - 'label' => t('Export personal data'), - 'url' => $a->get_baseurl(true) . '/uexport', - 'sel' => '' - ) - ); - $tabtpl = file_get_contents(dirname(__file__).'/rs_common_tabs.tpl') ; - $a->page['aside'] = replace_macros($tabtpl, array( - '$tabs' => $tabs, - )); - - - // CUSTOM CSS - $cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook-aerith/style-settings.css"; - -} // custom css @@ -342,6 +292,10 @@ $a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s" ></scrip $imageresizeJS = $a->get_baseurl($ssl_state)."/view/theme/diabook-aerith/js/jquery.ae.image.resize.js"; $a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s" ></script>', $imageresizeJS); +//load jquery.autogrow-textarea.js +$autogrowJS = $a->get_baseurl($ssl_state)."/view/theme/diabook-aerith/js/jquery.autogrow.textarea.js"; +$a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s" ></script>', $autogrowJS); + //js scripts //comment-edit-wrapper on photo_view if ($a->argv[0].$a->argv[2] === "photos"."image"){ @@ -365,6 +319,15 @@ $a->page['htmlhead'] .= ' }); </script>'; + +$a->page['htmlhead'] .= ' + +<script type="text/javascript"> + +function tautogrow(id){ + $("textarea#comment-edit-text-" +id).autogrow(); + }; + </script>'; $a->page['htmlhead'] .= ' <script> @@ -507,4 +470,37 @@ function restore_boxes(){ $.cookie("close_lastlikes","2", { expires: 365, path: "/" }); alert("Right-hand column was restored. Please refresh your browser"); } -</script>';}
\ No newline at end of file +</script>';} + +$a->page['htmlhead'] .= ' + +<script type="text/javascript"> +function insertFormatting(comment,BBcode,id) { + + var tmpStr = $("#comment-edit-text-" + id).val(); + if(tmpStr == comment) { + tmpStr = ""; + $("#comment-edit-text-" + id).addClass("comment-edit-text-full"); + $("#comment-edit-text-" + id).removeClass("comment-edit-text-empty"); + openMenu("comment-edit-submit-wrapper-" + id); + } + + textarea = document.getElementById("comment-edit-text-" +id); + if (document.selection) { + textarea.focus(); + selected = document.selection.createRange(); + if (BBcode == "url"){ + selected.text = "["+BBcode+"]" + "http://" + selected.text + "[/"+BBcode+"]"; + } else + selected.text = "["+BBcode+"]" + selected.text + "[/"+BBcode+"]"; + } else if (textarea.selectionStart || textarea.selectionStart == "0") { + var start = textarea.selectionStart; + var end = textarea.selectionEnd; + if (BBcode == "url"){ + textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + "http://" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length); + } else + textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length); + } + return true; +} +</script> ';
\ No newline at end of file diff --git a/view/theme/diabook-aerith/theme_settings.tpl b/view/theme/diabook-aerith/theme_settings.tpl new file mode 100644 index 000000000..002923a2a --- /dev/null +++ b/view/theme/diabook-aerith/theme_settings.tpl @@ -0,0 +1,8 @@ +{{inc field_select.tpl with $field=$font_size}}{{endinc}} + +{{inc field_select.tpl with $field=$line_height}}{{endinc}} + +<div class="settings-submit-wrapper"> + <input type="submit" value="$submit" class="settings-submit" name="diabook-aerith-settings-submit" /> +</div> + diff --git a/view/theme/diabook-blue/comment_item.tpl b/view/theme/diabook-blue/comment_item.tpl new file mode 100644 index 000000000..47046c371 --- /dev/null +++ b/view/theme/diabook-blue/comment_item.tpl @@ -0,0 +1,41 @@ + <div class="comment-wwedit-wrapper" id="comment-edit-wrapper-$id" style="display: block;"> + <form class="comment-edit-form" id="comment-edit-form-$id" action="item" method="post" onsubmit="post_comment($id); return false;"> + <input type="hidden" name="type" value="$type" /> + <input type="hidden" name="profile_uid" value="$profile_uid" /> + <input type="hidden" name="parent" value="$parent" /> + <input type="hidden" name="return" value="$return_path" /> + <input type="hidden" name="jsreload" value="$jsreload" /> + <input type="hidden" name="preview" id="comment-preview-inp-$id" value="0" /> + + <div class="comment-edit-photo" id="comment-edit-photo-$id" > + <a class="comment-edit-photo-link" href="$mylink" title="$mytitle"><img class="my-comment-photo" src="$myphoto" alt="$mytitle" title="$mytitle" /></a> + </div> + <div class="comment-edit-photo-end"></div> + <textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);tautogrow($id)" onBlur="commentClose(this,$id);" >$comment</textarea> + <a class="icon bb-image" onclick="insertFormatting('$comment','img',$id);">img</a> + <a class="icon bb-url" onclick="insertFormatting('$comment','url',$id);">url</a> + <a class="icon bb-video" onclick="insertFormatting('$comment','video',$id);">video</a> + <a class="icon underline" onclick="insertFormatting('$comment','u',$id);">u</a> + <a class="icon italic" onclick="insertFormatting('$comment','i',$id);">i</a> + <a class="icon bold" onclick="insertFormatting('$comment','b',$id);">b</a> + <a class="icon quote" onclick="insertFormatting('$comment','quote',$id);">quote</a> + {{ if $qcomment }} + <select id="qcomment-select-$id" name="qcomment-$id" class="qcomment" onchange="qCommentInsert(this,$id);" > + <option value=""></option> + {{ for $qcomment as $qc }} + <option value="$qc">$qc</option> + {{ endfor }} + </select> + {{ endif }} + + <div class="comment-edit-text-end"></div> + <div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-$id" style="display: none;" > + <input type="submit" onclick="post_comment($id); return false;" id="comment-edit-submit-$id" class="comment-edit-submit" name="submit" value="$submit" /> + <span onclick="preview_comment($id);" id="comment-edit-preview-link-$id" class="fakelink">$preview</span> + <div id="comment-edit-preview-$id" class="comment-edit-preview" style="display:none;"></div> + </div> + + <div class="comment-edit-end"></div> + </form> + + </div> diff --git a/view/theme/diabook-blue/communityhome.tpl b/view/theme/diabook-blue/communityhome.tpl index 6e126827b..6e126827b 100755..100644 --- a/view/theme/diabook-blue/communityhome.tpl +++ b/view/theme/diabook-blue/communityhome.tpl diff --git a/view/theme/diabook-blue/config.php b/view/theme/diabook-blue/config.php new file mode 100644 index 000000000..3ad88b5bb --- /dev/null +++ b/view/theme/diabook-blue/config.php @@ -0,0 +1,71 @@ +<?php +/** + * Theme settings + */ + + + +function theme_content(&$a){ + if(!local_user()) + return; + + $font_size = get_pconfig(local_user(), 'diabook-blue', 'font_size' ); + $line_height = get_pconfig(local_user(), 'diabook-blue', 'line_height' ); + + return diabook_form($a,$font_size, $line_height); +} + +function theme_post(&$a){ + if(! local_user()) + return; + + if (isset($_POST['diabook-blue-settings-submit'])){ + set_pconfig(local_user(), 'diabook-blue', 'font_size', $_POST['diabook-blue_font_size']); + set_pconfig(local_user(), 'diabook-blue', 'line_height', $_POST['diabook-blue_line_height']); + } +} + + +function theme_admin(&$a){ + $font_size = get_config('diabook-blue', 'font_size' ); + $line_height = get_config('diabook-blue', 'line_height' ); + + return diabook_form($a,$font_size, $line_height); +} + +function theme_admin_post(&$a){ + if (isset($_POST['diabook-blue-settings-submit'])){ + set_config('diabook-blue', 'font_size', $_POST['diabook-blue_font_size']); + set_config('diabook-blue', 'line_height', $_POST['diabook-blue_line_height']); + } +} + + +function diabook_form(&$a, $font_size, $line_height){ + $line_heights = array( + "1.4"=>"1.4", + "1.3"=>"1.3", + "1.2"=>"1.2", + "1.1"=>"1.1", + ); + + $font_sizes = array( + '14'=>'14', + '13.5'=>'13.5', + '13'=>'13', + '12.5'=>'12.5', + '12'=>'12', + ); + + + + $t = file_get_contents( dirname(__file__). "/theme_settings.tpl" ); + $o .= replace_macros($t, array( + '$submit' => t('Submit'), + '$baseurl' => $a->get_baseurl(), + '$title' => t("Theme settings"), + '$font_size' => array('diabook-blue_font_size', t('Set font-size for posts and comments'), $font_size, '', $font_sizes), + '$line_height' => array('diabook-blue_line_height', t('Set line-height for posts and comments'), $line_height, '', $line_heights), + )); + return $o; +} diff --git a/view/theme/diabook-blue/contact_template.tpl b/view/theme/diabook-blue/contact_template.tpl index 48930b48a..48930b48a 100755..100644 --- a/view/theme/diabook-blue/contact_template.tpl +++ b/view/theme/diabook-blue/contact_template.tpl diff --git a/view/theme/diabook-blue/directory_item.tpl b/view/theme/diabook-blue/directory_item.tpl index db1936e4b..db1936e4b 100755..100644 --- a/view/theme/diabook-blue/directory_item.tpl +++ b/view/theme/diabook-blue/directory_item.tpl diff --git a/view/theme/diabook-blue/fpostit/fpostit.js b/view/theme/diabook-blue/fpostit/fpostit.js index d183c7573..d183c7573 100755..100644 --- a/view/theme/diabook-blue/fpostit/fpostit.js +++ b/view/theme/diabook-blue/fpostit/fpostit.js diff --git a/view/theme/diabook-blue/generic_links_widget.tpl b/view/theme/diabook-blue/generic_links_widget.tpl new file mode 100644 index 000000000..001c1395e --- /dev/null +++ b/view/theme/diabook-blue/generic_links_widget.tpl @@ -0,0 +1,11 @@ +<div id="widget_$title"> + {{if $title}}<h3 style="border-bottom: 1px solid #D2D2D2;">$title</h3>{{endif}} + {{if $desc}}<div class="desc">$desc</div>{{endif}} + + <ul class="rs_tabs"> + {{ for $items as $item }} + <li><a href="$item.url" class="rs_tab button {{ if $item.selected }}selected{{ endif }}">$item.label</a></li> + {{ endfor }} + </ul> + +</div> diff --git a/view/theme/diabook-blue/group_side.tpl b/view/theme/diabook-blue/group_side.tpl index af183d04d..642019049 100755..100644 --- a/view/theme/diabook-blue/group_side.tpl +++ b/view/theme/diabook-blue/group_side.tpl @@ -1,18 +1,18 @@ -<div id="group-sidebar" class="widget"> - <div class="title tool"> - <h3 class="label">$title</h3> - <a href="group/new" title="$createtext" class="action"><span class="icon text s16 add"></span></a> +<div id="profile_side" > + <div class=""> + <h3 style="margin-left: 2px;">$title<a href="group/new" title="$createtext" class="icon text_add"></a></h3> </div> <div id="sidebar-group-list"> - <ul> + <ul class="menu-profile-side"> {{ for $groups as $group }} - <li class="tool {{ if $group.selected }}selected{{ endif }}"> - <a href="$group.href" class="label"> + <li class="menu-profile-list"> + <span class="menu-profile-icon {{ if $group.selected }}group_selected{{else}}group_unselected{{ endif }}"></span> + <a href="$group.href" class="menu-profile-list-item"> $group.text </a> {{ if $group.edit }} - <a href="$group.edit.href" class="action"><span class="icon text s10 edit"></span></a> + <a href="$group.edit.href" class="action"><span class="icon text_edit" ></span></a> {{ endif }} {{ if $group.cid }} <input type="checkbox" diff --git a/view/theme/diabook-blue/icons/attach.png b/view/theme/diabook-blue/icons/attach.png Binary files differindex 1958041cf..1958041cf 100755..100644 --- a/view/theme/diabook-blue/icons/attach.png +++ b/view/theme/diabook-blue/icons/attach.png diff --git a/view/theme/diabook-blue/icons/audio.png b/view/theme/diabook-blue/icons/audio.png Binary files differindex 8d779a409..8d779a409 100755..100644 --- a/view/theme/diabook-blue/icons/audio.png +++ b/view/theme/diabook-blue/icons/audio.png diff --git a/view/theme/diabook-blue/icons/bb-image.png b/view/theme/diabook-blue/icons/bb-image.png Binary files differnew file mode 100644 index 000000000..9a1b32113 --- /dev/null +++ b/view/theme/diabook-blue/icons/bb-image.png diff --git a/view/theme/diabook-blue/icons/bb-url.png b/view/theme/diabook-blue/icons/bb-url.png Binary files differnew file mode 100644 index 000000000..071fc1865 --- /dev/null +++ b/view/theme/diabook-blue/icons/bb-url.png diff --git a/view/theme/diabook-blue/icons/bb-video.png b/view/theme/diabook-blue/icons/bb-video.png Binary files differnew file mode 100644 index 000000000..bd323531e --- /dev/null +++ b/view/theme/diabook-blue/icons/bb-video.png diff --git a/view/theme/diabook-blue/icons/bold.png b/view/theme/diabook-blue/icons/bold.png Binary files differnew file mode 100644 index 000000000..8fab2a10f --- /dev/null +++ b/view/theme/diabook-blue/icons/bold.png diff --git a/view/theme/diabook-blue/icons/camera.png b/view/theme/diabook-blue/icons/camera.png Binary files differindex a5c7f1236..a5c7f1236 100755..100644 --- a/view/theme/diabook-blue/icons/camera.png +++ b/view/theme/diabook-blue/icons/camera.png diff --git a/view/theme/diabook-blue/icons/close_box.png b/view/theme/diabook-blue/icons/close_box.png Binary files differindex 28e2675b8..28e2675b8 100755..100644 --- a/view/theme/diabook-blue/icons/close_box.png +++ b/view/theme/diabook-blue/icons/close_box.png diff --git a/view/theme/diabook-blue/icons/com_side.png b/view/theme/diabook-blue/icons/com_side.png Binary files differindex bc5969ef1..00186ba05 100644 --- a/view/theme/diabook-blue/icons/com_side.png +++ b/view/theme/diabook-blue/icons/com_side.png diff --git a/view/theme/diabook-blue/icons/contacts2.png b/view/theme/diabook-blue/icons/contacts2.png Binary files differindex 7817279f4..7817279f4 100755..100644 --- a/view/theme/diabook-blue/icons/contacts2.png +++ b/view/theme/diabook-blue/icons/contacts2.png diff --git a/view/theme/diabook-blue/icons/drop.png b/view/theme/diabook-blue/icons/drop.png Binary files differindex 2abb82ef2..2abb82ef2 100755..100644 --- a/view/theme/diabook-blue/icons/drop.png +++ b/view/theme/diabook-blue/icons/drop.png diff --git a/view/theme/diabook-blue/icons/events.png b/view/theme/diabook-blue/icons/events.png Binary files differindex 4a0b3f3f1..cf195fbb6 100644 --- a/view/theme/diabook-blue/icons/events.png +++ b/view/theme/diabook-blue/icons/events.png diff --git a/view/theme/diabook-blue/icons/file_as.png b/view/theme/diabook-blue/icons/file_as.png Binary files differindex 16713fa53..16713fa53 100755..100644 --- a/view/theme/diabook-blue/icons/file_as.png +++ b/view/theme/diabook-blue/icons/file_as.png diff --git a/view/theme/diabook-blue/icons/home.png b/view/theme/diabook-blue/icons/home.png Binary files differindex be47a48fc..5c610805f 100644 --- a/view/theme/diabook-blue/icons/home.png +++ b/view/theme/diabook-blue/icons/home.png diff --git a/view/theme/diabook-blue/icons/italic.png b/view/theme/diabook-blue/icons/italic.png Binary files differnew file mode 100644 index 000000000..bf4b2b81d --- /dev/null +++ b/view/theme/diabook-blue/icons/italic.png diff --git a/view/theme/diabook-blue/icons/link.png b/view/theme/diabook-blue/icons/link.png Binary files differindex 0ef666a67..0ef666a67 100755..100644 --- a/view/theme/diabook-blue/icons/link.png +++ b/view/theme/diabook-blue/icons/link.png diff --git a/view/theme/diabook-blue/icons/lock.png b/view/theme/diabook-blue/icons/lock.png Binary files differindex 7e34bf279..7e34bf279 100755..100644 --- a/view/theme/diabook-blue/icons/lock.png +++ b/view/theme/diabook-blue/icons/lock.png diff --git a/view/theme/diabook-blue/icons/lupe.png b/view/theme/diabook-blue/icons/lupe.png Binary files differindex f8b228347..f8b228347 100755..100644 --- a/view/theme/diabook-blue/icons/lupe.png +++ b/view/theme/diabook-blue/icons/lupe.png diff --git a/view/theme/diabook-blue/icons/mess_side.png b/view/theme/diabook-blue/icons/mess_side.png Binary files differindex 49ef896bc..5295e2e74 100644 --- a/view/theme/diabook-blue/icons/mess_side.png +++ b/view/theme/diabook-blue/icons/mess_side.png diff --git a/view/theme/diabook-blue/icons/messages.png b/view/theme/diabook-blue/icons/messages.png Binary files differindex f7010c98c..f7010c98c 100755..100644 --- a/view/theme/diabook-blue/icons/messages.png +++ b/view/theme/diabook-blue/icons/messages.png diff --git a/view/theme/diabook-blue/icons/next.png b/view/theme/diabook-blue/icons/next.png Binary files differindex 7b5e25b90..7b5e25b90 100755..100644 --- a/view/theme/diabook-blue/icons/next.png +++ b/view/theme/diabook-blue/icons/next.png diff --git a/view/theme/diabook-blue/icons/notes.png b/view/theme/diabook-blue/icons/notes.png Binary files differindex 7d4afca90..28dca30a3 100644 --- a/view/theme/diabook-blue/icons/notes.png +++ b/view/theme/diabook-blue/icons/notes.png diff --git a/view/theme/diabook-blue/icons/notifications.png b/view/theme/diabook-blue/icons/notifications.png Binary files differindex c23673dbd..c23673dbd 100755..100644 --- a/view/theme/diabook-blue/icons/notifications.png +++ b/view/theme/diabook-blue/icons/notifications.png diff --git a/view/theme/diabook-blue/icons/notify.png b/view/theme/diabook-blue/icons/notify.png Binary files differindex 8a7bdc38f..8a7bdc38f 100755..100644 --- a/view/theme/diabook-blue/icons/notify.png +++ b/view/theme/diabook-blue/icons/notify.png diff --git a/view/theme/diabook-blue/icons/pencil.png b/view/theme/diabook-blue/icons/pencil.png Binary files differindex 772e49b17..772e49b17 100755..100644 --- a/view/theme/diabook-blue/icons/pencil.png +++ b/view/theme/diabook-blue/icons/pencil.png diff --git a/view/theme/diabook-blue/icons/prev.png b/view/theme/diabook-blue/icons/prev.png Binary files differindex 55c1464ba..55c1464ba 100755..100644 --- a/view/theme/diabook-blue/icons/prev.png +++ b/view/theme/diabook-blue/icons/prev.png diff --git a/view/theme/diabook-blue/icons/pscontacts.png b/view/theme/diabook-blue/icons/pscontacts.png Binary files differindex acf857f32..23a78bcac 100644 --- a/view/theme/diabook-blue/icons/pscontacts.png +++ b/view/theme/diabook-blue/icons/pscontacts.png diff --git a/view/theme/diabook-blue/icons/pubgroups.png b/view/theme/diabook-blue/icons/pubgroups.png Binary files differindex 6d9539610..ae04194b1 100644 --- a/view/theme/diabook-blue/icons/pubgroups.png +++ b/view/theme/diabook-blue/icons/pubgroups.png diff --git a/view/theme/diabook-blue/icons/quote.png b/view/theme/diabook-blue/icons/quote.png Binary files differnew file mode 100644 index 000000000..a464f2859 --- /dev/null +++ b/view/theme/diabook-blue/icons/quote.png diff --git a/view/theme/diabook-blue/icons/recycle.png b/view/theme/diabook-blue/icons/recycle.png Binary files differindex c3b8d2bf4..c3b8d2bf4 100755..100644 --- a/view/theme/diabook-blue/icons/recycle.png +++ b/view/theme/diabook-blue/icons/recycle.png diff --git a/view/theme/diabook-blue/icons/remote.png b/view/theme/diabook-blue/icons/remote.png Binary files differindex a560cc55e..a560cc55e 100755..100644 --- a/view/theme/diabook-blue/icons/remote.png +++ b/view/theme/diabook-blue/icons/remote.png diff --git a/view/theme/diabook-blue/icons/scroll_top.png b/view/theme/diabook-blue/icons/scroll_top.png Binary files differindex 0e7f7ae6a..0e7f7ae6a 100755..100644 --- a/view/theme/diabook-blue/icons/scroll_top.png +++ b/view/theme/diabook-blue/icons/scroll_top.png diff --git a/view/theme/diabook-blue/icons/selected.png b/view/theme/diabook-blue/icons/selected.png Binary files differindex 2a30ae252..3fcb95c29 100755..100644 --- a/view/theme/diabook-blue/icons/selected.png +++ b/view/theme/diabook-blue/icons/selected.png diff --git a/view/theme/diabook-blue/icons/star.png b/view/theme/diabook-blue/icons/star.png Binary files differindex 0b00cb189..0b00cb189 100755..100644 --- a/view/theme/diabook-blue/icons/star.png +++ b/view/theme/diabook-blue/icons/star.png diff --git a/view/theme/diabook-blue/icons/starred.png b/view/theme/diabook-blue/icons/starred.png Binary files differindex 2b82dfca3..2b82dfca3 100755..100644 --- a/view/theme/diabook-blue/icons/starred.png +++ b/view/theme/diabook-blue/icons/starred.png diff --git a/view/theme/diabook-blue/icons/tagged.png b/view/theme/diabook-blue/icons/tagged.png Binary files differindex 144649ef8..144649ef8 100755..100644 --- a/view/theme/diabook-blue/icons/tagged.png +++ b/view/theme/diabook-blue/icons/tagged.png diff --git a/view/theme/diabook-blue/icons/underline.png b/view/theme/diabook-blue/icons/underline.png Binary files differnew file mode 100644 index 000000000..b1b4d3574 --- /dev/null +++ b/view/theme/diabook-blue/icons/underline.png diff --git a/view/theme/diabook-blue/icons/unlock.png b/view/theme/diabook-blue/icons/unlock.png Binary files differindex a0cda0ae5..a0cda0ae5 100755..100644 --- a/view/theme/diabook-blue/icons/unlock.png +++ b/view/theme/diabook-blue/icons/unlock.png diff --git a/view/theme/diabook-blue/icons/unselected.png b/view/theme/diabook-blue/icons/unselected.png Binary files differnew file mode 100644 index 000000000..9e9cead4b --- /dev/null +++ b/view/theme/diabook-blue/icons/unselected.png diff --git a/view/theme/diabook-blue/icons/unstarred.png b/view/theme/diabook-blue/icons/unstarred.png Binary files differindex ba3183f5c..ba3183f5c 100755..100644 --- a/view/theme/diabook-blue/icons/unstarred.png +++ b/view/theme/diabook-blue/icons/unstarred.png diff --git a/view/theme/diabook-blue/icons/video.png b/view/theme/diabook-blue/icons/video.png Binary files differindex a03d1d818..a03d1d818 100755..100644 --- a/view/theme/diabook-blue/icons/video.png +++ b/view/theme/diabook-blue/icons/video.png diff --git a/view/theme/diabook-blue/icons/weblink.png b/view/theme/diabook-blue/icons/weblink.png Binary files differindex 216e78344..216e78344 100755..100644 --- a/view/theme/diabook-blue/icons/weblink.png +++ b/view/theme/diabook-blue/icons/weblink.png diff --git a/view/theme/diabook-blue/jot.tpl b/view/theme/diabook-blue/jot.tpl index bd43994b5..bd43994b5 100755..100644 --- a/view/theme/diabook-blue/jot.tpl +++ b/view/theme/diabook-blue/jot.tpl diff --git a/view/theme/diabook-blue/js/jquery.autogrow.textarea.js b/view/theme/diabook-blue/js/jquery.autogrow.textarea.js new file mode 100644 index 000000000..806e34f51 --- /dev/null +++ b/view/theme/diabook-blue/js/jquery.autogrow.textarea.js @@ -0,0 +1,46 @@ +(function($) { + + /* + * Auto-growing textareas; technique ripped from Facebook + */ + $.fn.autogrow = function(options) { + + this.filter('textarea').each(function() { + + var $this = $(this), + minHeight = $this.height(), + lineHeight = $this.css('lineHeight'); + + var shadow = $('<div></div>').css({ + position: 'absolute', + top: -10000, + left: -10000, + width: $(this).width(), + fontSize: $this.css('fontSize'), + fontFamily: $this.css('fontFamily'), + lineHeight: $this.css('lineHeight'), + resize: 'none' + }).appendTo(document.body); + + var update = function() { + + var val = this.value.replace(/</g, '<') + .replace(/>/g, '>') + .replace(/&/g, '&') + .replace(/\n/g, '<br/>'); + + shadow.html(val); + $(this).css('height', Math.max(shadow.height() + 20, minHeight)); + } + + $(this).change(update).keyup(update).keydown(update); + + update.apply(this); + + }); + + return this; + + } + +})(jQuery);
\ No newline at end of file diff --git a/view/theme/diabook-blue/mail_conv.tpl b/view/theme/diabook-blue/mail_conv.tpl index 989f17878..989f17878 100755..100644 --- a/view/theme/diabook-blue/mail_conv.tpl +++ b/view/theme/diabook-blue/mail_conv.tpl diff --git a/view/theme/diabook-blue/nets.tpl b/view/theme/diabook-blue/nets.tpl new file mode 100644 index 000000000..5addf38b1 --- /dev/null +++ b/view/theme/diabook-blue/nets.tpl @@ -0,0 +1,11 @@ +<div id="nets-sidebar" class="widget"> + <h3>$title</h3> + <div id="nets-desc">$desc</div> + + <ul class="nets-ul"> + <li class="tool"><a style="text-decoration: none;" href="$base" class="nets-link{{ if $sel_all }} nets-selected{{ endif }} nets-all">$all</a></li> + {{ for $nets as $net }} + <li class="tool"><a href="$base?nets=$net.ref" class="nets-link{{ if $net.selected }} nets-selected{{ endif }}">$net.name</a></li> + {{ endfor }} + </ul> +</div> diff --git a/view/theme/diabook-blue/photo_view.tpl b/view/theme/diabook-blue/photo_view.tpl index 93b01d623..93b01d623 100755..100644 --- a/view/theme/diabook-blue/photo_view.tpl +++ b/view/theme/diabook-blue/photo_view.tpl diff --git a/view/theme/diabook-blue/profile_side.tpl b/view/theme/diabook-blue/profile_side.tpl index 94396300f..01e80f238 100644 --- a/view/theme/diabook-blue/profile_side.tpl +++ b/view/theme/diabook-blue/profile_side.tpl @@ -7,13 +7,13 @@ </div> <ul id="profile-side-menu" class="menu-profile-side"> - <li id="profile-side-status" class="menu-profile-list home"><a class="menu-profile-list-item" href="$ps.usermenu.status.0">$ps.usermenu.status.1</a></li> - <li id="profile-side-photos" class="menu-profile-list photos"><a class="menu-profile-list-item" href="$ps.usermenu.photos.0">$ps.usermenu.photos.1</a></li> - <li id="profile-side-photos" class="menu-profile-list pscontacts"><a class="menu-profile-list-item" href="$ps.usermenu.contacts.0">$ps.usermenu.contacts.1</a></li> - <li id="profile-side-events" class="menu-profile-list events"><a class="menu-profile-list-item" href="$ps.usermenu.events.0">$ps.usermenu.events.1</a></li> - <li id="profile-side-notes" class="menu-profile-list notes"><a class="menu-profile-list-item" href="$ps.usermenu.notes.0">$ps.usermenu.notes.1</a></li> - <li id="profile-side-foren" class="menu-profile-list foren"><a class="menu-profile-list-item" href="$ps.usermenu.pgroups.0" target="blanc">$ps.usermenu.pgroups.1</a></li> - <li id="profile-side-foren" class="menu-profile-list com_side"><a class="menu-profile-list-item" href="$ps.usermenu.community.0">$ps.usermenu.community.1</a></li> + <li id="profile-side-status" class="menu-profile-list"><a class="menu-profile-list-item" href="$ps.usermenu.status.0">$ps.usermenu.status.1<span class="menu-profile-icon home"></span></a></li> + <li id="profile-side-photos" class="menu-profile-list photos"><a class="menu-profile-list-item" href="$ps.usermenu.photos.0">$ps.usermenu.photos.1<span class="menu-profile-icon photos"></span></a></li> + <li id="profile-side-photos" class="menu-profile-list pscontacts"><a class="menu-profile-list-item" href="$ps.usermenu.contacts.0">$ps.usermenu.contacts.1<span class="menu-profile-icon pscontacts"></span></a></li> + <li id="profile-side-events" class="menu-profile-list events"><a class="menu-profile-list-item" href="$ps.usermenu.events.0">$ps.usermenu.events.1<span class="menu-profile-icon events"></span></a></li> + <li id="profile-side-notes" class="menu-profile-list notes"><a class="menu-profile-list-item" href="$ps.usermenu.notes.0">$ps.usermenu.notes.1<span class="menu-profile-icon notes"></span></a></li> + <li id="profile-side-foren" class="menu-profile-list foren"><a class="menu-profile-list-item" href="$ps.usermenu.pgroups.0" target="blanc">$ps.usermenu.pgroups.1<span class="menu-profile-icon foren"></span></a></li> + <li id="profile-side-foren" class="menu-profile-list com_side"><a class="menu-profile-list-item" href="$ps.usermenu.community.0">$ps.usermenu.community.1<span class="menu-profile-icon com_side"></span></a></li> </ul> </div> diff --git a/view/theme/diabook-blue/rs_common_tabs.tpl b/view/theme/diabook-blue/rs_common_tabs.tpl deleted file mode 100755 index 6a1c5c71b..000000000 --- a/view/theme/diabook-blue/rs_common_tabs.tpl +++ /dev/null @@ -1,6 +0,0 @@ -<h3 style="border-bottom: 1px solid #D2D2D2;">Settings Menu</h3> -<ul class="rs_tabs"> - {{ for $tabs as $tab }} - <li><a href="$tab.url" class="rs_tab button $tab.sel">$tab.label</a></li> - {{ endfor }} -</ul> diff --git a/view/theme/diabook-blue/search_item.tpl b/view/theme/diabook-blue/search_item.tpl index 123834064..123834064 100755..100644 --- a/view/theme/diabook-blue/search_item.tpl +++ b/view/theme/diabook-blue/search_item.tpl diff --git a/view/theme/diabook-blue/style-network.css b/view/theme/diabook-blue/style-network.css index 9baa83e8a..2f25372a9 100644 --- a/view/theme/diabook-blue/style-network.css +++ b/view/theme/diabook-blue/style-network.css @@ -482,8 +482,9 @@ code { } #saved-search-ul .tool:hover, #nets-sidebar .tool:hover, -#sidebar-group-list .tool:hover { - background: #EEE; +#sidebar-group-list .tool:hover, +#fileas-sidebar .tool:hover { + background: #308DBF; } .tool .label { float: left; @@ -907,43 +908,57 @@ ul.menu-popup .empty { .menu-profile-list{ height: auto; overflow: auto; - padding-top: 3px; - padding-bottom: 3px; - padding-left: 16px; min-height: 16px; list-style: none; } .menu-profile-list:hover{ - background: #EEE; + background: #308DBF; } .menu-profile-list-item{ padding-left: 5px; + vertical-align: middle; } .menu-profile-list-item:hover{ text-decoration: none; + } /*http://prothemedesign.com/circular-icons/*/ -.menu-profile-list.home{ +.menu-profile-icon.home{ background: url("../../../view/theme/diabook-blue/icons/home.png") no-repeat; + float: left; + height: 22px; + width: 22px; } -.menu-profile-list.photos{ +.menu-profile-icon.photos{ background: url("../../../view/theme/diabook-blue/icons/mess_side.png") no-repeat; - } -.menu-profile-list.events{ + float: left; + height: 22px; + width: 22px;} +.menu-profile-icon.events{ background: url("../../../view/theme/diabook-blue/icons/events.png") no-repeat; - } -.menu-profile-list.notes{ + float: left; + height: 22px; + width: 22px;} +.menu-profile-icon.notes{ background: url("../../../view/theme/diabook-blue/icons/notes.png") no-repeat; - } -.menu-profile-list.foren{ + float: left; + height: 22px; + width: 22px;} +.menu-profile-icon.foren{ background: url("../../../view/theme/diabook-blue/icons/pubgroups.png") no-repeat; - } -.menu-profile-list.com_side{ + float: left; + height: 22px; + width: 22px;} +.menu-profile-icon.com_side{ background: url("../../../view/theme/diabook-blue/icons/com_side.png") no-repeat; - } -.menu-profile-list.pscontacts{ + float: left; + height: 22px; + width: 22px;} +.menu-profile-icon.pscontacts{ background: url("../../../view/theme/diabook-blue/icons/pscontacts.png") no-repeat; - } + float: left; + height: 22px; + width: 22px;} /* aside */ aside { display: table-cell; @@ -1260,6 +1275,7 @@ transition: all 0.2s ease-in-out; padding: 5px; margin-bottom: 0px; width: 575px; + padding-top: 10px; } .tread-wrapper a{ color: #1872A2; @@ -1326,10 +1342,10 @@ transition: all 0.2s ease-in-out; } .wall-item-container .wall-item-content { - font-size: 12.5px; + max-width: 420px; word-wrap: break-word; - line-height: 1.2; + margin-bottom: 14px; } @@ -1409,7 +1425,7 @@ transition: all 0.2s ease-in-out; } .wall-item-comment-wrapper { - margin: 1px 0px 0px 80px; + margin: 1px 5px 17px 80px; background-color: #fff; width: 500px; } diff --git a/view/theme/diabook-blue/style-profile.css b/view/theme/diabook-blue/style-profile.css index 1a0674771..f0b4fbd02 100644 --- a/view/theme/diabook-blue/style-profile.css +++ b/view/theme/diabook-blue/style-profile.css @@ -1258,6 +1258,7 @@ transition: all 0.2s ease-in-out; padding: 5px; margin-bottom: 0px; width: 575px; + padding-top: 10px; } .tread-wrapper a{ color: #1872A2; @@ -1324,10 +1325,10 @@ transition: all 0.2s ease-in-out; } .wall-item-container .wall-item-content { - font-size: 12.5px; + max-width: 420px; word-wrap: break-word; - line-height: 1.2; + margin-bottom: 14px; } @@ -1406,7 +1407,7 @@ transition: all 0.2s ease-in-out; padding-left: 12px; } .wall-item-comment-wrapper { - margin: 1px 5px 1px 80px; + margin: 1px 5px 17px 80px; } .wall-item-comment-wrapper .comment-edit-photo { display: none; diff --git a/view/theme/diabook-blue/style.css b/view/theme/diabook-blue/style.css index a0202856c..923e63e3e 100644 --- a/view/theme/diabook-blue/style.css +++ b/view/theme/diabook-blue/style.css @@ -82,7 +82,35 @@ #adminpage table tr:hover { background-color: #eeeeee; } #adminpage .selectall { text-align: right; } /* icons */ - +.icon.bb-url{ + background-image: url("../../../view/theme/diabook-blue/icons/bb-url.png"); + float: right; + margin-top: 2px;} +.icon.quote{ + background-image: url("../../../view/theme/diabook-blue/icons/quote.png"); + float: right; + margin-top: 2px;} +.icon.bold{ + background-image: url("../../../view/theme/diabook-blue/icons/bold.png"); + float: right; + margin-top: 2px;} +.icon.underline{ + background-image: url("../../../view/theme/diabook-blue/icons/underline.png"); + float: right; + margin-top: 2px;} +.icon.italic{ + background-image: url("../../../view/theme/diabook-blue/icons/italic.png"); + float: right; + margin-top: 2px;} +.icon.bb-image{ + background-image: url("../../../view/theme/diabook-blue/icons/bb-image.png"); + float: right; + margin-top: 2px;} +.icon.bb-video{ + background-image: url("../../../view/theme/diabook-blue/icons/bb-video.png"); + float: right; + margin-top: 2px;} + .icon.contacts { background-image: url("../../../view/theme/diabook-blue/icons/contacts.png");} .icon.notifications { @@ -498,8 +526,9 @@ code { } #saved-search-ul .tool:hover, #nets-sidebar .tool:hover, -#sidebar-group-list .tool:hover { - background: #EEE; +#sidebar-group-list .tool:hover, +#fileas-sidebar .tool:hover { + background: #308DBF; } .tool .label { float: left; @@ -1003,43 +1032,57 @@ ul.menu-popup .empty { .menu-profile-list{ height: auto; overflow: auto; - padding-top: 3px; - padding-bottom: 3px; - padding-left: 16px; min-height: 16px; list-style: none; } .menu-profile-list:hover{ - background: #EEE; + background: #308DBF; } .menu-profile-list-item{ padding-left: 5px; + vertical-align: middle; } .menu-profile-list-item:hover{ text-decoration: none; + } /*http://prothemedesign.com/circular-icons/*/ -.menu-profile-list.home{ +.menu-profile-icon.home{ background: url("../../../view/theme/diabook-blue/icons/home.png") no-repeat; + float: left; + height: 22px; + width: 22px; } -.menu-profile-list.photos{ +.menu-profile-icon.photos{ background: url("../../../view/theme/diabook-blue/icons/mess_side.png") no-repeat; - } -.menu-profile-list.events{ + float: left; + height: 22px; + width: 22px;} +.menu-profile-icon.events{ background: url("../../../view/theme/diabook-blue/icons/events.png") no-repeat; - } -.menu-profile-list.notes{ + float: left; + height: 22px; + width: 22px;} +.menu-profile-icon.notes{ background: url("../../../view/theme/diabook-blue/icons/notes.png") no-repeat; - } -.menu-profile-list.foren{ + float: left; + height: 22px; + width: 22px;} +.menu-profile-icon.foren{ background: url("../../../view/theme/diabook-blue/icons/pubgroups.png") no-repeat; - } -.menu-profile-list.com_side{ + float: left; + height: 22px; + width: 22px;} +.menu-profile-icon.com_side{ background: url("../../../view/theme/diabook-blue/icons/com_side.png") no-repeat; - } -.menu-profile-list.pscontacts{ + float: left; + height: 22px; + width: 22px;} +.menu-profile-icon.pscontacts{ background: url("../../../view/theme/diabook-blue/icons/pscontacts.png") no-repeat; - } + float: left; + height: 22px; + width: 22px;} /* aside */ aside { display: table-cell; @@ -1147,6 +1190,50 @@ aside #side-peoplefind-url { float: left; margin-right: 20px; } +.group_selected { + background: url("../../../view/theme/diabook/icons/selected.png") no-repeat left center; + float: left; + height: 22px; + width: 22px; +} +.group_unselected { + background: url("../../../view/theme/diabook/icons/unselected.png") no-repeat left center; + float: left; + height: 22px; + width: 22px; +} +.icon.text_add { + background-image: url("../../../images/icons/16/add.png"); + float: right; + opacity: 0.1; + margin-right: 14px; + } +.icon.text_add:hover { + background-image: url("../../../images/icons/16/add.png"); + float: right; + cursor: pointer; + margin-right: 14px; + opacity: 1; +-webkit-transition: all 0.2s ease-in-out; +-moz-transition: all 0.2s ease-in-out; +-o-transition: all 0.2s ease-in-out; +-ms-transition: all 0.2s ease-in-out; +transition: all 0.2s ease-in-out; + } +.icon.text_edit { + background-image: url("../../../images/icons/10/edit.png"); + opacity: 0.1; + margin-top: 6px; + float: right; + height: 10px; +} +.icon.text_edit:hover { + background-image: url("../../../images/icons/10/edit.png"); + opacity: 1; + margin-top: 6px; + float: right; + height: 10px; +} /* widget */ .widget { margin-bottom: 2em; @@ -1287,6 +1374,7 @@ body .pageheader{ padding: 5px; margin-bottom: 0px; width: 775px; + padding-top: 10px; } .tread-wrapper a{ color: #1872A2; @@ -1323,10 +1411,10 @@ body .pageheader{ color: #999; } .wall-item-photo-container .wall-item-content { - font-size: 12.5px; + max-width: 720px; word-wrap: break-word; - line-height: 1.2; + margin-bottom: 14px; } .wall-item-photo-container .wall-item-content img { @@ -1469,10 +1557,10 @@ body .pageheader{ } .wall-item-container .wall-item-content { - font-size: 12.5px; + max-width: 720px; word-wrap: break-word; - line-height: 1.2; + margin-bottom: 14px; } @@ -1550,7 +1638,7 @@ body .pageheader{ padding-left: 12px; } .wall-item-comment-wrapper { - margin: 1px 5px 1px 80px; + margin: 1px 5px 17px 80px; } .wall-item-comment-wrapper .comment-edit-photo { display: none; @@ -2074,6 +2162,41 @@ ul.tabs li .active { box-shadow: 0 1px 1px #CFCFCF; margin-left: 5px; } +//settings tabs +ul.rs_tabs { + list-style-type: none; + font-size: 11px; +} +ul.rs_tabs li { + float: left; + margin-bottom: 30px; + clear: both; +} +ul.rs_tabs li .selected { + background-color: #055580; + border: 1px solid #777777; + color: white; + border-radius: 3px 3px 3px 3px; + box-shadow: 2px 2px 2px #CFCFCF; + font-size: 13px; +} +.rs_tabs { + list-style-type: none; + font-size: 11px; + background-position: 0 -20px; + background-repeat: repeat-x; + height: 27px; + padding: 0; + } +.rs_tab.button { + /*background: none repeat scroll 0 0 #F8F8F8;*/ + border: 1px solid #CCCCCC; + border-radius: 3px 3px 3px 3px; + font-weight: bolder; + padding: 3px; + color: #333333; + text-decoration: none; + } /** * Form fields */ diff --git a/view/theme/diabook-blue/style.php b/view/theme/diabook-blue/style.php new file mode 100644 index 000000000..330911b77 --- /dev/null +++ b/view/theme/diabook-blue/style.php @@ -0,0 +1,120 @@ +<?php + $line_height=false; + $diabook_font_size=false; + $site_line_height = get_config("diabook-blue","line_height"); + $site_diabook_font_size = get_config("diabook-blue", "font_size" ); + + if (local_user()) { + $line_height = get_pconfig(local_user(), "diabook-blue","line_height"); + $diabook_font_size = get_pconfig(local_user(), "diabook-blue", "font_size"); + } + + if ($line_height===false) $line_height=$site_line_height; + if ($line_height===false) $line_height="1.3"; + if ($diabook_font_size===false) $diabook_font_size=$site_diabook_font_size; + if ($diabook_font_size===false) $diabook_font_size="13"; + + + if (file_exists("$THEMEPATH/style.css")){ + echo file_get_contents("$THEMEPATH/style.css"); + } + + if($diabook_font_size == "14"){ + echo " + .wall-item-container .wall-item-content { + font-size: 14px; + } + + .wall-item-photo-container .wall-item-content { + font-size: 14px; + } + "; + } + if($diabook_font_size == "13.5"){ + echo " + .wall-item-container .wall-item-content { + font-size: 13.5px; + } + + .wall-item-photo-container .wall-item-content { + font-size: 13.5px; + } + "; + } + if($diabook_font_size == "13"){ + echo " + .wall-item-container .wall-item-content { + font-size: 13px; + } + + .wall-item-photo-container .wall-item-content { + font-size: 13px; + } + "; + } + if($diabook_font_size == "12.5"){ + echo " + .wall-item-container .wall-item-content { + font-size: 12.5px; + } + + .wall-item-photo-container .wall-item-content { + font-size: 12.5px; + } + "; + } + if($diabook_font_size == "12"){ + echo " + .wall-item-container .wall-item-content { + font-size: 12px; + } + + .wall-item-photo-container .wall-item-content { + font-size: 12px; + } + "; + } + if($line_height == "1.4"){ + echo " + .wall-item-container .wall-item-content { + line-height: 1.4; + } + + .wall-item-photo-container .wall-item-content { + line-height: 1.4; + } + "; + } + if($line_height == "1.3"){ + echo " + .wall-item-container .wall-item-content { + line-height: 1.3; + } + + .wall-item-photo-container .wall-item-content { + line-height: 1.3; + } + "; + } + if($line_height == "1.2"){ + echo " + .wall-item-container .wall-item-content { + line-height: 1.2; + } + + .wall-item-photo-container .wall-item-content { + line-height: 1.2; + } + "; + } + if($line_height == "1.1"){ + echo " + .wall-item-container .wall-item-content { + line-height: 1.1; + } + + .wall-item-photo-container .wall-item-content { + line-height: 1.1; + } + "; + } diff --git a/view/theme/diabook-blue/theme.php b/view/theme/diabook-blue/theme.php index 190533d17..eb2d484ba 100755..100644 --- a/view/theme/diabook-blue/theme.php +++ b/view/theme/diabook-blue/theme.php @@ -3,13 +3,13 @@ /* * Name: Diabook-blue * Description: Diabook-blue: report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu - * Version: (Version: 1.015) + * Version: (Version: 1.018) * Author: */ //print diabook-version for debugging -$diabook_version = "Diabook-blue (Version: 1.015)"; +$diabook_version = "Diabook-blue (Version: 1.018)"; $a->page['htmlhead'] .= sprintf('<script "%s" ></script>', $diabook_version); //change css on network and profilepages @@ -21,7 +21,6 @@ $cssFile = null; */ function diabook_blue_community_info(){ $a = get_app(); - //right_aside at networkpages // last 12 users $aside['$lastusers_title'] = t('Last users'); @@ -279,56 +278,6 @@ if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname']){ } } -//tabs at right_aside on settings page -if ($a->argv[0] === "settings"){ - - $tabs = array( - array( - 'label' => t('Account settings'), - 'url' => $a->get_baseurl(true).'/settings', - 'sel' => (($a->argc == 1)?'active':''), - ), - array( - 'label' => t('Display settings'), - 'url' => $a->get_baseurl(true).'/settings/display', - 'sel' => (($a->argc > 1) && ($a->argv[1] === 'display')?'active':''), - ), - array( - 'label' => t('Edit/Manage Profiles'), - 'url' => $a->get_baseurl(true).'/profiles', - ), - array( - 'label' => t('Connector settings'), - 'url' => $a->get_baseurl(true).'/settings/connectors', - 'sel' => (($a->argc > 1) && ($a->argv[1] === 'connectors')?'active':''), - ), - array( - 'label' => t('Plugin settings'), - 'url' => $a->get_baseurl(true).'/settings/addon', - 'sel' => (($a->argc > 1) && ($a->argv[1] === 'addon')?'active':''), - ), - array( - 'label' => t('Connections'), - 'url' => $a->get_baseurl(true) . '/settings/oauth', - 'sel' => (($a->argc > 1) && ($a->argv[1] === 'oauth')?'active':''), - ), - array( - 'label' => t('Export personal data'), - 'url' => $a->get_baseurl(true) . '/uexport', - 'sel' => '' - ) - ); - $tabtpl = file_get_contents(dirname(__file__).'/rs_common_tabs.tpl') ; - $a->page['aside'] = replace_macros($tabtpl, array( - '$tabs' => $tabs, - )); - - - // CUSTOM CSS - $cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook-blue/style-settings.css"; - -} - // custom css if (!is_null($cssFile)) $a->page['htmlhead'] .= sprintf('<link rel="stylesheet" type="text/css" href="%s" />', $cssFile); @@ -341,6 +290,10 @@ $a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s" ></scrip $imageresizeJS = $a->get_baseurl($ssl_state)."/view/theme/diabook-blue/js/jquery.ae.image.resize.js"; $a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s" ></script>', $imageresizeJS); +//load jquery.autogrow-textarea.js +$autogrowJS = $a->get_baseurl($ssl_state)."/view/theme/diabook-blue/js/jquery.autogrow.textarea.js"; +$a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s" ></script>', $autogrowJS); + //js scripts //comment-edit-wrapper on photo_view if ($a->argv[0].$a->argv[2] === "photos"."image"){ @@ -365,6 +318,15 @@ $a->page['htmlhead'] .= ' }); </script>'; + +$a->page['htmlhead'] .= ' + +<script type="text/javascript"> + +function tautogrow(id){ + $("textarea#comment-edit-text-" +id).autogrow(); + }; + </script>'; $a->page['htmlhead'] .= ' <script> @@ -509,3 +471,36 @@ function restore_boxes(){ alert("Right-hand column was restored. Please refresh your browser"); } </script>';} + +$a->page['htmlhead'] .= ' + +<script type="text/javascript"> +function insertFormatting(comment,BBcode,id) { + + var tmpStr = $("#comment-edit-text-" + id).val(); + if(tmpStr == comment) { + tmpStr = ""; + $("#comment-edit-text-" + id).addClass("comment-edit-text-full"); + $("#comment-edit-text-" + id).removeClass("comment-edit-text-empty"); + openMenu("comment-edit-submit-wrapper-" + id); + } + + textarea = document.getElementById("comment-edit-text-" +id); + if (document.selection) { + textarea.focus(); + selected = document.selection.createRange(); + if (BBcode == "url"){ + selected.text = "["+BBcode+"]" + "http://" + selected.text + "[/"+BBcode+"]"; + } else + selected.text = "["+BBcode+"]" + selected.text + "[/"+BBcode+"]"; + } else if (textarea.selectionStart || textarea.selectionStart == "0") { + var start = textarea.selectionStart; + var end = textarea.selectionEnd; + if (BBcode == "url"){ + textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + "http://" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length); + } else + textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length); + } + return true; +} +</script> '; diff --git a/view/theme/diabook-blue/theme_settings.tpl b/view/theme/diabook-blue/theme_settings.tpl new file mode 100644 index 000000000..a40e0e298 --- /dev/null +++ b/view/theme/diabook-blue/theme_settings.tpl @@ -0,0 +1,8 @@ +{{inc field_select.tpl with $field=$font_size}}{{endinc}} + +{{inc field_select.tpl with $field=$line_height}}{{endinc}} + +<div class="settings-submit-wrapper"> + <input type="submit" value="$submit" class="settings-submit" name="diabook-blue-settings-submit" /> +</div> + diff --git a/view/theme/diabook-red/comment_item.tpl b/view/theme/diabook-red/comment_item.tpl new file mode 100644 index 000000000..47046c371 --- /dev/null +++ b/view/theme/diabook-red/comment_item.tpl @@ -0,0 +1,41 @@ + <div class="comment-wwedit-wrapper" id="comment-edit-wrapper-$id" style="display: block;"> + <form class="comment-edit-form" id="comment-edit-form-$id" action="item" method="post" onsubmit="post_comment($id); return false;"> + <input type="hidden" name="type" value="$type" /> + <input type="hidden" name="profile_uid" value="$profile_uid" /> + <input type="hidden" name="parent" value="$parent" /> + <input type="hidden" name="return" value="$return_path" /> + <input type="hidden" name="jsreload" value="$jsreload" /> + <input type="hidden" name="preview" id="comment-preview-inp-$id" value="0" /> + + <div class="comment-edit-photo" id="comment-edit-photo-$id" > + <a class="comment-edit-photo-link" href="$mylink" title="$mytitle"><img class="my-comment-photo" src="$myphoto" alt="$mytitle" title="$mytitle" /></a> + </div> + <div class="comment-edit-photo-end"></div> + <textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);tautogrow($id)" onBlur="commentClose(this,$id);" >$comment</textarea> + <a class="icon bb-image" onclick="insertFormatting('$comment','img',$id);">img</a> + <a class="icon bb-url" onclick="insertFormatting('$comment','url',$id);">url</a> + <a class="icon bb-video" onclick="insertFormatting('$comment','video',$id);">video</a> + <a class="icon underline" onclick="insertFormatting('$comment','u',$id);">u</a> + <a class="icon italic" onclick="insertFormatting('$comment','i',$id);">i</a> + <a class="icon bold" onclick="insertFormatting('$comment','b',$id);">b</a> + <a class="icon quote" onclick="insertFormatting('$comment','quote',$id);">quote</a> + {{ if $qcomment }} + <select id="qcomment-select-$id" name="qcomment-$id" class="qcomment" onchange="qCommentInsert(this,$id);" > + <option value=""></option> + {{ for $qcomment as $qc }} + <option value="$qc">$qc</option> + {{ endfor }} + </select> + {{ endif }} + + <div class="comment-edit-text-end"></div> + <div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-$id" style="display: none;" > + <input type="submit" onclick="post_comment($id); return false;" id="comment-edit-submit-$id" class="comment-edit-submit" name="submit" value="$submit" /> + <span onclick="preview_comment($id);" id="comment-edit-preview-link-$id" class="fakelink">$preview</span> + <div id="comment-edit-preview-$id" class="comment-edit-preview" style="display:none;"></div> + </div> + + <div class="comment-edit-end"></div> + </form> + + </div> diff --git a/view/theme/diabook-red/communityhome.tpl b/view/theme/diabook-red/communityhome.tpl index c47bfbda5..c47bfbda5 100755..100644 --- a/view/theme/diabook-red/communityhome.tpl +++ b/view/theme/diabook-red/communityhome.tpl diff --git a/view/theme/diabook-red/config.php b/view/theme/diabook-red/config.php new file mode 100644 index 000000000..0b09a8751 --- /dev/null +++ b/view/theme/diabook-red/config.php @@ -0,0 +1,71 @@ +<?php +/** + * Theme settings + */ + + + +function theme_content(&$a){ + if(!local_user()) + return; + + $font_size = get_pconfig(local_user(), 'diabook-red', 'font_size' ); + $line_height = get_pconfig(local_user(), 'diabook-red', 'line_height' ); + + return diabook_form($a,$font_size, $line_height); +} + +function theme_post(&$a){ + if(! local_user()) + return; + + if (isset($_POST['diabook-blue-settings-submit'])){ + set_pconfig(local_user(), 'diabook-red', 'font_size', $_POST['diabook-red_font_size']); + set_pconfig(local_user(), 'diabook-red', 'line_height', $_POST['diabook-red_line_height']); + } +} + + +function theme_admin(&$a){ + $font_size = get_config('diabook-red', 'font_size' ); + $line_height = get_config('diabook-red', 'line_height' ); + + return diabook_form($a,$font_size, $line_height); +} + +function theme_admin_post(&$a){ + if (isset($_POST['diabook-red-settings-submit'])){ + set_config('diabook-red', 'font_size', $_POST['diabook-red_font_size']); + set_config('diabook-red', 'line_height', $_POST['diabook-red_line_height']); + } +} + + +function diabook_form(&$a, $font_size, $line_height){ + $line_heights = array( + "1.4"=>"1.4", + "1.3"=>"1.3", + "1.2"=>"1.2", + "1.1"=>"1.1", + ); + + $font_sizes = array( + '14'=>'14', + '13.5'=>'13.5', + '13'=>'13', + '12.5'=>'12.5', + '12'=>'12', + ); + + + + $t = file_get_contents( dirname(__file__). "/theme_settings.tpl" ); + $o .= replace_macros($t, array( + '$submit' => t('Submit'), + '$baseurl' => $a->get_baseurl(), + '$title' => t("Theme settings"), + '$font_size' => array('diabook-red_font_size', t('Set font-size for posts and comments'), $font_size, '', $font_sizes), + '$line_height' => array('diabook-red_line_height', t('Set line-height for posts and comments'), $line_height, '', $line_heights), + )); + return $o; +} diff --git a/view/theme/diabook-red/contact_template.tpl b/view/theme/diabook-red/contact_template.tpl index 48930b48a..48930b48a 100755..100644 --- a/view/theme/diabook-red/contact_template.tpl +++ b/view/theme/diabook-red/contact_template.tpl diff --git a/view/theme/diabook-red/directory_item.tpl b/view/theme/diabook-red/directory_item.tpl index db1936e4b..db1936e4b 100755..100644 --- a/view/theme/diabook-red/directory_item.tpl +++ b/view/theme/diabook-red/directory_item.tpl diff --git a/view/theme/diabook-red/fpostit/fpostit.js b/view/theme/diabook-red/fpostit/fpostit.js index d183c7573..d183c7573 100755..100644 --- a/view/theme/diabook-red/fpostit/fpostit.js +++ b/view/theme/diabook-red/fpostit/fpostit.js diff --git a/view/theme/diabook-red/generic_links_widget.tpl b/view/theme/diabook-red/generic_links_widget.tpl new file mode 100644 index 000000000..001c1395e --- /dev/null +++ b/view/theme/diabook-red/generic_links_widget.tpl @@ -0,0 +1,11 @@ +<div id="widget_$title"> + {{if $title}}<h3 style="border-bottom: 1px solid #D2D2D2;">$title</h3>{{endif}} + {{if $desc}}<div class="desc">$desc</div>{{endif}} + + <ul class="rs_tabs"> + {{ for $items as $item }} + <li><a href="$item.url" class="rs_tab button {{ if $item.selected }}selected{{ endif }}">$item.label</a></li> + {{ endfor }} + </ul> + +</div> diff --git a/view/theme/diabook-red/group_side.tpl b/view/theme/diabook-red/group_side.tpl index af183d04d..642019049 100755..100644 --- a/view/theme/diabook-red/group_side.tpl +++ b/view/theme/diabook-red/group_side.tpl @@ -1,18 +1,18 @@ -<div id="group-sidebar" class="widget"> - <div class="title tool"> - <h3 class="label">$title</h3> - <a href="group/new" title="$createtext" class="action"><span class="icon text s16 add"></span></a> +<div id="profile_side" > + <div class=""> + <h3 style="margin-left: 2px;">$title<a href="group/new" title="$createtext" class="icon text_add"></a></h3> </div> <div id="sidebar-group-list"> - <ul> + <ul class="menu-profile-side"> {{ for $groups as $group }} - <li class="tool {{ if $group.selected }}selected{{ endif }}"> - <a href="$group.href" class="label"> + <li class="menu-profile-list"> + <span class="menu-profile-icon {{ if $group.selected }}group_selected{{else}}group_unselected{{ endif }}"></span> + <a href="$group.href" class="menu-profile-list-item"> $group.text </a> {{ if $group.edit }} - <a href="$group.edit.href" class="action"><span class="icon text s10 edit"></span></a> + <a href="$group.edit.href" class="action"><span class="icon text_edit" ></span></a> {{ endif }} {{ if $group.cid }} <input type="checkbox" diff --git a/view/theme/diabook-red/icons/attach.png b/view/theme/diabook-red/icons/attach.png Binary files differindex 1958041cf..1958041cf 100755..100644 --- a/view/theme/diabook-red/icons/attach.png +++ b/view/theme/diabook-red/icons/attach.png diff --git a/view/theme/diabook-red/icons/audio.png b/view/theme/diabook-red/icons/audio.png Binary files differindex 8d779a409..8d779a409 100755..100644 --- a/view/theme/diabook-red/icons/audio.png +++ b/view/theme/diabook-red/icons/audio.png diff --git a/view/theme/diabook-red/icons/bb-image.png b/view/theme/diabook-red/icons/bb-image.png Binary files differnew file mode 100644 index 000000000..9a1b32113 --- /dev/null +++ b/view/theme/diabook-red/icons/bb-image.png diff --git a/view/theme/diabook-red/icons/bb-url.png b/view/theme/diabook-red/icons/bb-url.png Binary files differnew file mode 100644 index 000000000..071fc1865 --- /dev/null +++ b/view/theme/diabook-red/icons/bb-url.png diff --git a/view/theme/diabook-red/icons/bb-video.png b/view/theme/diabook-red/icons/bb-video.png Binary files differnew file mode 100644 index 000000000..bd323531e --- /dev/null +++ b/view/theme/diabook-red/icons/bb-video.png diff --git a/view/theme/diabook-red/icons/bold.png b/view/theme/diabook-red/icons/bold.png Binary files differnew file mode 100644 index 000000000..8fab2a10f --- /dev/null +++ b/view/theme/diabook-red/icons/bold.png diff --git a/view/theme/diabook-red/icons/camera.png b/view/theme/diabook-red/icons/camera.png Binary files differindex a5c7f1236..a5c7f1236 100755..100644 --- a/view/theme/diabook-red/icons/camera.png +++ b/view/theme/diabook-red/icons/camera.png diff --git a/view/theme/diabook-red/icons/close_box.png b/view/theme/diabook-red/icons/close_box.png Binary files differindex 28e2675b8..28e2675b8 100755..100644 --- a/view/theme/diabook-red/icons/close_box.png +++ b/view/theme/diabook-red/icons/close_box.png diff --git a/view/theme/diabook-red/icons/com_side.png b/view/theme/diabook-red/icons/com_side.png Binary files differindex bc5969ef1..00186ba05 100644 --- a/view/theme/diabook-red/icons/com_side.png +++ b/view/theme/diabook-red/icons/com_side.png diff --git a/view/theme/diabook-red/icons/contacts.png b/view/theme/diabook-red/icons/contacts.png Binary files differindex 20c990c84..20c990c84 100755..100644 --- a/view/theme/diabook-red/icons/contacts.png +++ b/view/theme/diabook-red/icons/contacts.png diff --git a/view/theme/diabook-red/icons/contacts2.png b/view/theme/diabook-red/icons/contacts2.png Binary files differindex 7817279f4..7817279f4 100755..100644 --- a/view/theme/diabook-red/icons/contacts2.png +++ b/view/theme/diabook-red/icons/contacts2.png diff --git a/view/theme/diabook-red/icons/drop.png b/view/theme/diabook-red/icons/drop.png Binary files differindex 2abb82ef2..2abb82ef2 100755..100644 --- a/view/theme/diabook-red/icons/drop.png +++ b/view/theme/diabook-red/icons/drop.png diff --git a/view/theme/diabook-red/icons/events.png b/view/theme/diabook-red/icons/events.png Binary files differindex 4a0b3f3f1..cf195fbb6 100644 --- a/view/theme/diabook-red/icons/events.png +++ b/view/theme/diabook-red/icons/events.png diff --git a/view/theme/diabook-red/icons/file_as.png b/view/theme/diabook-red/icons/file_as.png Binary files differindex 16713fa53..16713fa53 100755..100644 --- a/view/theme/diabook-red/icons/file_as.png +++ b/view/theme/diabook-red/icons/file_as.png diff --git a/view/theme/diabook-red/icons/home.png b/view/theme/diabook-red/icons/home.png Binary files differindex be47a48fc..5c610805f 100644 --- a/view/theme/diabook-red/icons/home.png +++ b/view/theme/diabook-red/icons/home.png diff --git a/view/theme/diabook-red/icons/italic.png b/view/theme/diabook-red/icons/italic.png Binary files differnew file mode 100644 index 000000000..bf4b2b81d --- /dev/null +++ b/view/theme/diabook-red/icons/italic.png diff --git a/view/theme/diabook-red/icons/link.png b/view/theme/diabook-red/icons/link.png Binary files differindex 0ef666a67..0ef666a67 100755..100644 --- a/view/theme/diabook-red/icons/link.png +++ b/view/theme/diabook-red/icons/link.png diff --git a/view/theme/diabook-red/icons/lock.png b/view/theme/diabook-red/icons/lock.png Binary files differindex 7e34bf279..7e34bf279 100755..100644 --- a/view/theme/diabook-red/icons/lock.png +++ b/view/theme/diabook-red/icons/lock.png diff --git a/view/theme/diabook-red/icons/lupe.png b/view/theme/diabook-red/icons/lupe.png Binary files differindex f8b228347..f8b228347 100755..100644 --- a/view/theme/diabook-red/icons/lupe.png +++ b/view/theme/diabook-red/icons/lupe.png diff --git a/view/theme/diabook-red/icons/mess_side.png b/view/theme/diabook-red/icons/mess_side.png Binary files differindex 49ef896bc..5295e2e74 100644 --- a/view/theme/diabook-red/icons/mess_side.png +++ b/view/theme/diabook-red/icons/mess_side.png diff --git a/view/theme/diabook-red/icons/next.png b/view/theme/diabook-red/icons/next.png Binary files differindex 7b5e25b90..7b5e25b90 100755..100644 --- a/view/theme/diabook-red/icons/next.png +++ b/view/theme/diabook-red/icons/next.png diff --git a/view/theme/diabook-red/icons/notes.png b/view/theme/diabook-red/icons/notes.png Binary files differindex 7d4afca90..28dca30a3 100644 --- a/view/theme/diabook-red/icons/notes.png +++ b/view/theme/diabook-red/icons/notes.png diff --git a/view/theme/diabook-red/icons/notifications.png b/view/theme/diabook-red/icons/notifications.png Binary files differindex 97e5c311c..97e5c311c 100755..100644 --- a/view/theme/diabook-red/icons/notifications.png +++ b/view/theme/diabook-red/icons/notifications.png diff --git a/view/theme/diabook-red/icons/pencil.png b/view/theme/diabook-red/icons/pencil.png Binary files differindex 772e49b17..772e49b17 100755..100644 --- a/view/theme/diabook-red/icons/pencil.png +++ b/view/theme/diabook-red/icons/pencil.png diff --git a/view/theme/diabook-red/icons/photo-menu.jpg b/view/theme/diabook-red/icons/photo-menu.jpg Binary files differindex fde5eb535..fde5eb535 100755..100644 --- a/view/theme/diabook-red/icons/photo-menu.jpg +++ b/view/theme/diabook-red/icons/photo-menu.jpg diff --git a/view/theme/diabook-red/icons/prev.png b/view/theme/diabook-red/icons/prev.png Binary files differindex 55c1464ba..55c1464ba 100755..100644 --- a/view/theme/diabook-red/icons/prev.png +++ b/view/theme/diabook-red/icons/prev.png diff --git a/view/theme/diabook-red/icons/pscontacts.png b/view/theme/diabook-red/icons/pscontacts.png Binary files differindex acf857f32..23a78bcac 100644 --- a/view/theme/diabook-red/icons/pscontacts.png +++ b/view/theme/diabook-red/icons/pscontacts.png diff --git a/view/theme/diabook-red/icons/pubgroups.png b/view/theme/diabook-red/icons/pubgroups.png Binary files differindex 6d9539610..ae04194b1 100644 --- a/view/theme/diabook-red/icons/pubgroups.png +++ b/view/theme/diabook-red/icons/pubgroups.png diff --git a/view/theme/diabook-red/icons/quote.png b/view/theme/diabook-red/icons/quote.png Binary files differnew file mode 100644 index 000000000..a464f2859 --- /dev/null +++ b/view/theme/diabook-red/icons/quote.png diff --git a/view/theme/diabook-red/icons/recycle.png b/view/theme/diabook-red/icons/recycle.png Binary files differindex c3b8d2bf4..c3b8d2bf4 100755..100644 --- a/view/theme/diabook-red/icons/recycle.png +++ b/view/theme/diabook-red/icons/recycle.png diff --git a/view/theme/diabook-red/icons/remote.png b/view/theme/diabook-red/icons/remote.png Binary files differindex a560cc55e..a560cc55e 100755..100644 --- a/view/theme/diabook-red/icons/remote.png +++ b/view/theme/diabook-red/icons/remote.png diff --git a/view/theme/diabook-red/icons/scroll_top.png b/view/theme/diabook-red/icons/scroll_top.png Binary files differindex 0e7f7ae6a..0e7f7ae6a 100755..100644 --- a/view/theme/diabook-red/icons/scroll_top.png +++ b/view/theme/diabook-red/icons/scroll_top.png diff --git a/view/theme/diabook-red/icons/selected.png b/view/theme/diabook-red/icons/selected.png Binary files differindex 2a30ae252..3fcb95c29 100755..100644 --- a/view/theme/diabook-red/icons/selected.png +++ b/view/theme/diabook-red/icons/selected.png diff --git a/view/theme/diabook-red/icons/star.png b/view/theme/diabook-red/icons/star.png Binary files differindex 0b00cb189..0b00cb189 100755..100644 --- a/view/theme/diabook-red/icons/star.png +++ b/view/theme/diabook-red/icons/star.png diff --git a/view/theme/diabook-red/icons/starred.png b/view/theme/diabook-red/icons/starred.png Binary files differindex 2b82dfca3..2b82dfca3 100755..100644 --- a/view/theme/diabook-red/icons/starred.png +++ b/view/theme/diabook-red/icons/starred.png diff --git a/view/theme/diabook-red/icons/tagged.png b/view/theme/diabook-red/icons/tagged.png Binary files differindex 144649ef8..144649ef8 100755..100644 --- a/view/theme/diabook-red/icons/tagged.png +++ b/view/theme/diabook-red/icons/tagged.png diff --git a/view/theme/diabook-red/icons/underline.png b/view/theme/diabook-red/icons/underline.png Binary files differnew file mode 100644 index 000000000..b1b4d3574 --- /dev/null +++ b/view/theme/diabook-red/icons/underline.png diff --git a/view/theme/diabook-red/icons/unlock.png b/view/theme/diabook-red/icons/unlock.png Binary files differindex a0cda0ae5..a0cda0ae5 100755..100644 --- a/view/theme/diabook-red/icons/unlock.png +++ b/view/theme/diabook-red/icons/unlock.png diff --git a/view/theme/diabook-red/icons/unselected.png b/view/theme/diabook-red/icons/unselected.png Binary files differnew file mode 100644 index 000000000..9e9cead4b --- /dev/null +++ b/view/theme/diabook-red/icons/unselected.png diff --git a/view/theme/diabook-red/icons/unstarred.png b/view/theme/diabook-red/icons/unstarred.png Binary files differindex ba3183f5c..ba3183f5c 100755..100644 --- a/view/theme/diabook-red/icons/unstarred.png +++ b/view/theme/diabook-red/icons/unstarred.png diff --git a/view/theme/diabook-red/icons/video.png b/view/theme/diabook-red/icons/video.png Binary files differindex a03d1d818..a03d1d818 100755..100644 --- a/view/theme/diabook-red/icons/video.png +++ b/view/theme/diabook-red/icons/video.png diff --git a/view/theme/diabook-red/icons/weblink.png b/view/theme/diabook-red/icons/weblink.png Binary files differindex 216e78344..216e78344 100755..100644 --- a/view/theme/diabook-red/icons/weblink.png +++ b/view/theme/diabook-red/icons/weblink.png diff --git a/view/theme/diabook-red/jot.tpl b/view/theme/diabook-red/jot.tpl index bd43994b5..bd43994b5 100755..100644 --- a/view/theme/diabook-red/jot.tpl +++ b/view/theme/diabook-red/jot.tpl diff --git a/view/theme/diabook-red/js/jquery.autogrow.textarea.js b/view/theme/diabook-red/js/jquery.autogrow.textarea.js new file mode 100644 index 000000000..806e34f51 --- /dev/null +++ b/view/theme/diabook-red/js/jquery.autogrow.textarea.js @@ -0,0 +1,46 @@ +(function($) { + + /* + * Auto-growing textareas; technique ripped from Facebook + */ + $.fn.autogrow = function(options) { + + this.filter('textarea').each(function() { + + var $this = $(this), + minHeight = $this.height(), + lineHeight = $this.css('lineHeight'); + + var shadow = $('<div></div>').css({ + position: 'absolute', + top: -10000, + left: -10000, + width: $(this).width(), + fontSize: $this.css('fontSize'), + fontFamily: $this.css('fontFamily'), + lineHeight: $this.css('lineHeight'), + resize: 'none' + }).appendTo(document.body); + + var update = function() { + + var val = this.value.replace(/</g, '<') + .replace(/>/g, '>') + .replace(/&/g, '&') + .replace(/\n/g, '<br/>'); + + shadow.html(val); + $(this).css('height', Math.max(shadow.height() + 20, minHeight)); + } + + $(this).change(update).keyup(update).keydown(update); + + update.apply(this); + + }); + + return this; + + } + +})(jQuery);
\ No newline at end of file diff --git a/view/theme/diabook-red/mail_conv.tpl b/view/theme/diabook-red/mail_conv.tpl index 989f17878..989f17878 100755..100644 --- a/view/theme/diabook-red/mail_conv.tpl +++ b/view/theme/diabook-red/mail_conv.tpl diff --git a/view/theme/diabook-red/nets.tpl b/view/theme/diabook-red/nets.tpl new file mode 100644 index 000000000..5addf38b1 --- /dev/null +++ b/view/theme/diabook-red/nets.tpl @@ -0,0 +1,11 @@ +<div id="nets-sidebar" class="widget"> + <h3>$title</h3> + <div id="nets-desc">$desc</div> + + <ul class="nets-ul"> + <li class="tool"><a style="text-decoration: none;" href="$base" class="nets-link{{ if $sel_all }} nets-selected{{ endif }} nets-all">$all</a></li> + {{ for $nets as $net }} + <li class="tool"><a href="$base?nets=$net.ref" class="nets-link{{ if $net.selected }} nets-selected{{ endif }}">$net.name</a></li> + {{ endfor }} + </ul> +</div> diff --git a/view/theme/diabook-red/photo_view.tpl b/view/theme/diabook-red/photo_view.tpl index 09dfb2aae..09dfb2aae 100755..100644 --- a/view/theme/diabook-red/photo_view.tpl +++ b/view/theme/diabook-red/photo_view.tpl diff --git a/view/theme/diabook-red/profile_side.tpl b/view/theme/diabook-red/profile_side.tpl index 94396300f..01e80f238 100644 --- a/view/theme/diabook-red/profile_side.tpl +++ b/view/theme/diabook-red/profile_side.tpl @@ -7,13 +7,13 @@ </div> <ul id="profile-side-menu" class="menu-profile-side"> - <li id="profile-side-status" class="menu-profile-list home"><a class="menu-profile-list-item" href="$ps.usermenu.status.0">$ps.usermenu.status.1</a></li> - <li id="profile-side-photos" class="menu-profile-list photos"><a class="menu-profile-list-item" href="$ps.usermenu.photos.0">$ps.usermenu.photos.1</a></li> - <li id="profile-side-photos" class="menu-profile-list pscontacts"><a class="menu-profile-list-item" href="$ps.usermenu.contacts.0">$ps.usermenu.contacts.1</a></li> - <li id="profile-side-events" class="menu-profile-list events"><a class="menu-profile-list-item" href="$ps.usermenu.events.0">$ps.usermenu.events.1</a></li> - <li id="profile-side-notes" class="menu-profile-list notes"><a class="menu-profile-list-item" href="$ps.usermenu.notes.0">$ps.usermenu.notes.1</a></li> - <li id="profile-side-foren" class="menu-profile-list foren"><a class="menu-profile-list-item" href="$ps.usermenu.pgroups.0" target="blanc">$ps.usermenu.pgroups.1</a></li> - <li id="profile-side-foren" class="menu-profile-list com_side"><a class="menu-profile-list-item" href="$ps.usermenu.community.0">$ps.usermenu.community.1</a></li> + <li id="profile-side-status" class="menu-profile-list"><a class="menu-profile-list-item" href="$ps.usermenu.status.0">$ps.usermenu.status.1<span class="menu-profile-icon home"></span></a></li> + <li id="profile-side-photos" class="menu-profile-list photos"><a class="menu-profile-list-item" href="$ps.usermenu.photos.0">$ps.usermenu.photos.1<span class="menu-profile-icon photos"></span></a></li> + <li id="profile-side-photos" class="menu-profile-list pscontacts"><a class="menu-profile-list-item" href="$ps.usermenu.contacts.0">$ps.usermenu.contacts.1<span class="menu-profile-icon pscontacts"></span></a></li> + <li id="profile-side-events" class="menu-profile-list events"><a class="menu-profile-list-item" href="$ps.usermenu.events.0">$ps.usermenu.events.1<span class="menu-profile-icon events"></span></a></li> + <li id="profile-side-notes" class="menu-profile-list notes"><a class="menu-profile-list-item" href="$ps.usermenu.notes.0">$ps.usermenu.notes.1<span class="menu-profile-icon notes"></span></a></li> + <li id="profile-side-foren" class="menu-profile-list foren"><a class="menu-profile-list-item" href="$ps.usermenu.pgroups.0" target="blanc">$ps.usermenu.pgroups.1<span class="menu-profile-icon foren"></span></a></li> + <li id="profile-side-foren" class="menu-profile-list com_side"><a class="menu-profile-list-item" href="$ps.usermenu.community.0">$ps.usermenu.community.1<span class="menu-profile-icon com_side"></span></a></li> </ul> </div> diff --git a/view/theme/diabook-red/rs_common_tabs.tpl b/view/theme/diabook-red/rs_common_tabs.tpl deleted file mode 100755 index 6a1c5c71b..000000000 --- a/view/theme/diabook-red/rs_common_tabs.tpl +++ /dev/null @@ -1,6 +0,0 @@ -<h3 style="border-bottom: 1px solid #D2D2D2;">Settings Menu</h3> -<ul class="rs_tabs"> - {{ for $tabs as $tab }} - <li><a href="$tab.url" class="rs_tab button $tab.sel">$tab.label</a></li> - {{ endfor }} -</ul> diff --git a/view/theme/diabook-red/search_item.tpl b/view/theme/diabook-red/search_item.tpl index 123834064..123834064 100755..100644 --- a/view/theme/diabook-red/search_item.tpl +++ b/view/theme/diabook-red/search_item.tpl diff --git a/view/theme/diabook-red/style-network.css b/view/theme/diabook-red/style-network.css index 8d5e3fec9..17b7af09b 100644 --- a/view/theme/diabook-red/style-network.css +++ b/view/theme/diabook-red/style-network.css @@ -482,8 +482,9 @@ code { } #saved-search-ul .tool:hover, #nets-sidebar .tool:hover, -#sidebar-group-list .tool:hover { - background: #EEE; +#sidebar-group-list .tool:hover, +#fileas-sidebar .tool:hover { + background: #FFE499; } .tool .label { float: left; @@ -941,44 +942,57 @@ ul.menu-popup .empty { } .menu-profile-list{ height: auto; - overflow: auto; - padding-top: 3px; - padding-bottom: 3px; - padding-left: 16px; + overflow: auto; min-height: 16px; list-style: none; } .menu-profile-list:hover{ - background: #EEE; + background: #FFE499; } .menu-profile-list-item{ padding-left: 5px; + vertical-align: middle; } .menu-profile-list-item:hover{ text-decoration: none; } /*http://prothemedesign.com/circular-icons/*/ -.menu-profile-list.home{ +.menu-profile-icon.home{ background: url("../../../view/theme/diabook-red/icons/home.png") no-repeat; + float: left; + height: 22px; + width: 22px; } -.menu-profile-list.photos{ +.menu-profile-icon.photos{ background: url("../../../view/theme/diabook-red/icons/mess_side.png") no-repeat; - } -.menu-profile-list.events{ + float: left; + height: 22px; + width: 22px;} +.menu-profile-icon.events{ background: url("../../../view/theme/diabook-red/icons/events.png") no-repeat; - } -.menu-profile-list.notes{ + float: left; + height: 22px; + width: 22px;} +.menu-profile-icon.notes{ background: url("../../../view/theme/diabook-red/icons/notes.png") no-repeat; - } -.menu-profile-list.foren{ + float: left; + height: 22px; + width: 22px;} +.menu-profile-icon.foren{ background: url("../../../view/theme/diabook-red/icons/pubgroups.png") no-repeat; - } -.menu-profile-list.com_side{ + float: left; + height: 22px; + width: 22px;} +.menu-profile-icon.com_side{ background: url("../../../view/theme/diabook-red/icons/com_side.png") no-repeat; - } -.menu-profile-list.pscontacts{ + float: left; + height: 22px; + width: 22px;} +.menu-profile-icon.pscontacts{ background: url("../../../view/theme/diabook-red/icons/pscontacts.png") no-repeat; - } + float: left; + height: 22px; + width: 22px;} /* aside */ aside { display: table-cell; @@ -1295,6 +1309,7 @@ transition: all 0.2s ease-in-out; padding: 5px; margin-bottom: 0px; width: 575px; + padding-top: 10px; } .tread-wrapper a{ color: red; @@ -1361,10 +1376,10 @@ transition: all 0.2s ease-in-out; } .wall-item-container .wall-item-content { - font-size: 12.5px; + max-width: 420px; word-wrap: break-word; - line-height: 1.2; + margin-bottom: 14px; } @@ -1444,7 +1459,7 @@ transition: all 0.2s ease-in-out; } .wall-item-comment-wrapper { - margin: 1px 0px 0px 80px; + margin: 1px 5px 17px 80px; background-color: #fff; width: 500px; } diff --git a/view/theme/diabook-red/style-profile.css b/view/theme/diabook-red/style-profile.css index 570057b47..74566d5c5 100644 --- a/view/theme/diabook-red/style-profile.css +++ b/view/theme/diabook-red/style-profile.css @@ -1271,6 +1271,7 @@ transition: all 0.2s ease-in-out; padding: 5px; margin-bottom: 0px; width: 575px; + padding-top: 10px; } .tread-wrapper a{ color: red; @@ -1337,10 +1338,10 @@ transition: all 0.2s ease-in-out; } .wall-item-container .wall-item-content { - font-size: 12.5px; + max-width: 420px; word-wrap: break-word; - line-height: 1.2; + margin-bottom: 14px; } @@ -1419,7 +1420,7 @@ transition: all 0.2s ease-in-out; padding-left: 12px; } .wall-item-comment-wrapper { - margin: 1px 5px 1px 80px; + margin: 1px 5px 17px 80px; } .wall-item-comment-wrapper .comment-edit-photo { display: none; diff --git a/view/theme/diabook-red/style-settings.css b/view/theme/diabook-red/style-settings.css deleted file mode 100644 index 43bb3d037..000000000 --- a/view/theme/diabook-red/style-settings.css +++ /dev/null @@ -1,2590 +0,0 @@ -/** - * Fabio Comuni <http://kirgroup.com/profile/fabrixxm> - * Additional Changes: Michael Vogel <icarus@dabo.de> - **/ - -/* ========= */ -/* = Admin = */ -/* ========= */ - -#adminpage { -/* width: 80%;*/ -} - -#pending-update { - float:right; - color: #ffffff; - font-weight: bold; - background-color: #FF0000; - padding: 0em 0.3em; -} - -.admin.linklist { - border: 0px; padding: 0px; -} - -.admin.link { - list-style-position: inside; - font-size: 1em; - padding: 5px; - width: 100px; - margin: 5px; -} - -#adminpage dl { - clear: left; - margin-bottom: 2px; - padding-bottom: 2px; - border-bottom: 1px solid black; -} - -#adminpage dt { - width: 200px; - float: left; - font-weight: bold; -} - -#adminpage dd { - margin-left: 200px; -} -#adminpage h3 { - border-bottom: 1px solid #898989; - margin-bottom: 5px; - margin-top: 10px; -} - -#adminpage .submit { - clear:left; -} - -#adminpage #pluginslist { - margin: 0px; padding: 0px; -} - -#adminpage .plugin { - list-style: none; - display: block; - /* border: 1px solid #888888; */ - padding: 1em; - margin-bottom: 5px; - clear: left; -} - -#adminpage .toggleplugin { - float:left; - margin-right: 1em; -} - -#adminpage table {width:100%; border-bottom: 1p solid #000000; margin: 5px 0px;} -#adminpage table th { text-align: left;} -#adminpage td .icon { float: left;} -#adminpage table#users img { width: 16px; height: 16px; } -#adminpage table tr:hover { background-color: #eeeeee; } -#adminpage .selectall { text-align: right; } -/* icons */ - -.icon.contacts { - background-image: url("../../../view/theme/diabook-red/icons/contacts.png");} -.icon.notifications { - background-image: url("../../../view/theme/diabook-red/icons/notifications.png");} -.icon.notify { - background-image: url("../../../view/theme/diabook-red/icons/notify.png");} -.icon.messages { - background-image: url("../../../view/theme/diabook-red/icons/messages.png");} -.icon.community { - background-image: url("../../../view/theme/diabook-red/icons/community.png");} - -.icon.drop { background-image: url("../../../view/theme/diabook-red/icons/drop.png");} -.icon.drophide { background-image: url("../../../view/theme/diabook-red/icons/drop.png");} -.icon.dislike { background-image: url("../../../view/theme/diabook-red/icons/dislike.png");} -.icon.like { background-image: url("../../../view/theme/diabook-red/icons/like.png");} -.icon.pencil { background-image: url("../../../view/theme/diabook-red/icons/pencil.png");} -.icon.recycle { background-image: url("../../../view/theme/diabook-red/icons/recycle.png");} -.icon.remote-link { background-image: url("../../../view/theme/diabook-red/icons/remote.png");} -.icon.tagged { background-image: url("../../../view/theme/diabook-red/icons/tagged.png");} -.icon.file-as { background-image: url("../../../view/theme/diabook-red/icons/file_as.png");} -.star-item.icon.unstarred { background-image: url("../../../view/theme/diabook-red/icons/unstarred.png");} -.star-item.icon.starred { background-image: url("../../../view/theme/diabook-red/icons/starred.png");} -.icon.link { background-image: url("../../../view/theme/diabook-red/icons/link.png");} -.icon.lock { background-image: url("../../../view/theme/diabook-red/icons/lock.png");} -.icon.unlock { background-image: url("../../../view/theme/diabook-red/icons/unlock.png");} -.icon.language { background-image: url("../../../view/theme/diabook-red/icons/language.png");} - - -.camera { background-image: url("../../../view/theme/diabook-red/icons/camera.png"); - display: block; width: 28px; height: 28px; background-repeat: no-repeat; - } -.attach { background-image: url("../../../view/theme/diabook-red/icons/attach.png"); - display: block; width: 28px; height: 28px; background-repeat: no-repeat; - } -.video2 { background-image: url("../../../view/theme/diabook-red/icons/video.png"); - display: block; width: 28px; height: 28px; background-repeat: no-repeat; - } -.video { background-image: url("../../../view/theme/diabook-red/icons/video.png"); - display: block; width: 100%; height: 28px; background-repeat: no-repeat; - } -.audio2 { background-image: url("../../../view/theme/diabook-red/icons/audio.png"); - display: block; width: 28px; height: 28px; background-repeat: no-repeat; - } -.audio { background-image: url("../../../view/theme/diabook-red/icons/audio.png"); - display: block; width: 28px; height: 28px; background-repeat: no-repeat; - } -.weblink { background-image: url("../../../view/theme/diabook-red/icons/weblink.png"); - display: block; width: 28px; height: 28px; background-repeat: no-repeat; - } -.globe { background-image: url("../../../view/theme/diabook-red/icons/globe.png"); - display: block; width: 28px; height: 28px; background-repeat: no-repeat; - } -.unglobe { background-image: url("../../../view/theme/diabook-red/icons/unglobe.png"); - display: block; width: 28px; height: 28px; background-repeat: no-repeat; - } -.edit {background-image: url("../../../view/theme/diabook-red/icons/pencil2.png"); - display: block; width: 28px; height: 28px; background-repeat: no-repeat;} - - - - -.article { background-position: -50px 0px;} -/*.audio { background-position: -70px 0px;}*/ -.block { background-position: -90px 0px;} -/*.drop { background-position: -110px 0px;}*/ -/*.drophide { background-position: -130px 0px;}*/ -/*.edit { background-position: -150px 0px;}*/ -/*.camera { background-position: -170px 0px;}*/ -/*.dislike { background-position: -190px 0px;}*/ -/*.like { background-position: -210px 0px;}*/ -/*.link { background-position: -230px 0px;}*/ - -/*.globe { background-position: -50px -20px;}*/ -/*.noglobe { background-position: -70px -20px;}*/ -.no { background-position: -90px -20px;} -.pause { background-position: -110px -20px;} -.play { background-position: -130px -20px;} -/*.pencil { background-position: -150px -20px;}*/ -.small-pencil { background-position: -170px -20px;} -/*.recycle { background-position: -190px -20px;}*/ -/*.remote-link { background-position: -210px -20px;}*/ -.share { background-position: -230px -20px;} - -.tools { background-position: -50px -40px;} -/*.lock { background-position: -70px -40px;}*/ - -/*.video { background-position: -110px -40px;}*/ -.youtube { background-position: -130px -40px;} - -/*.attach { background-position: -190px -40px;}*/ -/*.language { background-position: -210px -40px;}*/ - - -.icon.on { background-image: url("../../../view/theme/diabook-red/icons/toogle_on.png"); background-repeat: no-repeat;} -.icon.off { background-image: url("../../../view/theme/diabook-red/icons/toogle_off.png"); background-repeat: no-repeat;} -.prev { background-position: -90px -60px;} -.next { background-position: -110px -60px;} -/*.tagged { background-position: -130px -60px;}*/ - -.attachtype { - display: block; width: 20px; height: 23px; - background-image: url('../../../images/content-types.png'); -} - -.type-video { background-position: 0px 0px; } -.type-image { background-position: -20px 0px; } -.type-audio { background-position: -40px 0px; } -.type-text { background-position: -60px 0px; } -.type-unkn { background-position: -80px 0px; } - -.icon.drop, .icon.drophide { - float: left; -} - -.icon { - display: block; - width: 20px; - height: 20px; - /*background-image: url('icons.png');*/ -} - -.icon { - background-color: transparent ; - background-repeat: no-repeat; - /* background-position: left center; */ - display: block; - overflow: hidden; - text-indent: -9999px; - padding: 1px; -} - -.icon.border.camera{ - background-image: url("../../../view/theme/diabook-red/icons/camera.png"); - display: block; width: 28px; height: 28px; background-repeat: no-repeat; - } - -.icon.border.link{ - background-image: url("../../../view/theme/diabook-red/icons/weblink.png"); - display: block; width: 28px; height: 28px; background-repeat: no-repeat; - margin-left: 10px; - } - -.icon.text { - text-indent: 0px; -} -.icon.s10 { - min-width: 10px; - height: 10px; -} -.icon.s10.notify { - background-image: url("../../../images/icons/10/notify_off.png"); -} -.icon.s10.gear { - background-image: url("../../../images/icons/10/gear.png"); -} -.icon.s10.add { - background-image: url("../../../images/icons/10/add.png"); -} -.icon.s10.delete { - background-image: url("../../../images/icons/10/delete.png"); -} -.icon.s10.edit { - background-image: url("../../../images/icons/10/edit.png"); -} -.icon.s10.star { - background-image: url("../../../images/star_dummy.png"); -} -.icon.s10.menu { - background-image: url("../../../images/icons/10/menu.png"); -} -.icon.s10.link { - background-image: url("../../../images/icons/10/link.png"); -} -.icon.s10.lock { - background-image: url("../../../images/icons/10/lock.png"); -} -.icon.s10.unlock { - background-image: url("../../../images/icons/10/unlock.png"); -} -.icon.s10.text { - padding: 2px 0px 0px 15px; - font-size: 10px; -} -.icon.s16 { - min-width: 16px; - height: 16px; -} -.icon.s16.notify { - background-image: url("../../../images/icons/16/notify_off.png"); -} -.icon.s16.gear { - background-image: url("../../../images/icons/16/gear.png"); -} -.icon.s16.add { - background-image: url("../../../images/icons/16/add.png"); -} -.icon.s16.delete { - background-image: url("../../../images/icons/16/delete.png"); -} -/*.icon.s16.edit { - background-image: url("../../../images/icons/16/edit.png"); -}*/ -.icon.s16.star { - background-image: url("../../../images/star_dummy.png"); -} -.icon.s16.menu { - background-image: url("../../../images/icons/16/menu.png"); -} -/*.icon.s16.link { - background-image: url("../../../images/icons/16/link.png"); -}*/ -.icon.s16.lock { - background-image: url("../../../images/icons/16/lock.png"); -} -.icon.s16.unlock { - background-image: url("../../../images/icons/16/unlock.png"); -} -.icon.s16.text { - padding: 4px 0px 0px 20px; - font-size: 10px; -} -.icon.s22 { - min-width: 22px; - height: 22px; -} -.icon.s22.notify { - background-image: url("../../../images/icons/22/notify_off.png"); -} -.icon.s22.gear { - background-image: url("../../../images/icons/22/gear.png"); -} -.icon.s22.add { - background-image: url("../../../images/icons/22/add.png"); -} -.icon.s22.delete { - background-image: url("../../../images/icons/22/delete.png"); -} -.icon.s22.edit { - background-image: url("../../../images/icons/22/edit.png"); -} -.icon.s22.star { - background-image: url("../../../images/star_dummy.png"); -} -.icon.s22.menu { - background-image: url("../../../images/icons/22/menu.png"); -} -.icon.s22.link { - background-image: url("../../../images/icons/22/link.png"); -} -.icon.s22.lock { - background-image: url("../../../images/icons/22/lock.png"); -} -.icon.s22.unlock { - background-image: url("../../../images/icons/22/unlock.png"); -} -.icon.s22.text { - padding: 10px 0px 0px 25px; - width: 200px; -} -.icon.s48 { - width: 48px; - height: 48px; -} -.icon.s48.notify { - background-image: url("../../../images/icons/48/notify_off.png"); -} -.icon.s48.gear { - background-image: url("../../../images/icons/48/gear.png"); -} -.icon.s48.add { - background-image: url("../../../images/icons/48/add.png"); -} -.icon.s48.delete { - background-image: url("../../../images/icons/48/delete.png"); -} -.icon.s48.edit { - background-image: url("../../../images/icons/48/edit.png"); -} -.icon.s48.star { - background-image: url("../../../images/star_dummy.png"); -} -.icon.s48.menu { - background-image: url("../../../images/icons/48/menu.png"); -} -.icon.s48.link { - background-image: url("../../../images/icons/48/link.png"); -} -.icon.s48.lock { - background-image: url("../../../images/icons/48/lock.png"); -} -.icon.s48.unlock { - background-image: url("../../../images/icons/48/unlock.png"); -} - -#contact-edit-links ul { - list-style: none; - list-style-type: none; -} - -.hide-comments-outer { - margin-left: 80px; - margin-bottom: 5px; - width: 484px; - border-bottom: 1px solid #BDCDD4; - border-top: 1px solid #BDCDD4; - - padding: 8px; -} - -/* global */ -body { - font-family: 'Lato', "Helvetica Neue", Helvetica, Arial, sans-serif; - font-size: 12.5px; - background-color: #ffffff; - color: #2d2d2d; - margin: 50px auto auto; - display: table; -} - -h4 { - font-size: 1.1em; -} - -a { - color: #333333; - /* color: #3e3e8c; */ - text-decoration: none; -} -a:hover { - /* color: blue; */ - text-decoration: underline -} - -.wall-item-name-link { -/* float: left;*/ -} - -.wall-item-photo { - width: 48px; - height: 48px; - overflow: hidden; - display: block; -} - -.left { - float: left; -} -.right { - float: right; -} -.hidden { - display: none; -} -.clear { - clear: both; -} -.fakelink { - color: #333; - /* color: #3e3e8c; */ - text-decoration: none; - cursor: pointer; -} -.fakelink:hover { - /* color: blue; */ - /*color: #005c94; */ - text-decoration: underline; -} -code { - font-family: Courier, monospace; - white-space: pre; - display: block; - overflow: auto; - border: 1px solid #444; - background: #EEE; - color: #444; - padding: 10px; - margin-top: 20px; -} -#panel { - position: absolute; - width: 12em; - background: #ffffff; - color: #2d2d2d; - margin: 0px; - padding: 1em; - list-style: none; - border: 3px solid #364e59; - z-index: 100000; - -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); - -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); - box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); -} -/* tool */ -.tool { - height: auto; - overflow: auto; - padding: 3px; -} -#saved-search-ul .tool:hover, -#nets-sidebar .tool:hover, -#sidebar-group-list .tool:hover { - background: #EEE; -} -.tool .label { - float: left; -} -.tool .action { - float: right; -} -.tool a { - color: ##3F8FBA; -} -.tool a:hover { - text-decoration: none; -} -/* popup notifications */ -div.jGrowl div.notice { - background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center; - color: #ffffff; - padding-left: 58px; -} -div.jGrowl div.info { - background: #364e59 url("../../../images/icons/48/info.png") no-repeat 5px center; - color: #ffffff; - padding-left: 58px; -} -/* header */ -header { - position: fixed; - left: 0%; - right: 80%; - top: 0px; - margin: 0px; - padding: 0px; - width: 22%; - height: 32px; - background: #ff500f; - background-color: #ff500f; - z-index: 100; - border-bottom: 1px; - border-bottom-color: black; - border-bottom-style: inset; - background-image: linear-gradient(bottom, rgb(173,59,10) 0%, rgb(255,79,15) 65%); -background-image: -o-linear-gradient(bottom, rgb(173,59,10) 0%, rgb(255,79,15) 65%); -background-image: -moz-linear-gradient(bottom, rgb(173,59,10) 0%, rgb(255,79,15) 65%); -background-image: -webkit-linear-gradient(bottom, rgb(173,59,10) 0%, rgb(255,79,15) 65%); -background-image: -ms-linear-gradient(bottom, rgb(173,59,10) 0%, rgb(255,79,15) 65%); -} -header #site-location { - display: none; -} -header #banner { - overflow: hidden; - text-align: left; - width: 82%%; - margin-left: 25%; -} -header #banner a, -header #banner a:active, -header #banner a:visited, -header #banner a:link, -header #banner a:hover { - color: #1f1f1f; - text-decoration: none; - outline: none; - vertical-align: middle; - font-weight: bolder; -} -header #banner #logo-img { - height: 25px; - margin-top: 3px; -} -header #banner #logo-text { - font-size: 20px; - position: absolute; - top: 10%; - margin-left: 3px; -} -/* nav */ -nav { - width: 80%; - height: 32px; - position: fixed; - left: 22%; - top: 0px; - padding: 0px; - background: #ff500f; - color: #1f1f1f; - z-index: 99; - border-bottom: 1px; - border-bottom-color: black; - border-bottom-style: inset; - background-image: linear-gradient(bottom, rgb(173,59,10) 0%, rgb(255,79,15) 65%); -background-image: -o-linear-gradient(bottom, rgb(173,59,10) 0%, rgb(255,79,15) 65%); -background-image: -moz-linear-gradient(bottom, rgb(173,59,10) 0%, rgb(255,79,15) 65%); -background-image: -webkit-linear-gradient(bottom, rgb(173,59,10) 0%, rgb(255,79,15) 65%); -background-image: -ms-linear-gradient(bottom, rgb(173,59,10) 0%, rgb(255,79,15) 65%); -} -nav a, -nav a:active, -nav a:visited, -nav a:link, -nav a:hover { - color: #1f1f1f; - text-decoration: none; - outline: none; -} -nav #banner { - overflow: hidden; - /*text-align: center;*/ - width: 100%; -} -nav #banner a, -nav #banner a:active, -nav #banner a:visited, -nav #banner a:link, -nav #banner a:hover { - color: #1f1f1f; - text-decoration: none; - outline: none; - vertical-align: bottom; -} -nav #banner #logo-img { - height: 22px; - margin-top: 5px; -} -nav #banner #logo-text { - font-size: 22px; -} -nav #navbar{ - } -nav ul { - margin: 0px; - padding: 0px 20px; -} -nav ul li { - list-style: none; - margin: 0px; - /* padding: 1px 1px 3px 1px; */ - float: left; -} -nav ul li .menu-popup { - left: 0px; - right: auto; -} - -nav #logo-img { - height: 25px; - margin-top: 4px; - margin-left: 30px; -} - -nav #logo-text { - font-size: 22px; - margin-top: 3px; - margin-right: 15px; -} -nav .nav-menu-search { - position: relative; - - margin: 4px 17px; - margin-right: 0px; - height: 17px; - width: 180px; - -} - -nav #search-box #search-text { - background-image: url('icons/lupe.png'); - background-repeat:no-repeat; - padding-left:20px; - border-top-left-radius: 15px; -border-top-right-radius: 15px; -border-bottom-right-radius: 15px; -border-bottom-left-radius: 15px; - } - - -nav .nav-menu-icon { - position: relative; - height: 22px; - padding: 5px; - margin: 0px 5px; - -moz-border-radius: 5px 5px 0 0; - -webkit-border-radius: 5px 5px 0 0; - border-radius: 5px 5px 0 0; -} -nav .nav-menu-icon:hover { - position: relative; - height: 22px; - padding: 5px; - margin: 0px 5px; - -moz-border-radius: 5px 5px 0 0; - -webkit-border-radius: 5px 5px 0 0; - border-radius: 5px 5px 0 0; -} - -nav .nav-menu-icon.selected { - background-color: #fff4d6; -} -nav .nav-menu-icon img { - width: 22px; - height: 22px; -} -nav .nav-menu-icon .nav-notify { - top: 3px; -} -nav .nav-menu { - position: relative; - height: 16px; - padding: 5px; - margin: 3px 15px 0px; - font-size: 13px; - /*border-bottom: 3px solid #364A84;*/ -} -nav .nav-menu.selected { - /*border-bottom: 3px solid #9eabb0;*/ -} -nav .nav-notify { - display: none; - position: absolute; - background-color: #fff; - /* background-color: #19aeff; */ - -moz-border-radius: 5px 5px 5px 5px; - -webkit-border-radius: 5px 5px 5px 5px; - border-radius: 5px 5px 5px 5px; - font-size: 10px; - font-weight: 900; - padding: 1px 4px; - top: 0px; - right: -6px; - min-width: 10px; - text-align: center; -} -nav .nav-notify.show { - display: block; -} -nav #nav-help-link, -nav #nav-search-link, -nav #nav-directory-link, -nav #nav-apps-link, -nav #nav-site-linkmenu, -nav #nav-home-link, -nav #nav-user-linkmenu -{ - float: right; -} -nav #nav-user-linkmenu{ - margin-right: 0px; - } -nav #nav-home-link, #nav-directory-link, #nav-apps-link{ - margin-left: 0px; - margin-right: 0px; - font-weight: bold; - margin: 3px 5px; - font-size: 15px; - } -nav #nav-directory-link{ - margin-right: 0px; - } -nav #nav-home-link{ - margin-left: 0px; - } -nav #nav-help-link .menu-popup, -nav #nav-search-link .menu-popup, -nav #nav-directory-link .menu-popup, -nav #nav-apps-link .menu-popup, -nav #nav-site-linkmenu .menu-popup { - right: 0px; - left: auto; -} - -nav #nav-messages-linkmenu.on .icon.messages, nav #nav-messages-linkmenu.selected .icon.messages{ - background-image: url("../../../view/theme/diabook-red/icons/messages2.png"); - } - -/*nav #nav-notifications-linkmenu.on .icon.notify,*/ nav #nav-notifications-linkmenu.selected .icon.notify{ - background-image: url("../../../view/theme/diabook-red/icons/notify2.png"); - } - -nav #nav-contacts-linkmenu.on .icon.contacts, nav #nav-contacts-linkmenu.selected .icon.contacts{ - background-image: url("../../../view/theme/diabook-red/icons/contacts2.png"); - } - -nav #nav-apps-link.selected { - background-color: #fff4d6; - moz-border-radius: 5px 5px 0 0; --webkit-border-radius: 5px 5px 0 0; -border-radius: 5px 5px 0 0; -} - -#nav-notifications-mark-all { - /* padding: 1px 1px 2px 26px; */ - /* border-bottom: 1px solid #364E59; */ - /* margin: 0px 0px 2px 0px; - padding: 5px 10px; */ -} - -#nav-notifications-see-all { - /* padding: 1px 1px 2px 26px; */ - /* border-bottom: 1px solid #364E59; */ - /* margin: 0px 0px 2px 0px; - padding: 5px 10px; */ -} - -.notify-seen { - background: none repeat scroll 0 0 #DDDDDD; - } - -ul.menu-popup { - position: absolute; - display: none; - width: 11em; - background: #fff4d6; - color: #2d2d2d; - margin: 0px; - padding: 0px; - list-style: none; - z-index: 100000; - -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); - -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); - box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); -} -ul.menu-popup a { - display: block; - color: #2d2d2d; - padding: 5px 10px; - text-decoration: none; -} -ul.menu-popup a:hover { - background-color: #ffe499; /*bdcdd4;*/ - color: #000; -} -ul.menu-popup .menu-sep { - border-top: 1px solid #9eabb0; -} -ul.menu-popup li { - float: none; - overflow: auto; - height: auto; - display: block; -} -ul.menu-popup li img { - float: left; - width: 16px; - height: 16px; - padding-right: 5px; -} -ul.menu-popup .empty { - padding: 5px; - text-align: center; - color: #9eabb0; -} -/* autocomplete popup */ -.acpopup { - max-height: 150px; - background-color: #ffffff; - color: #2d2d2d; - border: 1px solid #MenuBorder; - overflow: auto; - z-index: 100000; - -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); - -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); - box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); -} -.acpopupitem { - color: #2d2d2d; - padding: 4px; - clear: left; -} -.acpopupitem img { - float: left; - margin-right: 4px; -} -.acpopupitem.selected { - background-color: #bdcdd4; -} -#nav-notifications-menu { - width: 400px; - max-height: 550px; - overflow: auto; -} -/* #nav-notifications-menu a { - display: inline; - padding: 5px 0px; - margin: 0px 0px 2px 0px; -} -#nav-notifications-menu li:hover { - background-color: #bdcdd4; -}*/ - -#nav-notifications-menu img { - float: left; - margin-right: 5px; -} -#nav-notifications-menu .contactname { - font-weight: bold; -} -#nav-notifications-menu .notif-when { - font-size: 10px; - color: #9eabb0; - display: block; -} - -.notif-image { - width: 32px; - height: 32px; - padding: 7px 7px 0px 0px; -} - -/*profile_side*/ -#profile_side { - margin-bottom: 30px; -} -#ps-usericon{ - height: 25px - } -#ps-username{ - font-size: 1.17em; - font-weight: bold; - vertical-align: top; - position: absolute; - padding-top: 4px; - padding-left: 5px; - word-wrap: break-word; - width: 130px; - } -#ps-username:hover{ - text-decoration: none; - } -.menu-profile-side{ - list-style: none; - padding-left: 0px; - min-height: 0px; - } -.menu-profile-list{ - height: auto; - overflow: auto; - padding-top: 3px; - padding-bottom: 3px; - padding-left: 16px; - min-height: 16px; - list-style: none; - } -.menu-profile-list:hover{ - background: #EEE; - } -.menu-profile-list-item{ - padding-left: 5px; - } -.menu-profile-list-item:hover{ - text-decoration: none; - } -/*http://prothemedesign.com/circular-icons/*/ -.menu-profile-list.home{ - background: url("../../../view/theme/diabook-red/icons/home.png") no-repeat; - } -.menu-profile-list.photos{ - background: url("../../../view/theme/diabook-red/icons/mess_side.png") no-repeat; - } -.menu-profile-list.events{ - background: url("../../../view/theme/diabook-red/icons/events.png") no-repeat; - } -.menu-profile-list.notes{ - background: url("../../../view/theme/diabook-red/icons/notes.png") no-repeat; - } -.menu-profile-list.foren{ - background: url("../../../view/theme/diabook-red/icons/pubgroups.png") no-repeat; - } -.menu-profile-list.com_side{ - background: url("../../../view/theme/diabook-red/icons/com_side.png") no-repeat; - } - -/* aside */ -aside { - display: table-cell; - vertical-align: top; - width: 200px; - padding: 0px 10px 0px 10px; - border-right: 1px solid #D2D2D2; - float: left; - /* background: #F1F1F1; */ -} - -aside .vcard { - display: none; -} -aside .vcard .title { - margin-bottom: 5px; -} -aside .vcard dl { - height: auto; - overflow: auto; -} -aside .vcard dt { - float: left; - margin-left: 0px; - /*width: 35%;*/ - text-align: right; - color: #999999; -} -aside .vcard dd { - float: left; - margin-left: 5px; - /*width: 60%;*/ -} -aside #profile-extra-links ul { - padding: 0px; - margin: 0px; -} -aside #profile-extra-links li { - padding: 0px; - margin: 0px; - list-style: none; -} -aside #dfrn-request-link { - display: block; - -moz-border-radius: 5px 5px 5px 5px; - -webkit-border-radius: 5px 5px 5px 5px; - border-radius: 5px 5px 5px 5px; - color: #ffffff; - background: #005c94 url('../../../images/connect-bg.png') no-repeat left center; - font-weight: bold; - text-transform: uppercase; - padding: 4px 2px 2px 35px; -} -aside #dfrn-request-link:hover { - text-decoration: none; - background-color: #36c; - /* background-color: #19aeff; */ -} -aside #profiles-menu { - width: 20em; -} -aside #search-text { - width: 150px; - height: 17px; - padding-left: 10px; - border-top-left-radius: 15px; -border-top-right-radius: 15px; -border-bottom-right-radius: 15px; -border-bottom-left-radius: 15px; -} -aside #side-follow-url { - width: 150px; - } -aside #side-peoplefind-url { - width: 150px; - } -#contact-block { - display: none; -} -#contact-block .contact-block-h4 { - float: left; - margin: 5px 0px; -} -#contact-block .allcontact-link { - float: right; - margin: 5px 0px; -} -#contact-block .contact-block-content { - clear: both; - overflow: auto; - height: auto; -} -#contact-block .contact-block-link { - float: left; - margin: 0px 2px 2px 0px; -} -#contact-block .contact-block-link img { - widht: 48px; - height: 48px; -} -#lost-password-link { - float: left; - margin-right: 20px; - } -/* widget */ -.widget { - margin-bottom: 2em; - /*.action .s10 { width: 10px; overflow: hidden; padding: 0px;} - .action .s16 { width: 16px; overflow: hidden; padding: 0px;}*/ -/* font-size: 12px; */ -} -.widget h3 { - padding: 0px; - margin: 2px; -} -.widget .action { - opacity: 0.1; - -webkit-transition: all 0.2s ease-in-out; - -moz-transition: all 0.2s ease-in-out; - -o-transition: all 0.2s ease-in-out; - -ms-transition: all 0.2s ease-in-out; - transition: all 0.2s ease-in-out; -} -.widget input.action { - opacity: 0.5; - -webkit-transition: all 0.2s ease-in-out; - -moz-transition: all 0.2s ease-in-out; - -o-transition: all 0.2s ease-in-out; - -ms-transition: all 0.2s ease-in-out; - transition: all 0.2s ease-in-out; -} -.widget:hover .title .action { - opacity: 1; - -webkit-transition: all 0.2s ease-in-out; - -moz-transition: all 0.2s ease-in-out; - -o-transition: all 0.2s ease-in-out; - -ms-transition: all 0.2s ease-in-out; - transition: all 0.2s ease-in-out; -} -.widget .tool:hover .action { - opacity: 1; - -webkit-transition: all 0.2s ease-in-out; - -moz-transition: all 0.2s ease-in-out; - -o-transition: all 0.2s ease-in-out; - -ms-transition: all 0.2s ease-in-out; - transition: all 0.2s ease-in-out; -} -.widget .tool:hover .action.ticked { - opacity: 1; - -webkit-transition: all 0.2s ease-in-out; - -moz-transition: all 0.2s ease-in-out; - -o-transition: all 0.2s ease-in-out; - -ms-transition: all 0.2s ease-in-out; - transition: all 0.2s ease-in-out; -} -.widget ul { - padding: 0px; -} -.widget ul li { - padding-left: 16px; - min-height: 16px; - list-style: none; -} -#side-bar-photos-albums li{ -list-style-type: disc; -} -#side-bar-photos-albums ul li{ - margin-left: 30px; - padding-left: 0px; - } -#side-bar-photos-albums ul li a{ - color: #1872A2; -} -.widget .tool.selected { - background: url("../../../view/theme/diabook-red/icons/selected.png") no-repeat left center; -} -/* widget: search */ -span.sbox_l { - background: white url('../../../view/theme/diabook/icons/srch_l.gif') no-repeat top left; - float: left; - width: 19px; height: 19px; - margin-left: 10px; - margin-top: 5px; - -} - -span.sbox_r { - background: white url('../../../view/theme/diabook/icons/srch_r.gif') no-repeat top left; - float: left; - width: 19px; height: 19px; - margin-top: 5px; -} - -span.sbox input { - background: white url('../../../view/theme/diabook/icons/srch_bg.gif') repeat-x top left; - float: left; - margin-top: 5px; - border: 0; - height: 13px; width: 100px; - padding: 3px; - font: 11px/13px arial; - color: #000; -} -#add-search-popup { - width: 200px; - top: 18px; -} -/* section */ -section { - display: table-cell; - vertical-align: top; - width: 650px; - padding: 0px 0px 0px 20px; -} - -body .pageheader{ - text-align: center; - font-size: 20px; - margin-bottom: 20px; - margin-top: 0px; - max-width: 575px; - } - -#id_username { - width: 173px; - } -#id_password { - width: 173px; - } -#id_openid_url { - width: 173px; - } -#contact-edit-end { - } -.pager { - padding: 10px; - text-align: center; - font-size: 1.0em; - clear: both; - display: block; -} - -.tabs {display: none;} -.tab.button{display: none;} -.rs_tabs { - - background-position: 0 -20px; - background-repeat: repeat-x; - height: 27px; - padding: 0; - } -.rs_tab.button { - /*background: none repeat scroll 0 0 #F8F8F8;*/ - border: 1px solid #CCCCCC; - border-radius: 3px 3px 3px 3px; - font-weight: bolder; - padding: 3px; - color: #333333; - text-decoration: none; - } - - -#birthday-notice, #event-notice, #birthday-wrapper, #event-wrapper{ - margin-bottom: 10px; - } - -right_aside { - display: table-cell; - vertical-align: top; - width: 170px; - /*padding-right: 10px;*/ - /*border-left: 1px solid #D2D2D2;*/ - - /* background: #F1F1F1; */ -} -right_aside a{color: red;} -right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 5px; margin-bottom: 0px; -margin-top:30px;} -right_aside .directory-item { width: 50px; height: 50px; vertical-align: center; text-align: center; } -right_aside .directory-photo { margin: 0px; } -right_aside .directory-photo-img { max-width: 45px; max-height: 45px; } -right_aside #likes { margin: 0px; padding: 0px; list-style: none; } -right_aside .items-wrapper{ overflow: auto; width: 100%; } -right_aside #lastusers-wrapper { padding-left: 6px; padding-top: 3px; overflow: auto; width: 100%; } -right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow: auto; width: 100%; } -#page-sidebar-right_aside{margin-top: 0px; margin-bottom: 30px;} -#page-sidebar-right_aside ul {margin-top: 0px;} -#page-sidebar-right_aside .label {max-width: 128px;} -right_aside .icon {width: 10px; height: 10px;} -.close_box { - background-image: url("../../../view/theme/diabook-red/icons/close_box.png"); - float: right; - cursor: pointer; - opacity: 0.1; - } -.close_box:hover { - background-image: url("../../../view/theme/diabook-red/icons/close_box.png"); - float: right; - cursor: pointer; - opacity: 1; --webkit-transition: all 0.2s ease-in-out; --moz-transition: all 0.2s ease-in-out; --o-transition: all 0.2s ease-in-out; --ms-transition: all 0.2s ease-in-out; -transition: all 0.2s ease-in-out; - } -/* wall item */ -.tread-wrapper { - border-bottom: 1px solid #D2D2D2; - position: relative; - padding: 5px; - margin-bottom: 0px; - width: 575px; -} -.tread-wrapper a{ - color: red; -} - -.wall-item-decor { - position: absolute; - left: 790px; - top: -10px; - width: 16px; -} - -.wall-item-container { - display: table; - width: 580px; -} - - -.wall-item-container .wall-item-item, .wall-item-container .wall-item-bottom { - display: table-row; -} - -.wall-item-bottom { - font-size: 13px; -} -.wall-item-container .wall-item-bottom { -/* opacity: 0.5; - -webkit-transition: all 0.2s ease-in-out; - -moz-transition: all 0.2s ease-in-out; - -o-transition: all 0.2s ease-in-out; - -ms-transition: all 0.2s ease-in-out; - transition: all 0.2s ease-in-out; */ -} -.wall-item-container:hover .wall-item-bottom { -/* opacity: 1; - -webkit-transition: all 0.2s ease-in-out; - -moz-transition: all 0.2s ease-in-out; - -o-transition: all 0.2s ease-in-out; - -ms-transition: all 0.2s ease-in-out; - transition: all 0.2s ease-in-out; */ -} -.wall-item-container .wall-item-info { - display: table-cell; - vertical-align: top; - text-align: left; - width: 80px; -} -.wall-item-container .wall-item-location { - padding-right: 40px; - display: table-cell; -} -.wall-item-container .wall-item-ago { - word-wrap: break-word; - width: 50px; - margin-left: 10px; - color: #999; -} -.wall-item-location { - - clear: both; - overflow: hidden; - - margin-bottom: 5px; -} - -.wall-item-container .wall-item-content { - font-size: 12.5px; - max-width: 420px; - word-wrap: break-word; - line-height: 1.2; -} - -.wall-item-container .wall-item-content img { - max-width: 400px; -} -.wall-item-container .wall-item-links, .wall-item-container .wall-item-actions { - display: table-cell; - vertical-align: middle; -} -.wall-item-container .wall-item-links .icon, .wall-item-container .wall-item-actions .icon { - opacity: 0.5; - -webkit-transition: all 0.2s ease-in-out; - -moz-transition: all 0.2s ease-in-out; - -o-transition: all 0.2s ease-in-out; - -ms-transition: all 0.2s ease-in-out; - transition: all 0.2s ease-in-out; -} -.wall-item-container .wall-item-links .icon:hover, .wall-item-container .wall-item-actions .icon:hover { - opacity: 1; - -webkit-transition: all 0.2s ease-in-out; - -moz-transition: all 0.2s ease-in-out; - -o-transition: all 0.2s ease-in-out; - -ms-transition: all 0.2s ease-in-out; - transition: all 0.2s ease-in-out; -} -.wall-item-container .wall-item-name { - font-weight: bold; -} -.wall-item-container .wall-item-actions-author { - width: 100%; - margin-bottom: 0.3em; -} -.wall-item-container .wall-item-actions-social { - float: left; - margin-bottom: 1px; - display: table-cell; -} -.wall-item-container .wall-item-actions-social a { - margin-right: 1em; -} -.wall-item-actions-social a { - float: left; -} -.wall-item-container .wall-item-actions-tools { - float: right; - width: 80px; - display: table-cell; -} -.wall-item-container .wall-item-actions-tools a { - float: right; -} -.wall-item-container .wall-item-actions-tools input { - float: right; -} -.wall-item-container.comment { - margin-top: 5px; - margin-bottom: 5px; - margin-left: 80px; - width: 500px; - border-bottom: 1px solid hsl(198, 21%, 79%); -} -.wall-item-container.comment .contact-photo { - width: 32px; - height: 32px; - margin-left: 16px; - /*background: url(../../../images/icons/22/user.png) no-repeat center center;*/ - -} -.wall-item-container.comment { - top: 15px !important; - left: 15px !important; -} -.wall-item-container.comment .wall-item-links { - padding-left: 12px; -} -.wall-item-comment-wrapper { - margin: 1px 5px 1px 80px; -} -.wall-item-comment-wrapper .comment-edit-photo { - display: none; -} -.wall-item-comment-wrapper textarea { - height: 2.0em; - width: 100%; - font-size: 10px; - color: #999999; - border: 1px solid #DDD; - padding: 0.3em; - font-size: 14px; -} -.wall-item-comment-wrapper .comment-edit-text-full { - font-size: 14px; - height: 4em; - color: #2d2d2d; - border: 1px solid #2d2d2d; -} -.comment-edit-preview { - width: 710px; - border: 1px solid #2d2d2d; - margin-top: 10px; -} -.comment-edit-preview .contact-photo { - width: 32px; - height: 32px; - margin-left: 16px; - /*background: url(../../../images/icons/22/user.png) no-repeat center center;*/ - -} -.comment-edit-preview { - top: 15px !important; - left: 15px !important; -} -.comment-edit-preview .wall-item-links { - padding-left: 12px; -} -.comment-edit-preview .wall-item-container { - width: 700px; -} -.comment-edit-preview .tread-wrapper { - width: 700px; - padding: 0; - margin: 10px 0; -} - -.shiny { - /* border-right: 10px solid #fce94f; */ - border-right: 1px solid #A7C7F7; - padding-right: 12px; -} - -#jot-preview-content{ - margin-top: 30px;} - -#jot-preview-content .tread-wrapper { - background-color: #fff797; -} - -.wall-item-tags { - padding-top: 1px; - padding-bottom: 2px; -} -.tag { - /*background: url("../../../images/tag_b.png") repeat-x center left;*/ - color: #999; - padding-left: 3px; - font-size: 12px; -} -.tag a { - padding-right: 5px; - /*background: url("../../../images/tag.png") no-repeat center right;*/ - color: #999; -} -.wwto { - position: absolute !important; - width: 25px; - height: 25px; - background: #FFFFFF; - border: 2px solid #364e59; - height: 25px; - width: 25px; - overflow: hidden; - padding: 1px; - position: absolute !important; - top: 40px; - left: 30px; - -webkit-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7); - -moz-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7); - box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7); -} -.wwto .contact-photo { - width: auto; - height: 25px; -} -/* contacts menu */ -.contact-photo-wrapper { - position: relative; - width: 80px; -} - -.contact-photo-wrapper.wwto { - width: 25px; -} - -.contact-photo { - width: 48px; - height: 48px; - overflow: hidden; - display: block; -} -.contact-photo img { - width: 48px; - height: 48px; -} - -.contact-wrapper { - float: left; - width: 90px; - height: 90px; - margin-bottom: 15px; -} -.contact-wrapper .contact-photo { - width: 80px; - height: 80px; -} -.contact-wrapper .contact-photo img { - width: 80px; - height: 80px; -} -.contact-wrapper { - left: 0px; - top: 63px; -} -.contact-photo { - width: 48px; - height: 48px; -} -.contact-photo img { - width: 48px; - height: 48px; -} -.contact-name { - /* text-align: center; */ - /*font-weight: bold;*/ - font-size: 12px; -} -.contact-details { - color: #999999; -} -/* editor */ -.jothidden { - display: none; -} -#jot { - width: 585px; - margin: 0px 2em 20px 0px; -} -#profile-jot-form #profile-jot-text { - height: 2.0em; - width: 99%; - font-size: 15px; - color: #999999; - border: 1px solid #DDD; - padding: 0.3em; - margin-bottom: 10px; -} -#jot #jot-tools { - margin: 0px; - padding: 0px; - height: 40px; - overflow: none; - width: 583px; - background-color: #fff; - border-bottom: 2px solid #9eabb0; -} - -#jot #jot-tools li { - list-style: none; - float: left; - width: 80px; - height: 40px; - border-bottom: 2px solid #9eabb0; -} -#jot #jot-tools li a { - display: block; - color: #cccccc; - width: 100%; - height: 40px; - text-align: center; - line-height: 40px; - overflow: hidden; -} -#jot #jot-tools li:hover { - background-color: #364e59; - border-bottom: 2px solid #bdcdd4; -} -#jot #jot-tools li.perms { - float: right; - width: 40px; -} -#jot #jot-tools li.perms a.unlock { - width: 30px; - border-left: 10px solid #cccccc; - background-color: #cccccc; - background-position: left center; -} -#jot #jot-tools li.perms a.lock { - width: 30px; - border-left: 10px solid #666666; - background-color: #666666; -} -#jot #jot-tools li.submit { - float: right; - background-color: #cccccc; - border-bottom: 2px solid #cccccc; - border-right: 1px solid #666666; - border-left: 1px solid #666666; -} -#jot #jot-tools li.submit input { - border: 0px; - margin: 0px; - padding: 0px; - background-color: #cccccc; - color: #666666; - width: 80px; - height: 40px; - line-height: 40px; -} -#jot #jot-tools li.submit input:hover { - background-color: #bdcdd4; - color: #666666; -} -#jot #jot-tools li.loading { - float: right; - background-color: #ffffff; - width: 20px; - vertical-align: center; - text-align: center; - border-top: 2px solid #9eabb0; - height: 38px; -} -#jot #jot-tools li.loading img { - margin-top: 10px; -} -#profile-jot-form #jot-title { - - border-radius: 5px 5px 5px 5px; - font-weight: bold; - height: 20px; - margin: 0 0 5px; - width: 60%; - border: 1px solid #ffffff; -} -#profile-jot-form #jot-title:-webkit-input-placeholder { - font-weight: normal; -} -#profile-jot-form #jot-title:-moz-placeholder { - font-weight: normal; -} -#profile-jot-form #profile-jot-text_parent #profile-jot-text_tbl{ - width: 585px; - height: 100px; - } -#jot #jot-title:hover { - border: 1px solid #999999; -} -#jot #jot-title:focus { - border: 1px solid #999999; -} -#jot #character-counter { - width: 80px; - float: right; - text-align: right; - height: 20px; - line-height: 20px; - padding-right: 20px; -} -#jot-perms-icon, -#profile-location, -#profile-nolocation, -#profile-youtube, -#profile-video, -#profile-audio, -#profile-link, -#profile-title, -#wall-image-upload, -#wall-file-upload, -#wall-image-upload-div, -#wall-file-upload-div, -.hover, .focus { - cursor: pointer; - margin-top: 2px; -} -#profile-jot-wrapper{ - margin: 0 2em 20px 0; - width: 585px; - } - -#profile-jot-submit-wrapper { - margin-bottom: 50px; - width: 585px; -} - -#profile-jot-submit { - float: right; - margin-top: 2px; - font-size: 14px; - -} -#profile-upload-wrapper { - float: left; - margin-top: 2px; - margin-left: 10px; - -} -#profile-attach-wrapper { - float: left; - margin-left: 15px; - margin-top: 2px; -} -#profile-rotator { - float: left; - margin-left: 30px; - margin-top: 2px; -} -#profile-link-wrapper { - float: left; - margin-left: 15px; - margin-top: 2px; -} -#profile-youtube-wrapper { - float: left; - margin-left: 15px; - margin-top: 2px; -} -#profile-video-wrapper { - float: left; - margin-left: 15px; - margin-top: 2px; -} -#profile-audio-wrapper { - float: left; - margin-left: 15px; - margin-top: 2px; -} -#profile-location-wrapper { - float: left; - margin-left: 15px; - margin-top: 2px; -} -#profile-jot-perms { - float: left; - margin-left: 45px; - margin-top: 2px; -} -#jot-preview-link { - float: right; - margin-left: 10px; - margin-top: 2px; - font-size: 9px; - font-weight: bolder; - cursor: pointer; -} -#profile-jot-perms{ - float: right; - margin-left: 10px; - margin-top: 2px; - } -/** buttons **/ -.button.creation1 { - background-color: #fff; - border: 1px solid #777777; - border-radius: 3px 3px 3px 3px; - box-shadow: 0 1px 1px #CFCFCF; - font-weight: bolder; - cursor: pointer; -} -.button.creation2 { - background-color: #FF500F; - border: 1px solid #777777; - color: white; - border-radius: 3px 3px 3px 3px; - box-shadow: 0 1px 1px #CFCFCF; - margin-left: 5px; - font-weight: bolder; - cursor: pointer; -} -/*input[type="submit"] { - border: 0px; - background-color: @ButtonBackgroundColor; - color: @ButtonColor; - padding: 0px 10px; - .rounded(5px); - height: 18px; -}*/ -/** acl **/ -#photo-edit-perms-select, #photos-upload-permissions-wrapper, #profile-jot-acl-wrapper { - display: block!important; -} -#acl-wrapper { - width: 690px; - float: left; -} -#acl-search { - float: right; - background: #ffffff url("../../../images/search_18.png") no-repeat right center; - padding-right: 20px; -} -#acl-showall { - float: left; - display: block; - width: auto; - height: 18px; - background-color: #cccccc; - background-image: url("../../../images/show_all_off.png"); - background-position: 7px 7px; - background-repeat: no-repeat; - padding: 7px 5px 0px 30px; - color: #999999; - -moz-border-radius: 5px 5px 5px 5px; - -webkit-border-radius: 5px 5px 5px 5px; - border-radius: 5px 5px 5px 5px; -} -#acl-showall.selected { - color: #000000; - background-color: #ff9900; - background-image: url("../../../images/show_all_on.png"); -} -#acl-list { - height: 210px; - border: 1px solid #cccccc; - clear: both; - margin-top: 30px; - overflow: auto; -} -.acl-list-item { - display: block; - width: 150px; - height: 30px; - border: 1px solid #cccccc; - margin: 5px; - float: left; -} -.acl-list-item img { - width: 22px; - height: 22px; - float: left; - margin: 4px; -} -.acl-list-item p { - height: 12px; - font-size: 10px; - margin: 0px; - padding: 2px 0px 1px; - overflow: hidden; -} -.acl-list-item a { - font-size: 8px; - display: block; - width: 40px; - height: 10px; - float: left; - color: #999999; - background-color: #cccccc; - background-position: 3px 3px; - background-repeat: no-repeat; - margin-right: 5px; - -webkit-border-radius: 2px ; - -moz-border-radius: 2px; - border-radius: 2px; - padding-left: 15px; -} -#acl-wrapper a:hover { - text-decoration: none; - color: #000000; -} -.acl-button-show { - background-image: url("../../../images/show_off.png"); -} -.acl-button-hide { - background-image: url("../../../images/hide_off.png"); -} -.acl-button-show.selected { - color: #000000; - background-color: #9ade00; - background-image: url("../../../images/show_on.png"); -} -.acl-button-hide.selected { - color: #000000; - background-color: #ff4141; - background-image: url("../../../images/hide_on.png"); -} -.acl-list-item.groupshow { - border-color: #9ade00; -} -.acl-list-item.grouphide { - border-color: #ff4141; -} -/** /acl **/ -/** tab buttons 14618a**/ -ul.rs_tabs { - list-style-type: none; - - font-size: 11px; -} -ul.rs_tabs li { - float: left; - margin-bottom: 30px; - clear: both; -} -ul.rs_tabs li .active { - background-color: #535353; - border: 1px solid #777777; - color: white; - border-radius: 3px 3px 3px 3px; - box-shadow: 2px 2px 2px #CFCFCF; - font-size: 13px; -} -/** - * Form fields - */ -.field { - margin-bottom: 10px; - padding-bottom: 10px; - overflow: auto; - width: 100%; -} -.field label { - float: left; - width: 200px; -} -.field input, .field textarea { - width: 400px; -} -.field textarea { - height: 100px; -} -.field .field_help { - display: block; - margin-left: 200px; - color: #666666; -} -.field .onoff { - float: left; - width: 80px; -} -.field .onoff a { - display: block; - border: 1px solid #666666; - background-image: url("../../../images/onoff.jpg"); - background-repeat: no-repeat; - padding: 4px 2px 2px 2px; - height: 16px; - text-decoration: none; -} -.field .onoff .off { - border-color: #666666; - padding-left: 40px; - background-position: left center; - background-color: #cccccc; - color: #666666; - text-align: right; -} -.field .onoff .on { - border-color: #204A87; - padding-right: 40px; - background-position: right center; - background-color: #D7E3F1; - color: #204A87; - text-align: left; -} -.field .hidden { - display: none!important; -} -.field.radio .field_help { - margin-left: 0px; -} -#directory-search-form{ - margin-bottom: 50px; - } -#profile-edit-links-end { - clear: both; - margin-bottom: 15px; -} - -#profile-edit-links ul { margin: 20px; padding-bottom: 20px; list-style: none; } - -#profile-edit-links li { - float: left; - list-style: none; - margin-left: 10px; -} - -.profile-edit-side-div { - display: none; -} - -#register-form label, -#profile-edit-form label { - width: 300px; float: left; -} - -.required { - display: inline; - color: #B20202; -} - -/* oauth */ -.oauthapp { - height: auto; - overflow: auto; - border-bottom: 2px solid #cccccc; - padding-bottom: 1em; - margin-bottom: 1em; -} -.oauthapp img { - float: left; - width: 48px; - height: 48px; - margin: 10px; -} -.oauthapp img.noicon { - background-image: url("../../../images/icons/48/plugin.png"); - background-position: center center; - background-repeat: no-repeat; -} -.oauthapp a { - float: left; -} -/* contacts */ -.contact-entry-wrapper { - width: 120px; - height: 120px; - float: left; -} -/* photo */ -.photo { -box-shadow: 2px 2px 5px 0px #000000; -margin: 2px 5px 2px 5px; -max-height: 85%; -max-width: 85%; -} -.lframe { - float: left; - /*margin: 0px 10px 10px 0px;*/ -} -/* profile match wrapper */ -.profile-match-wrapper { - float: left; - width: 90px; - height: 90px; - margin-bottom: 20px; -} -.profile-match-wrapper .contact-photo { - width: 80px; - height: 80px; -} -.profile-match-wrapper .contact-photo img { - width: 80px; - height: 80px; -} -.profile-match-wrapper { - left: 0px; - top: 63px; -} - -.contact-photo-menu-button { - position: relative; - background-image: url("../../../images/icons/16/menu.png"); - background-position: top left; - background-repeat: no-repeat; - margin: 0px 0px -16px 0px; - padding: 0px; - width: 16px; - height: 16px; - top: -20px; left:0px; - overflow: hidden; - text-indent: 40px; - display: none; - -} -.contact-photo-menu { - width: 11em; - border: 3px solid #364e59; - color: #2d2d2d; - background: #FFFFFF; -/* position: absolute;*/ - position: relative; - left: 0px; top: 0px; - display: none; - z-index: 10000; -} -.contact-photo-menu ul { margin:0px; padding: 0px; list-style: none } -.contact-photo-menu li a { - display: block; - padding: 5px 10px; - color: #2d2d2d; - text-decoration: none; -} -.contact-photo-menu li a:hover { - background-color: #bdcdd4; -} - -/* page footer */ -footer { - height: 100px; - display: table-row; -} - -blockquote { - border-left: 1px solid #D2D2D2; - padding-left: 9px; - margin: 0 0 0 .8ex; -} -.aprofile dt{ -box-shadow: 1px 1px 5px 0; - color: #666666; - margin: 15px 0 5px; - padding-left: 5px; - } -/* ================== */ -/* = Contacts Block = */ -/* ================== */ - -.contact-block-img { - width: 48px; - height: 48px; - padding-right: 3px; -} -.contact-block-div { - float: left; -} - -.contact-block-textdiv { width: 150px; height: 34px; float: left; } -#contact-block-end { clear: both; } - -#group-edit-wrapper { - margin-bottom: 10px; -} - -#group-members-end { - clear: both; -} -#group-edit-desc { - margin-top: 15px; -} - -/* -#group-separator, -#prof-separator { display: none;} -*/ - -#prvmail-to-label, #prvmail-subject-label, #prvmail-message-label { - margin-bottom: 10px; - margin-top: 20px; -} - -#prvmail-submit { - float: right; - margin-top: 10px; -} - -#prvmail-subject -{ -background: none repeat scroll 0 0 #FFFFFF; -border: 1px solid #CCCCCC; -border-radius: 5px 5px 5px 5px; -font-weight: bold; -height: 20px; -margin: 0 0 5px; -vertical-align: middle; -} -#prvmail-form{ - width: 597px; - } - -#prvmail-upload-wrapper, -#prvmail-link-wrapper, -#prvmail-rotator-wrapper { - float: left; - margin-top: 10px; - margin-right: 10px; - width: 24px; -} - -#prvmail-end { - clear: both; -} - -.mail-list-sender, -.mail-list-detail { - float: left; -} -.mail-list-detail { - margin-left: 20px; -} - -.mail-list-subject { - font-size: 1.1em; - margin-top: 10px; -} -a.mail-list-link { - display: block; - font-size: 1.3em; - padding: 4px 0; -} - -/* -*a.mail-list-link:hover { -* background-color: #15607B; -* color: #F5F6FB; -*} -*/ - -.mail-list-outside-wrapper-end { - clear: both; -} - -.mail-list-outside-wrapper { - margin-top: 30px; -} - -.mail-list-delete-wrapper { - float: right; - margin-right: 30px; - margin-top: 15px; -} - -.mail-list-delete-icon { - border: none; -} - -.mail-conv-sender, -.mail-conv-detail { - float: left; -} -.mail-conv-detail { - margin-left: 20px; - width: 500px; -} - -.mail-conv-subject { - font-size: 1.4em; - margin: 10px 0; -} - -.mail-conv-outside-wrapper-end { - clear: both; -} - -.mail-conv-outside-wrapper { - margin-top: 30px; -} - -.mail-conv-delete-wrapper { - float: right; - margin-right: 30px; - margin-top: 15px; -} -.mail-conv-break { - clear: both; -} - -.mail-conv-delete-icon { - border: none; -} - -/* ========== */ -/* = Events = */ -/* ========== */ -.eventcal { - float: left; - font-size: 20px; -} - -.vevent { - border: 1px solid #CCCCCC; -} -.vevent .event-description, .vevent .event-location { - margin-left: 10px; - margin-right: 10px; -} -.vevent .event-start { - margin-left: 10px; - margin-right: 10px; -} - -#new-event-link { - margin-bottom: 10px; -} - -.edit-event-link, .plink-event-link { - float: left; - margin-top: 4px; - margin-right: 4px; - margin-bottom: 15px; -} - -.event-description:before { - content: url('../../../images/calendar.png'); - margin-right: 15px; -} - -.event-start, .event-end { - margin-left: 10px; - width: 330px; - clear: both; -} - -.event-start .dtstart, .event-end .dtend { - float: right; -} - -.event-list-date { - margin-bottom: 10px; -} - -.prevcal, .nextcal { - float: left; - margin-left: 32px; - margin-right: 32px; - margin-top: 64px; -} -.event-calendar-end { - clear: both; -} - - -.calendar { - font-family: Courier, monospace; -} -.calendar.eventcal a { - color: #1872A2; - } -.today { - font-weight: bold; - color: #FF0000; -} - -.settings-block { - border: 1px solid #AAA; - margin: 10px; - padding: 10px; -} - -.app-title { - margin: 10px; -} - -#identity-manage-desc { - margin-top:15px; - margin-bottom: 15px; -} - -#identity-manage-choose { - margin-bottom: 15px; -} - -#identity-submit { - margin-top: 20px; -} - -#photo-prev-link, #photo-next-link { - padding: 10px; - float: left; -} -.lightbox{ - float: left; - } - -#photo-photo { - float: left; -} -#photo-like-div .wall-item-like-buttons { - float: left; - margin-right: 5px; - margin-top: 30px; - } -.comment-edit-text-empty { - margin: 10px 0 0; - width: 85%; -} -.comment-edit-photo { - margin: 10px 0 0; -} -.wall-item-like-buttons .icon.like { -float: left; -} - -#photo-photo-end { - clear: both; -} - -.tabs .comment-wwedit-wrapper { - display: block; - margin-top: 30px; - margin-left: 50px; - } - -.profile-match-photo { - float: left; - text-align: center; - width: 120px; -} - -.profile-match-name { - float: left; - text-align: center; - width: 120px; - overflow: hidden; -} - -.profile-match-break, -.profile-match-end { - clear: both; -} - -.profile-match-connect { - text-align: center; - font-weight: bold; -} - -.profile-match-wrapper { - float: left; - padding: 10px; - width: 120px; - height: 120px; - scroll: auto; -} -#profile-match-wrapper-end { - clear: both; -} - -/* ============= */ -/* = Directory = */ -/* ============= */ -/* contacts menu */ -.contact-photo-wrapper { - position: relative; -} -.contact-photo { - width: 48px; - height: 48px; - overflow: hidden; - display: block; -} -.contact-photo img { - width: 48px; - height: 48px; -} -.contact-photo-menu-button { - display: none; - /* position: absolute; */ - /* position: absolute; */ - left: -2px; - top: -20px; -} -.contact-wrapper { - float: left; - width: 90px; - height: 90px; - margin-bottom: 15px; -} -.contact-wrapper .contact-photo { - width: 80px; - height: 80px; -} -.contact-wrapper .contact-photo img { - width: 80px; - height: 80px; -} -.contact-wrapper .contact-photo-menu-button { - left: 0px; - top: 63px; -} -.directory-item { - float: left; - width: 200px; - height: 200px; -} -.directory-item .contact-photo { - width: 175px; - height: 175px; -} -.directory-item .contact-photo img { - width: 175px; - height: 175px; -} -.contact-name { - text-align: left; - font-weight: bold; - font-size: 12px; -} -.contact-details { - color: #999999; -} -#side-bar-photos-albums li{ -list-style-type: disc; -} -#side-bar-photos-albums ul li{ - margin-left: 30px; - padding-left: 0px; - } -#side-bar-photos-albums{ - margin-top: 15px; - } -.photo-top-photo, .photo-album-photo { - -webkit-border-radius: 5px 5px 0 0; - -moz-border-radius: 5px 5px 0 0; - border-radius: 5px 5px 0 0; -} -.photo-album-image-wrapper, .photo-top-image-wrapper { - float: left; - -moz-box-shadow: 0 0 5px #888; - -webkit-box-shadow: 0 0 5px #888; - box-shadow: 0 0 5px #888; - background-color: #000; - -webkit-border-radius: 5px; - -moz-border-radius: 5px; - border-radius: 5px; - padding-bottom: 20px; - position: relative; - margin: 0 10px 10px 0; - width: 200px; height: 140px; - overflow: hidden; -} -.photo-top-album-name { - width: 100%; - position: absolute; - bottom: 0px; - padding-left: 3px; - background-color: #EEE; -} -.photo-top-album-link{ - color: #1872A2; - } -.photo-top-album-img{ - - } -/*.photo-top-image-wrapper { - position: relative; - float: left; - margin-top: 15px; - margin-right: 15px; - width: 200px; height: 200px; - overflow: hidden; -} -.photo-top-album-name { - width: 100%; - min-height: 2em; - position: absolute; - bottom: 0px; - padding: 0px 3px; - padding-top: 0.5em; - background-color: rgb(255, 255, 255); -}*/ -#photo-top-end { - clear: both; -} - -#photo-top-links { - margin-bottom: 30px; - margin-left: 30px; -} - -#photos-upload-newalbum-div { - float: left; - width: 175px; -} - diff --git a/view/theme/diabook-red/style.css b/view/theme/diabook-red/style.css index 883f11374..a722dbae9 100644 --- a/view/theme/diabook-red/style.css +++ b/view/theme/diabook-red/style.css @@ -82,7 +82,35 @@ #adminpage table tr:hover { background-color: #eeeeee; } #adminpage .selectall { text-align: right; } /* icons */ - +.icon.bb-url{ + background-image: url("../../../view/theme/diabook-red/icons/bb-url.png"); + float: right; + margin-top: 2px;} +.icon.quote{ + background-image: url("../../../view/theme/diabook-red/icons/quote.png"); + float: right; + margin-top: 2px;} +.icon.bold{ + background-image: url("../../../view/theme/diabook-red/icons/bold.png"); + float: right; + margin-top: 2px;} +.icon.underline{ + background-image: url("../../../view/theme/diabook-red/icons/underline.png"); + float: right; + margin-top: 2px;} +.icon.italic{ + background-image: url("../../../view/theme/diabook-red/icons/italic.png"); + float: right; + margin-top: 2px;} +.icon.bb-image{ + background-image: url("../../../view/theme/diabook-red/icons/bb-image.png"); + float: right; + margin-top: 2px;} +.icon.bb-video{ + background-image: url("../../../view/theme/diabook-red/icons/bb-video.png"); + float: right; + margin-top: 2px;} + .icon.contacts { background-image: url("../../../view/theme/diabook-red/icons/contacts.png");} .icon.notifications { @@ -498,8 +526,9 @@ code { } #saved-search-ul .tool:hover, #nets-sidebar .tool:hover, -#sidebar-group-list .tool:hover { - background: #EEE; +#sidebar-group-list .tool:hover, +#fileas-sidebar .tool:hover { + background: #FFE499; } .tool .label { float: left; @@ -1032,44 +1061,57 @@ ul.menu-popup .empty { } .menu-profile-list{ height: auto; - overflow: auto; - padding-top: 3px; - padding-bottom: 3px; - padding-left: 16px; + overflow: auto; min-height: 16px; list-style: none; } .menu-profile-list:hover{ - background: #EEE; + background: #FFE499; } .menu-profile-list-item{ padding-left: 5px; + vertical-align: middle; } .menu-profile-list-item:hover{ text-decoration: none; } /*http://prothemedesign.com/circular-icons/*/ -.menu-profile-list.home{ +.menu-profile-icon.home{ background: url("../../../view/theme/diabook-red/icons/home.png") no-repeat; + float: left; + height: 22px; + width: 22px; } -.menu-profile-list.photos{ +.menu-profile-icon.photos{ background: url("../../../view/theme/diabook-red/icons/mess_side.png") no-repeat; - } -.menu-profile-list.events{ + float: left; + height: 22px; + width: 22px;} +.menu-profile-icon.events{ background: url("../../../view/theme/diabook-red/icons/events.png") no-repeat; - } -.menu-profile-list.notes{ + float: left; + height: 22px; + width: 22px;} +.menu-profile-icon.notes{ background: url("../../../view/theme/diabook-red/icons/notes.png") no-repeat; - } -.menu-profile-list.foren{ + float: left; + height: 22px; + width: 22px;} +.menu-profile-icon.foren{ background: url("../../../view/theme/diabook-red/icons/pubgroups.png") no-repeat; - } -.menu-profile-list.com_side{ + float: left; + height: 22px; + width: 22px;} +.menu-profile-icon.com_side{ background: url("../../../view/theme/diabook-red/icons/com_side.png") no-repeat; - } -.menu-profile-list.pscontacts{ + float: left; + height: 22px; + width: 22px;} +.menu-profile-icon.pscontacts{ background: url("../../../view/theme/diabook-red/icons/pscontacts.png") no-repeat; - } + float: left; + height: 22px; + width: 22px;} /* aside */ aside { display: table-cell; @@ -1177,6 +1219,50 @@ aside #side-peoplefind-url { float: left; margin-right: 20px; } +.group_selected { + background: url("../../../view/theme/diabook/icons/selected.png") no-repeat left center; + float: left; + height: 22px; + width: 22px; +} +.group_unselected { + background: url("../../../view/theme/diabook/icons/unselected.png") no-repeat left center; + float: left; + height: 22px; + width: 22px; +} +.icon.text_add { + background-image: url("../../../images/icons/16/add.png"); + float: right; + opacity: 0.1; + margin-right: 14px; + } +.icon.text_add:hover { + background-image: url("../../../images/icons/16/add.png"); + float: right; + cursor: pointer; + margin-right: 14px; + opacity: 1; +-webkit-transition: all 0.2s ease-in-out; +-moz-transition: all 0.2s ease-in-out; +-o-transition: all 0.2s ease-in-out; +-ms-transition: all 0.2s ease-in-out; +transition: all 0.2s ease-in-out; + } +.icon.text_edit { + background-image: url("../../../images/icons/10/edit.png"); + opacity: 0.1; + margin-top: 6px; + float: right; + height: 10px; +} +.icon.text_edit:hover { + background-image: url("../../../images/icons/10/edit.png"); + opacity: 1; + margin-top: 6px; + float: right; + height: 10px; +} /* widget */ .widget { margin-bottom: 2em; @@ -1317,6 +1403,7 @@ body .pageheader{ padding: 5px; margin-bottom: 0px; width: 775px; + padding-top: 10px; } .tread-wrapper a{ color: red; @@ -1353,10 +1440,10 @@ body .pageheader{ color: #999; } .wall-item-photo-container .wall-item-content { - font-size: 12.5px; + max-width: 720px; word-wrap: break-word; - line-height: 1.2; + margin-bottom: 14px; } .wall-item-photo-container .wall-item-content img { @@ -1498,10 +1585,10 @@ body .pageheader{ } .wall-item-container .wall-item-content { - font-size: 12.5px; + max-width: 720px; word-wrap: break-word; - line-height: 1.2; + margin-bottom: 14px; } @@ -1579,7 +1666,7 @@ body .pageheader{ padding-left: 12px; } .wall-item-comment-wrapper { - margin: 1px 5px 1px 80px; + margin: 1px 5px 17px 80px; } .wall-item-comment-wrapper .comment-edit-photo { display: none; @@ -2103,6 +2190,41 @@ ul.tabs li .active { box-shadow: 2px 2px 2px #CFCFCF; margin-left: 5px; } +//settings tabs +ul.rs_tabs { + list-style-type: none; + font-size: 11px; +} +ul.rs_tabs li { + float: left; + margin-bottom: 30px; + clear: both; +} +ul.rs_tabs li .selected { + background-color: #535353; + border: 1px solid #777777; + color: white; + border-radius: 3px 3px 3px 3px; + box-shadow: 2px 2px 2px #CFCFCF; + font-size: 13px; +} +.rs_tabs { + list-style-type: none; + font-size: 11px; + background-position: 0 -20px; + background-repeat: repeat-x; + height: 27px; + padding: 0; + } +.rs_tab.button { + /*background: none repeat scroll 0 0 #F8F8F8;*/ + border: 1px solid #CCCCCC; + border-radius: 3px 3px 3px 3px; + font-weight: bolder; + padding: 3px; + color: #333333; + text-decoration: none; + } /** * Form fields */ diff --git a/view/theme/diabook-red/style.php b/view/theme/diabook-red/style.php new file mode 100644 index 000000000..35b82ee96 --- /dev/null +++ b/view/theme/diabook-red/style.php @@ -0,0 +1,120 @@ +<?php + $line_height=false; + $diabook_font_size=false; + $site_line_height = get_config("diabook-red","line_height"); + $site_diabook_font_size = get_config("diabook-red", "font_size" ); + + if (local_user()) { + $line_height = get_pconfig(local_user(), "diabook-red","line_height"); + $diabook_font_size = get_pconfig(local_user(), "diabook-red", "font_size"); + } + + if ($line_height===false) $line_height=$site_line_height; + if ($line_height===false) $line_height="1.3"; + if ($diabook_font_size===false) $diabook_font_size=$site_diabook_font_size; + if ($diabook_font_size===false) $diabook_font_size="13"; + + + if (file_exists("$THEMEPATH/style.css")){ + echo file_get_contents("$THEMEPATH/style.css"); + } + + if($diabook_font_size == "14"){ + echo " + .wall-item-container .wall-item-content { + font-size: 14px; + } + + .wall-item-photo-container .wall-item-content { + font-size: 14px; + } + "; + } + if($diabook_font_size == "13.5"){ + echo " + .wall-item-container .wall-item-content { + font-size: 13.5px; + } + + .wall-item-photo-container .wall-item-content { + font-size: 13.5px; + } + "; + } + if($diabook_font_size == "13"){ + echo " + .wall-item-container .wall-item-content { + font-size: 13px; + } + + .wall-item-photo-container .wall-item-content { + font-size: 13px; + } + "; + } + if($diabook_font_size == "12.5"){ + echo " + .wall-item-container .wall-item-content { + font-size: 12.5px; + } + + .wall-item-photo-container .wall-item-content { + font-size: 12.5px; + } + "; + } + if($diabook_font_size == "12"){ + echo " + .wall-item-container .wall-item-content { + font-size: 12px; + } + + .wall-item-photo-container .wall-item-content { + font-size: 12px; + } + "; + } + if($line_height == "1.4"){ + echo " + .wall-item-container .wall-item-content { + line-height: 1.4; + } + + .wall-item-photo-container .wall-item-content { + line-height: 1.4; + } + "; + } + if($line_height == "1.3"){ + echo " + .wall-item-container .wall-item-content { + line-height: 1.3; + } + + .wall-item-photo-container .wall-item-content { + line-height: 1.3; + } + "; + } + if($line_height == "1.2"){ + echo " + .wall-item-container .wall-item-content { + line-height: 1.2; + } + + .wall-item-photo-container .wall-item-content { + line-height: 1.2; + } + "; + } + if($line_height == "1.1"){ + echo " + .wall-item-container .wall-item-content { + line-height: 1.1; + } + + .wall-item-photo-container .wall-item-content { + line-height: 1.1; + } + "; + } diff --git a/view/theme/diabook-red/theme.php b/view/theme/diabook-red/theme.php index 85206baec..479a0130a 100755..100644 --- a/view/theme/diabook-red/theme.php +++ b/view/theme/diabook-red/theme.php @@ -3,13 +3,13 @@ /* * Name: Diabook-red * Description: Diabook-red: report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu - * Version: (Version: 1.015) + * Version: (Version: 1.018) * Author: */ //print diabook-version for debugging -$diabook_version = "Diabook-red (Version: 1.015)"; +$diabook_version = "Diabook-red (Version: 1.018)"; $a->page['htmlhead'] .= sprintf('<script "%s" ></script>', $diabook_version); //change css on network and profilepages @@ -21,7 +21,6 @@ $cssFile = null; */ function diabook_red_community_info(){ $a = get_app(); - //right_aside at networkpages // last 12 users $aside['$lastusers_title'] = t('Last users'); @@ -279,58 +278,6 @@ if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname']){ } } - -//tabs at right_aside on settings page -if ($a->argv[0] === "settings"){ - - $tabs = array( - array( - 'label' => t('Account settings'), - 'url' => $a->get_baseurl(true).'/settings', - 'sel' => (($a->argc == 1)?'active':''), - ), - array( - 'label' => t('Display settings'), - 'url' => $a->get_baseurl(true).'/settings/display', - 'sel' => (($a->argc > 1) && ($a->argv[1] === 'display')?'active':''), - ), - array( - 'label' => t('Edit/Manage Profiles'), - 'url' => $a->get_baseurl(true).'/profiles', - ), - array( - 'label' => t('Connector settings'), - 'url' => $a->get_baseurl(true).'/settings/connectors', - 'sel' => (($a->argc > 1) && ($a->argv[1] === 'connectors')?'active':''), - ), - array( - 'label' => t('Plugin settings'), - 'url' => $a->get_baseurl(true).'/settings/addon', - 'sel' => (($a->argc > 1) && ($a->argv[1] === 'addon')?'active':''), - ), - array( - 'label' => t('Connections'), - 'url' => $a->get_baseurl(true) . '/settings/oauth', - 'sel' => (($a->argc > 1) && ($a->argv[1] === 'oauth')?'active':''), - ), - array( - 'label' => t('Export personal data'), - 'url' => $a->get_baseurl(true) . '/uexport', - 'sel' => '' - ) - ); - $tabtpl = file_get_contents(dirname(__file__).'/rs_common_tabs.tpl') ; - $a->page['aside'] = replace_macros($tabtpl, array( - '$tabs' => $tabs, - )); - - - // CUSTOM CSS - $cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook-red/style-settings.css"; - -} - - // custom css if (!is_null($cssFile)) $a->page['htmlhead'] .= sprintf('<link rel="stylesheet" type="text/css" href="%s" />', $cssFile); @@ -342,6 +289,9 @@ $a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s" ></scrip $imageresizeJS = $a->get_baseurl($ssl_state)."/view/theme/diabook-red/js/jquery.ae.image.resize.js"; $a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s" ></script>', $imageresizeJS); +//load jquery.autogrow-textarea.js +$autogrowJS = $a->get_baseurl($ssl_state)."/view/theme/diabook-red/js/jquery.autogrow.textarea.js"; +$a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s" ></script>', $autogrowJS); //js scripts //comment-edit-wrapper on photo_view @@ -366,6 +316,15 @@ $a->page['htmlhead'] .= ' }); </script>'; + +$a->page['htmlhead'] .= ' + +<script type="text/javascript"> + +function tautogrow(id){ + $("textarea#comment-edit-text-" +id).autogrow(); + }; + </script>'; $a->page['htmlhead'] .= ' <script> @@ -509,4 +468,37 @@ function restore_boxes(){ $.cookie("close_lastlikes","2", { expires: 365, path: "/" }); alert("Right-hand column was restored. Please refresh your browser"); } -</script>';}
\ No newline at end of file +</script>';} + +$a->page['htmlhead'] .= ' + +<script type="text/javascript"> +function insertFormatting(comment,BBcode,id) { + + var tmpStr = $("#comment-edit-text-" + id).val(); + if(tmpStr == comment) { + tmpStr = ""; + $("#comment-edit-text-" + id).addClass("comment-edit-text-full"); + $("#comment-edit-text-" + id).removeClass("comment-edit-text-empty"); + openMenu("comment-edit-submit-wrapper-" + id); + } + + textarea = document.getElementById("comment-edit-text-" +id); + if (document.selection) { + textarea.focus(); + selected = document.selection.createRange(); + if (BBcode == "url"){ + selected.text = "["+BBcode+"]" + "http://" + selected.text + "[/"+BBcode+"]"; + } else + selected.text = "["+BBcode+"]" + selected.text + "[/"+BBcode+"]"; + } else if (textarea.selectionStart || textarea.selectionStart == "0") { + var start = textarea.selectionStart; + var end = textarea.selectionEnd; + if (BBcode == "url"){ + textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + "http://" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length); + } else + textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length); + } + return true; +} +</script> ';
\ No newline at end of file diff --git a/view/theme/diabook-red/theme_settings.tpl b/view/theme/diabook-red/theme_settings.tpl new file mode 100644 index 000000000..9e83ae8f2 --- /dev/null +++ b/view/theme/diabook-red/theme_settings.tpl @@ -0,0 +1,8 @@ +{{inc field_select.tpl with $field=$font_size}}{{endinc}} + +{{inc field_select.tpl with $field=$line_height}}{{endinc}} + +<div class="settings-submit-wrapper"> + <input type="submit" value="$submit" class="settings-submit" name="diabook-red-settings-submit" /> +</div> + diff --git a/view/theme/diabook/comment_item.tpl b/view/theme/diabook/comment_item.tpl new file mode 100644 index 000000000..47046c371 --- /dev/null +++ b/view/theme/diabook/comment_item.tpl @@ -0,0 +1,41 @@ + <div class="comment-wwedit-wrapper" id="comment-edit-wrapper-$id" style="display: block;"> + <form class="comment-edit-form" id="comment-edit-form-$id" action="item" method="post" onsubmit="post_comment($id); return false;"> + <input type="hidden" name="type" value="$type" /> + <input type="hidden" name="profile_uid" value="$profile_uid" /> + <input type="hidden" name="parent" value="$parent" /> + <input type="hidden" name="return" value="$return_path" /> + <input type="hidden" name="jsreload" value="$jsreload" /> + <input type="hidden" name="preview" id="comment-preview-inp-$id" value="0" /> + + <div class="comment-edit-photo" id="comment-edit-photo-$id" > + <a class="comment-edit-photo-link" href="$mylink" title="$mytitle"><img class="my-comment-photo" src="$myphoto" alt="$mytitle" title="$mytitle" /></a> + </div> + <div class="comment-edit-photo-end"></div> + <textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);tautogrow($id)" onBlur="commentClose(this,$id);" >$comment</textarea> + <a class="icon bb-image" onclick="insertFormatting('$comment','img',$id);">img</a> + <a class="icon bb-url" onclick="insertFormatting('$comment','url',$id);">url</a> + <a class="icon bb-video" onclick="insertFormatting('$comment','video',$id);">video</a> + <a class="icon underline" onclick="insertFormatting('$comment','u',$id);">u</a> + <a class="icon italic" onclick="insertFormatting('$comment','i',$id);">i</a> + <a class="icon bold" onclick="insertFormatting('$comment','b',$id);">b</a> + <a class="icon quote" onclick="insertFormatting('$comment','quote',$id);">quote</a> + {{ if $qcomment }} + <select id="qcomment-select-$id" name="qcomment-$id" class="qcomment" onchange="qCommentInsert(this,$id);" > + <option value=""></option> + {{ for $qcomment as $qc }} + <option value="$qc">$qc</option> + {{ endfor }} + </select> + {{ endif }} + + <div class="comment-edit-text-end"></div> + <div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-$id" style="display: none;" > + <input type="submit" onclick="post_comment($id); return false;" id="comment-edit-submit-$id" class="comment-edit-submit" name="submit" value="$submit" /> + <span onclick="preview_comment($id);" id="comment-edit-preview-link-$id" class="fakelink">$preview</span> + <div id="comment-edit-preview-$id" class="comment-edit-preview" style="display:none;"></div> + </div> + + <div class="comment-edit-end"></div> + </form> + + </div> diff --git a/view/theme/diabook/config.php b/view/theme/diabook/config.php new file mode 100644 index 000000000..e5c2932f1 --- /dev/null +++ b/view/theme/diabook/config.php @@ -0,0 +1,84 @@ +<?php +/** + * Theme settings + */ + + + +function theme_content(&$a){ + if(!local_user()) + return; + + $font_size = get_pconfig(local_user(), 'diabook', 'font_size' ); + $line_height = get_pconfig(local_user(), 'diabook', 'line_height' ); + $resolution = get_pconfig(local_user(), 'diabook', 'resolution' ); + + return diabook_form($a,$font_size, $line_height, $resolution); +} + +function theme_post(&$a){ + if(! local_user()) + return; + + if (isset($_POST['diabook-settings-submit'])){ + set_pconfig(local_user(), 'diabook', 'font_size', $_POST['diabook_font_size']); + set_pconfig(local_user(), 'diabook', 'line_height', $_POST['diabook_line_height']); + set_pconfig(local_user(), 'diabook', 'resolution', $_POST['diabook_resolution']); + } +} + + +function theme_admin(&$a){ + $font_size = get_config('diabook', 'font_size' ); + $line_height = get_config('diabook', 'line_height' ); + $resolution = get_config('diabook', 'resolution' ); + + return diabook_form($a,$font_size, $line_height, $resolution); +} + +function theme_admin_post(&$a){ + if (isset($_POST['diabook-settings-submit'])){ + set_config('diabook', 'font_size', $_POST['diabook_font_size']); + set_config('diabook', 'line_height', $_POST['diabook_line_height']); + set_config('diabook', 'resolution', $_POST['diabook_resolution']); + } +} + + +function diabook_form(&$a, $font_size, $line_height, $resolution){ + $line_heights = array( + "1.3"=>"1.3", + "---"=>"---", + "1.5"=>"1.5", + "1.4"=>"1.4", + "1.2"=>"1.2", + "1.1"=>"1.1", + ); + + $font_sizes = array( + '13'=>'13', + "---"=>"---", + "15"=>"15", + '14'=>'14', + '13.5'=>'13.5', + '12.5'=>'12.5', + '12'=>'12', + ); + $resolutions = array( + 'normal'=>'normal', + 'wide'=>'wide', + ); + + + + $t = file_get_contents( dirname(__file__). "/theme_settings.tpl" ); + $o .= replace_macros($t, array( + '$submit' => t('Submit'), + '$baseurl' => $a->get_baseurl(), + '$title' => t("Theme settings"), + '$font_size' => array('diabook_font_size', t('Set font-size for posts and comments'), $font_size, '', $font_sizes), + '$line_height' => array('diabook_line_height', t('Set line-height for posts and comments'), $line_height, '', $line_heights), + '$resolution' => array('diabook_resolution', t('Set resolution for middle column'), $resolution, '', $resolutions), + )); + return $o; +} diff --git a/view/theme/diabook/generic_links_widget.tpl b/view/theme/diabook/generic_links_widget.tpl new file mode 100644 index 000000000..001c1395e --- /dev/null +++ b/view/theme/diabook/generic_links_widget.tpl @@ -0,0 +1,11 @@ +<div id="widget_$title"> + {{if $title}}<h3 style="border-bottom: 1px solid #D2D2D2;">$title</h3>{{endif}} + {{if $desc}}<div class="desc">$desc</div>{{endif}} + + <ul class="rs_tabs"> + {{ for $items as $item }} + <li><a href="$item.url" class="rs_tab button {{ if $item.selected }}selected{{ endif }}">$item.label</a></li> + {{ endfor }} + </ul> + +</div> diff --git a/view/theme/diabook/group_side.tpl b/view/theme/diabook/group_side.tpl index af183d04d..642019049 100755 --- a/view/theme/diabook/group_side.tpl +++ b/view/theme/diabook/group_side.tpl @@ -1,18 +1,18 @@ -<div id="group-sidebar" class="widget"> - <div class="title tool"> - <h3 class="label">$title</h3> - <a href="group/new" title="$createtext" class="action"><span class="icon text s16 add"></span></a> +<div id="profile_side" > + <div class=""> + <h3 style="margin-left: 2px;">$title<a href="group/new" title="$createtext" class="icon text_add"></a></h3> </div> <div id="sidebar-group-list"> - <ul> + <ul class="menu-profile-side"> {{ for $groups as $group }} - <li class="tool {{ if $group.selected }}selected{{ endif }}"> - <a href="$group.href" class="label"> + <li class="menu-profile-list"> + <span class="menu-profile-icon {{ if $group.selected }}group_selected{{else}}group_unselected{{ endif }}"></span> + <a href="$group.href" class="menu-profile-list-item"> $group.text </a> {{ if $group.edit }} - <a href="$group.edit.href" class="action"><span class="icon text s10 edit"></span></a> + <a href="$group.edit.href" class="action"><span class="icon text_edit" ></span></a> {{ endif }} {{ if $group.cid }} <input type="checkbox" diff --git a/view/theme/diabook/icons/bb-image.png b/view/theme/diabook/icons/bb-image.png Binary files differnew file mode 100644 index 000000000..9a1b32113 --- /dev/null +++ b/view/theme/diabook/icons/bb-image.png diff --git a/view/theme/diabook/icons/bb-url.png b/view/theme/diabook/icons/bb-url.png Binary files differnew file mode 100644 index 000000000..071fc1865 --- /dev/null +++ b/view/theme/diabook/icons/bb-url.png diff --git a/view/theme/diabook/icons/bb-video.png b/view/theme/diabook/icons/bb-video.png Binary files differnew file mode 100644 index 000000000..bd323531e --- /dev/null +++ b/view/theme/diabook/icons/bb-video.png diff --git a/view/theme/diabook/icons/bold.png b/view/theme/diabook/icons/bold.png Binary files differnew file mode 100644 index 000000000..8fab2a10f --- /dev/null +++ b/view/theme/diabook/icons/bold.png diff --git a/view/theme/diabook/icons/com_side.png b/view/theme/diabook/icons/com_side.png Binary files differindex bc5969ef1..00186ba05 100644 --- a/view/theme/diabook/icons/com_side.png +++ b/view/theme/diabook/icons/com_side.png diff --git a/view/theme/diabook/icons/contacts.png b/view/theme/diabook/icons/contacts.png Binary files differindex 8a3e69ec1..1fb6d695b 100644 --- a/view/theme/diabook/icons/contacts.png +++ b/view/theme/diabook/icons/contacts.png diff --git a/view/theme/diabook/icons/contacts3.png b/view/theme/diabook/icons/contacts3.png Binary files differnew file mode 100644 index 000000000..8a3e69ec1 --- /dev/null +++ b/view/theme/diabook/icons/contacts3.png diff --git a/view/theme/diabook/icons/events.png b/view/theme/diabook/icons/events.png Binary files differindex 4a0b3f3f1..cf195fbb6 100644 --- a/view/theme/diabook/icons/events.png +++ b/view/theme/diabook/icons/events.png diff --git a/view/theme/diabook/icons/home.png b/view/theme/diabook/icons/home.png Binary files differindex be47a48fc..5c610805f 100644 --- a/view/theme/diabook/icons/home.png +++ b/view/theme/diabook/icons/home.png diff --git a/view/theme/diabook/icons/italic.png b/view/theme/diabook/icons/italic.png Binary files differnew file mode 100644 index 000000000..bf4b2b81d --- /dev/null +++ b/view/theme/diabook/icons/italic.png diff --git a/view/theme/diabook/icons/mess_side.png b/view/theme/diabook/icons/mess_side.png Binary files differindex 49ef896bc..5295e2e74 100644 --- a/view/theme/diabook/icons/mess_side.png +++ b/view/theme/diabook/icons/mess_side.png diff --git a/view/theme/diabook/icons/messages.png b/view/theme/diabook/icons/messages.png Binary files differindex 38e11ef88..ab7b0f491 100755..100644 --- a/view/theme/diabook/icons/messages.png +++ b/view/theme/diabook/icons/messages.png diff --git a/view/theme/diabook/icons/messages3.png b/view/theme/diabook/icons/messages3.png Binary files differnew file mode 100644 index 000000000..4f3ce3693 --- /dev/null +++ b/view/theme/diabook/icons/messages3.png diff --git a/view/theme/diabook/icons/notes.png b/view/theme/diabook/icons/notes.png Binary files differindex 7d4afca90..28dca30a3 100644 --- a/view/theme/diabook/icons/notes.png +++ b/view/theme/diabook/icons/notes.png diff --git a/view/theme/diabook/icons/notifications.png b/view/theme/diabook/icons/notifications.png Binary files differindex 270997740..347f1519e 100755 --- a/view/theme/diabook/icons/notifications.png +++ b/view/theme/diabook/icons/notifications.png diff --git a/view/theme/diabook/icons/notifications3.png b/view/theme/diabook/icons/notifications3.png Binary files differnew file mode 100755 index 000000000..2c9c791c0 --- /dev/null +++ b/view/theme/diabook/icons/notifications3.png diff --git a/view/theme/diabook/icons/notify.png b/view/theme/diabook/icons/notify.png Binary files differindex 9b852d05b..355abb1eb 100755 --- a/view/theme/diabook/icons/notify.png +++ b/view/theme/diabook/icons/notify.png diff --git a/view/theme/diabook/icons/notify3.png b/view/theme/diabook/icons/notify3.png Binary files differnew file mode 100755 index 000000000..9b852d05b --- /dev/null +++ b/view/theme/diabook/icons/notify3.png diff --git a/view/theme/diabook/icons/pscontacts.png b/view/theme/diabook/icons/pscontacts.png Binary files differindex acf857f32..23a78bcac 100644 --- a/view/theme/diabook/icons/pscontacts.png +++ b/view/theme/diabook/icons/pscontacts.png diff --git a/view/theme/diabook/icons/pubgroups.png b/view/theme/diabook/icons/pubgroups.png Binary files differindex 6d9539610..ae04194b1 100644 --- a/view/theme/diabook/icons/pubgroups.png +++ b/view/theme/diabook/icons/pubgroups.png diff --git a/view/theme/diabook/icons/quote.png b/view/theme/diabook/icons/quote.png Binary files differnew file mode 100644 index 000000000..a464f2859 --- /dev/null +++ b/view/theme/diabook/icons/quote.png diff --git a/view/theme/diabook/icons/selected.png b/view/theme/diabook/icons/selected.png Binary files differindex 2a30ae252..3fcb95c29 100755..100644 --- a/view/theme/diabook/icons/selected.png +++ b/view/theme/diabook/icons/selected.png diff --git a/view/theme/diabook/icons/underline.png b/view/theme/diabook/icons/underline.png Binary files differnew file mode 100644 index 000000000..b1b4d3574 --- /dev/null +++ b/view/theme/diabook/icons/underline.png diff --git a/view/theme/diabook/icons/unselected.png b/view/theme/diabook/icons/unselected.png Binary files differnew file mode 100644 index 000000000..9e9cead4b --- /dev/null +++ b/view/theme/diabook/icons/unselected.png diff --git a/view/theme/diabook/js/jquery.autogrow.textarea.js b/view/theme/diabook/js/jquery.autogrow.textarea.js new file mode 100644 index 000000000..806e34f51 --- /dev/null +++ b/view/theme/diabook/js/jquery.autogrow.textarea.js @@ -0,0 +1,46 @@ +(function($) { + + /* + * Auto-growing textareas; technique ripped from Facebook + */ + $.fn.autogrow = function(options) { + + this.filter('textarea').each(function() { + + var $this = $(this), + minHeight = $this.height(), + lineHeight = $this.css('lineHeight'); + + var shadow = $('<div></div>').css({ + position: 'absolute', + top: -10000, + left: -10000, + width: $(this).width(), + fontSize: $this.css('fontSize'), + fontFamily: $this.css('fontFamily'), + lineHeight: $this.css('lineHeight'), + resize: 'none' + }).appendTo(document.body); + + var update = function() { + + var val = this.value.replace(/</g, '<') + .replace(/>/g, '>') + .replace(/&/g, '&') + .replace(/\n/g, '<br/>'); + + shadow.html(val); + $(this).css('height', Math.max(shadow.height() + 20, minHeight)); + } + + $(this).change(update).keyup(update).keydown(update); + + update.apply(this); + + }); + + return this; + + } + +})(jQuery);
\ No newline at end of file diff --git a/view/theme/diabook/nets.tpl b/view/theme/diabook/nets.tpl new file mode 100644 index 000000000..5addf38b1 --- /dev/null +++ b/view/theme/diabook/nets.tpl @@ -0,0 +1,11 @@ +<div id="nets-sidebar" class="widget"> + <h3>$title</h3> + <div id="nets-desc">$desc</div> + + <ul class="nets-ul"> + <li class="tool"><a style="text-decoration: none;" href="$base" class="nets-link{{ if $sel_all }} nets-selected{{ endif }} nets-all">$all</a></li> + {{ for $nets as $net }} + <li class="tool"><a href="$base?nets=$net.ref" class="nets-link{{ if $net.selected }} nets-selected{{ endif }}">$net.name</a></li> + {{ endfor }} + </ul> +</div> diff --git a/view/theme/diabook/profile_side.tpl b/view/theme/diabook/profile_side.tpl index 0762dbe44..01e80f238 100644 --- a/view/theme/diabook/profile_side.tpl +++ b/view/theme/diabook/profile_side.tpl @@ -7,13 +7,13 @@ </div> <ul id="profile-side-menu" class="menu-profile-side"> - <li id="profile-side-status" class="menu-profile-list home"><a class="menu-profile-list-item" href="$ps.usermenu.status.0">$ps.usermenu.status.1</a></li> - <li id="profile-side-photos" class="menu-profile-list photos"><a class="menu-profile-list-item" href="$ps.usermenu.photos.0">$ps.usermenu.photos.1</a></li> - <li id="profile-side-photos" class="menu-profile-list pscontacts"><a class="menu-profile-list-item" href="$ps.usermenu.contacts.0">$ps.usermenu.contacts.1</a></li> - <li id="profile-side-events" class="menu-profile-list events"><a class="menu-profile-list-item" href="$ps.usermenu.events.0">$ps.usermenu.events.1</a></li> - <li id="profile-side-notes" class="menu-profile-list notes"><a class="menu-profile-list-item" href="$ps.usermenu.notes.0">$ps.usermenu.notes.1</a></li> - <li id="profile-side-foren" class="menu-profile-list foren"><a class="menu-profile-list-item" href="$ps.usermenu.pgroups.0" target="blanc">$ps.usermenu.pgroups.1</a></li> - <li id="profile-side-foren" class="menu-profile-list com_side"><a class="menu-profile-list-item" href="$ps.usermenu.community.0">$ps.usermenu.community.1</a></li> + <li id="profile-side-status" class="menu-profile-list"><a class="menu-profile-list-item" href="$ps.usermenu.status.0">$ps.usermenu.status.1<span class="menu-profile-icon home"></span></a></li> + <li id="profile-side-photos" class="menu-profile-list photos"><a class="menu-profile-list-item" href="$ps.usermenu.photos.0">$ps.usermenu.photos.1<span class="menu-profile-icon photos"></span></a></li> + <li id="profile-side-photos" class="menu-profile-list pscontacts"><a class="menu-profile-list-item" href="$ps.usermenu.contacts.0">$ps.usermenu.contacts.1<span class="menu-profile-icon pscontacts"></span></a></li> + <li id="profile-side-events" class="menu-profile-list events"><a class="menu-profile-list-item" href="$ps.usermenu.events.0">$ps.usermenu.events.1<span class="menu-profile-icon events"></span></a></li> + <li id="profile-side-notes" class="menu-profile-list notes"><a class="menu-profile-list-item" href="$ps.usermenu.notes.0">$ps.usermenu.notes.1<span class="menu-profile-icon notes"></span></a></li> + <li id="profile-side-foren" class="menu-profile-list foren"><a class="menu-profile-list-item" href="$ps.usermenu.pgroups.0" target="blanc">$ps.usermenu.pgroups.1<span class="menu-profile-icon foren"></span></a></li> + <li id="profile-side-foren" class="menu-profile-list com_side"><a class="menu-profile-list-item" href="$ps.usermenu.community.0">$ps.usermenu.community.1<span class="menu-profile-icon com_side"></span></a></li> </ul> </div> diff --git a/view/theme/diabook/rs_common_tabs.tpl b/view/theme/diabook/rs_common_tabs.tpl deleted file mode 100755 index 6a1c5c71b..000000000 --- a/view/theme/diabook/rs_common_tabs.tpl +++ /dev/null @@ -1,6 +0,0 @@ -<h3 style="border-bottom: 1px solid #D2D2D2;">Settings Menu</h3> -<ul class="rs_tabs"> - {{ for $tabs as $tab }} - <li><a href="$tab.url" class="rs_tab button $tab.sel">$tab.label</a></li> - {{ endfor }} -</ul> diff --git a/view/theme/diabook-blue/style-settings.css b/view/theme/diabook/style-network-wide.css index e07962bc7..8c4ad0c08 100644 --- a/view/theme/diabook-blue/style-settings.css +++ b/view/theme/diabook/style-network-wide.css @@ -6,7 +6,7 @@ /* ========= */ /* = Admin = */ /* ========= */ - +1024 #adminpage { /* width: 80%;*/ } @@ -84,61 +84,62 @@ /* icons */ .icon.contacts { - background-image: url("../../../view/theme/diabook-blue/icons/contacts.png");} + background-image: url("../../../view/theme/diabook/icons/contacts.png");} .icon.notifications { - background-image: url("../../../view/theme/diabook-blue/icons/notifications.png");} + background-image: url("../../../view/theme/diabook/icons/notifications.png");} .icon.notify { - background-image: url("../../../view/theme/diabook-blue/icons/notify.png");} + background-image: url("../../../view/theme/diabook/icons/notify.png");} .icon.messages { - background-image: url("../../../view/theme/diabook-blue/icons/messages.png");} + background-image: url("../../../view/theme/diabook/icons/messages.png");} .icon.community { - background-image: url("../../../view/theme/diabook-blue/icons/community.png");} + background-image: url("../../../view/theme/diabook/icons/community.png");} -.icon.drop { background-image: url("../../../view/theme/diabook-blue/icons/drop.png");} -.icon.drophide { background-image: url("../../../view/theme/diabook-blue/icons/drop.png");} -.icon.dislike { background-image: url("../../../view/theme/diabook-blue/icons/dislike.png");} -.icon.like { background-image: url("../../../view/theme/diabook-blue/icons/like.png");} -.icon.pencil { background-image: url("../../../view/theme/diabook-blue/icons/pencil.png");} -.icon.recycle { background-image: url("../../../view/theme/diabook-blue/icons/recycle.png");} -.icon.remote-link { background-image: url("../../../view/theme/diabook-blue/icons/remote.png");} -.icon.tagged { background-image: url("../../../view/theme/diabook-blue/icons/tagged.png");} -.icon.file-as { background-image: url("../../../view/theme/diabook-blue/icons/file_as.png");} -.star-item.icon.unstarred { background-image: url("../../../view/theme/diabook-blue/icons/unstarred.png");} -.star-item.icon.starred { background-image: url("../../../view/theme/diabook-blue/icons/starred.png");} -.icon.link { background-image: url("../../../view/theme/diabook-blue/icons/link.png");} -.icon.lock { background-image: url("../../../view/theme/diabook-blue/icons/lock.png");} -.icon.unlock { background-image: url("../../../view/theme/diabook-blue/icons/unlock.png");} -.icon.language { background-image: url("../../../view/theme/diabook-blue/icons/language.png");} - - -.camera { background-image: url("../../../view/theme/diabook-blue/icons/camera.png"); +.icon.drop { background-image: url("../../../view/theme/diabook/icons/drop.png");} +.icon.drophide { background-image: url("../../../view/theme/diabook/icons/drop.png");} +.icon.dislike { background-image: url("../../../view/theme/diabook/icons/dislike.png");} +.icon.like { background-image: url("../../../view/theme/diabook/icons/like.png");} +.icon.pencil { background-image: url("../../../view/theme/diabook/icons/pencil.png");} +.icon.recycle { background-image: url("../../../view/theme/diabook/icons/recycle.png");} +.icon.remote-link { background-image: url("../../../view/theme/diabook/icons/remote.png");} +.icon.tagged { background-image: url("../../../view/theme/diabook/icons/tagged.png");} +.icon.file-as { background-image: url("../../../view/theme/diabook/icons/file_as.png");} +.star-item.icon.unstarred { background-image: url("../../../view/theme/diabook/icons/unstarred.png");} +.star-item.icon.starred { background-image: url("../../../view/theme/diabook/icons/starred.png");} +.icon.link { background-image: url("../../../view/theme/diabook/icons/link.png");} +.icon.lock { background-image: url("../../../view/theme/diabook/icons/lock.png");} +.icon.unlock { background-image: url("../../../view/theme/diabook/icons/unlock.png");} +.icon.language { background-image: url("../../../view/theme/diabook/icons/language.png");} + + + +.camera { background-image: url("../../../view/theme/diabook/icons/camera.png"); display: block; width: 28px; height: 28px; background-repeat: no-repeat; } -.attach { background-image: url("../../../view/theme/diabook-blue/icons/attach.png"); +.attach { background-image: url("../../../view/theme/diabook/icons/attach.png"); display: block; width: 28px; height: 28px; background-repeat: no-repeat; } -.video2 { background-image: url("../../../view/theme/diabook-blue/icons/video.png"); +.video2 { background-image: url("../../../view/theme/diabook/icons/video.png"); display: block; width: 28px; height: 28px; background-repeat: no-repeat; } -.video { background-image: url("../../../view/theme/diabook-blue/icons/video.png"); +.video { background-image: url("../../../view/theme/diabook/icons/video.png"); display: block; width: 100%; height: 28px; background-repeat: no-repeat; } -.audio2 { background-image: url("../../../view/theme/diabook-blue/icons/audio.png"); +.audio2 { background-image: url("../../../view/theme/diabook/icons/audio.png"); display: block; width: 28px; height: 28px; background-repeat: no-repeat; } -.audio { background-image: url("../../../view/theme/diabook-blue/icons/audio.png"); +.audio { background-image: url("../../../view/theme/diabook/icons/audio.png"); display: block; width: 28px; height: 28px; background-repeat: no-repeat; } -.weblink { background-image: url("../../../view/theme/diabook-blue/icons/weblink.png"); +.weblink { background-image: url("../../../view/theme/diabook/icons/weblink.png"); display: block; width: 28px; height: 28px; background-repeat: no-repeat; } -.globe { background-image: url("../../../view/theme/diabook-blue/icons/globe.png"); +.globe { background-image: url("../../../view/theme/diabook/icons/globe.png"); display: block; width: 28px; height: 28px; background-repeat: no-repeat; } -.unglobe { background-image: url("../../../view/theme/diabook-blue/icons/unglobe.png"); +.unglobe { background-image: url("../../../view/theme/diabook/icons/unglobe.png"); display: block; width: 28px; height: 28px; background-repeat: no-repeat; } -.edit {background-image: url("../../../view/theme/diabook-blue/icons/pencil2.png"); +.edit {background-image: url("../../../view/theme/diabook/icons/pencil2.png"); display: block; width: 28px; height: 28px; background-repeat: no-repeat;} @@ -176,10 +177,10 @@ /*.language { background-position: -210px -40px;}*/ -.icon.on { background-image: url("../../../view/theme/diabook-blue/icons/toogle_on.png"); background-repeat: no-repeat;} -.icon.off { background-image: url("../../../view/theme/diabook-blue/icons/toogle_off.png"); background-repeat: no-repeat;} -.prev { background-position: -90px -60px;} -.next { background-position: -110px -60px;} +.icon.on { background-image: url("../../../view/theme/diabook/icons/toogle_on.png"); background-repeat: no-repeat;} +.icon.off { background-image: url("../../../view/theme/diabook/icons/toogle_off.png"); background-repeat: no-repeat;} +.icon.prev { background-image: url("../../../view/theme/diabook/icons/prev.png"); background-repeat: no-repeat;} +.icon.next { background-image: url("../../../view/theme/diabook/icons/next.png"); background-repeat: no-repeat;} /*.tagged { background-position: -130px -60px;}*/ .attachtype { @@ -215,12 +216,12 @@ } .icon.border.camera{ - background-image: url("../../../view/theme/diabook-blue/icons/camera.png"); + background-image: url("../../../view/theme/diabook/icons/camera.png"); display: block; width: 28px; height: 28px; background-repeat: no-repeat; } .icon.border.link{ - background-image: url("../../../view/theme/diabook-blue/icons/weblink.png"); + background-image: url("../../../view/theme/diabook/icons/weblink.png"); display: block; width: 28px; height: 28px; background-repeat: no-repeat; margin-left: 10px; } @@ -395,11 +396,12 @@ /* global */ body { font-family: 'Lato', "Helvetica Neue", Helvetica, Arial, sans-serif; - font-size: 12.5px; + font-size: 15px; background-color: #ffffff; color: #2d2d2d; margin: 50px auto auto; display: table; + } h4 { @@ -407,7 +409,7 @@ h4 { } a { - color: #333333; + color: #3465A4; /* color: #3e3e8c; */ text-decoration: none; } @@ -440,7 +442,7 @@ a:hover { clear: both; } .fakelink { - color: #1872A2; + color: #3465A4; /* color: #3e3e8c; */ text-decoration: none; cursor: pointer; @@ -483,8 +485,9 @@ code { } #saved-search-ul .tool:hover, #nets-sidebar .tool:hover, -#sidebar-group-list .tool:hover { - background: #EEE; +#sidebar-group-list .tool:hover, +#fileas-sidebar .tool:hover { + background: #E7F2F7; } .tool .label { float: left; @@ -519,15 +522,15 @@ header { padding: 0px; width: 22%; height: 32px; - background: #1872a2; - background-color: #1872a2; + background: #000; z-index: 100; - border-bottom: 1px; - border-bottom-color: black; - border-bottom-style: inset; + -webkit-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7); + -moz-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7); + box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7); } header #site-location { - display: none; +position: absolute; +top: 30px; } header #banner { overflow: hidden; @@ -564,12 +567,12 @@ nav { left: 22%; top: 0px; padding: 0px; - background: #1872a2; + background: #000; color: #ffffff; z-index: 99; - border-bottom: 1px; - border-bottom-color: black; - border-bottom-style: inset; + -webkit-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7); + -moz-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7); + box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7); } nav a, nav a:active, @@ -655,22 +658,11 @@ nav .nav-menu-icon { position: relative; height: 22px; padding: 5px; - margin: 0px 5px; - -moz-border-radius: 5px 5px 0 0; - -webkit-border-radius: 5px 5px 0 0; - border-radius: 5px 5px 0 0; -} -nav .nav-menu-icon:hover { - background-color: #308dbf; - position: relative; - height: 22px; - padding: 5px; - margin: 0px 5px; + margin: 0px 7px; -moz-border-radius: 5px 5px 0 0; -webkit-border-radius: 5px 5px 0 0; border-radius: 5px 5px 0 0; } - nav .nav-menu-icon.selected { background-color: #fff; } @@ -681,12 +673,13 @@ nav .nav-menu-icon img { nav .nav-menu-icon .nav-notify { top: 3px; } +/*marker*/ nav .nav-menu { position: relative; height: 16px; padding: 5px; margin: 3px 15px 0px; - font-size: 13px; + font-size: 15px; /*border-bottom: 3px solid #364A84;*/ } nav .nav-menu.selected { @@ -746,15 +739,15 @@ nav #nav-site-linkmenu .menu-popup { } nav #nav-messages-linkmenu.on .icon.messages, nav #nav-messages-linkmenu.selected .icon.messages{ - background-image: url("../../../view/theme/diabook-blue/icons/messages2.png"); + background-image: url("../../../view/theme/diabook/icons/messages2.png"); } /*nav #nav-notifications-linkmenu.on .icon.notify,*/ nav #nav-notifications-linkmenu.selected .icon.notify{ - background-image: url("../../../view/theme/diabook-blue/icons/notify2.png"); + background-image: url("../../../view/theme/diabook/icons/notify2.png"); } nav #nav-contacts-linkmenu.on .icon.contacts, nav #nav-contacts-linkmenu.selected .icon.contacts{ - background-image: url("../../../view/theme/diabook-blue/icons/contacts2.png"); + background-image: url("../../../view/theme/diabook/icons/contacts2.png"); } nav #nav-apps-link.selected { @@ -800,8 +793,8 @@ ul.menu-popup a { text-decoration: none; } ul.menu-popup a:hover { - background-color: #308DBF; /*bdcdd4;*/ - color: #fff; + background-color: #fff797; /*bdcdd4;*/ + color: #000; } ul.menu-popup .menu-sep { border-top: 1px solid #9eabb0; @@ -894,6 +887,7 @@ ul.menu-popup .empty { position: absolute; padding-top: 4px; padding-left: 5px; + color: #2D2D2D; word-wrap: break-word; width: 130px; } @@ -907,55 +901,75 @@ ul.menu-popup .empty { } .menu-profile-list{ height: auto; - overflow: auto; - padding-top: 3px; - padding-bottom: 3px; - padding-left: 16px; + overflow: auto; min-height: 16px; list-style: none; } .menu-profile-list:hover{ - background: #EEE; + background: #E7F2F7; } .menu-profile-list-item{ padding-left: 5px; + vertical-align: middle; } .menu-profile-list-item:hover{ text-decoration: none; } /*http://prothemedesign.com/circular-icons/*/ -.menu-profile-list.home{ - background: url("../../../view/theme/diabook-blue/icons/home.png") no-repeat; - } -.menu-profile-list.photos{ - background: url("../../../view/theme/diabook-blue/icons/mess_side.png") no-repeat; - } -.menu-profile-list.events{ - background: url("../../../view/theme/diabook-blue/icons/events.png") no-repeat; - } -.menu-profile-list.notes{ - background: url("../../../view/theme/diabook-blue/icons/notes.png") no-repeat; - } -.menu-profile-list.foren{ - background: url("../../../view/theme/diabook-blue/icons/pubgroups.png") no-repeat; - } -.menu-profile-list.com_side{ - background: url("../../../view/theme/diabook-blue/icons/com_side.png") no-repeat; +.menu-profile-icon.home{ + background: url("../../../view/theme/diabook/icons/home.png") no-repeat; + float: left; + height: 22px; + width: 22px; } +.menu-profile-icon.photos{ + background: url("../../../view/theme/diabook/icons/mess_side.png") no-repeat; + float: left; + height: 22px; + width: 22px;} +.menu-profile-icon.events{ + background: url("../../../view/theme/diabook/icons/events.png") no-repeat; + float: left; + height: 22px; + width: 22px;} +.menu-profile-icon.notes{ + background: url("../../../view/theme/diabook/icons/notes.png") no-repeat; + float: left; + height: 22px; + width: 22px;} +.menu-profile-icon.foren{ + background: url("../../../view/theme/diabook/icons/pubgroups.png") no-repeat; + float: left; + height: 22px; + width: 22px;} +.menu-profile-icon.com_side{ + background: url("../../../view/theme/diabook/icons/com_side.png") no-repeat; + float: left; + height: 22px; + width: 22px;} +.menu-profile-icon.pscontacts{ + background: url("../../../view/theme/diabook/icons/pscontacts.png") no-repeat; + float: left; + height: 22px; + width: 22px;} /* aside */ +/*marker*/ aside { display: table-cell; vertical-align: top; - width: 200px; - padding: 0px 10px 0px 10px; + width: 170px; + padding: 0px 10px 0px 0px; border-right: 1px solid #D2D2D2; float: left; /* background: #F1F1F1; */ } +aside #page-sidebar{display: none;} -aside .vcard { - display: none; +aside .vcard .fn { + font-size: 18px; + font-weight: bold; + margin-bottom: 5px; } aside .vcard .title { margin-bottom: 5px; @@ -1006,6 +1020,8 @@ aside #profiles-menu { } aside #search-text { width: 150px; + height: 17px; + padding-left: 10px; border-top-left-radius: 15px; border-top-right-radius: 15px; border-bottom-right-radius: 15px; @@ -1018,7 +1034,8 @@ aside #side-peoplefind-url { width: 150px; } #contact-block { - display: none; + overflow: auto; + height: auto; } #contact-block .contact-block-h4 { float: left; @@ -1038,8 +1055,8 @@ aside #side-peoplefind-url { margin: 0px 2px 2px 0px; } #contact-block .contact-block-link img { - widht: 48px; - height: 48px; + widht: 55px; + height: 55px; } #lost-password-link { float: left; @@ -1052,9 +1069,11 @@ aside #side-peoplefind-url { .action .s16 { width: 16px; overflow: hidden; padding: 0px;}*/ /* font-size: 12px; */ } +/*marker*/ .widget h3 { padding: 0px; margin: 2px; + font-size: 1.05em; } .widget .action { opacity: 0.1; @@ -1104,18 +1123,8 @@ aside #side-peoplefind-url { min-height: 16px; list-style: none; } -#side-bar-photos-albums li{ -list-style-type: disc; -} -#side-bar-photos-albums ul li{ - margin-left: 30px; - padding-left: 0px; - } -#side-bar-photos-albums ul li a{ - color: #1872A2; -} .widget .tool.selected { - background: url("../../../view/theme/diabook-blue/icons/selected.png") no-repeat left center; + background: url("../../../view/theme/diabook/icons/selected.png") no-repeat left center; } /* widget: search */ span.sbox_l { @@ -1152,8 +1161,8 @@ span.sbox input { section { display: table-cell; vertical-align: top; - width: 650px; - padding: 0px 0px 0px 20px; + width: auto; + padding: 0px 0px 0px 12px; } body .pageheader{ @@ -1163,6 +1172,9 @@ body .pageheader{ margin-top: 0px; max-width: 575px; } +.qcomment{ + max-width: 122px; + } #id_username { width: 173px; @@ -1182,41 +1194,37 @@ body .pageheader{ clear: both; display: block; } - -.tabs {display: none;} -.tab.button{display: none;} -.rs_tabs { +.tabs { background-position: 0 -20px; background-repeat: repeat-x; height: 27px; padding: 0; } -.rs_tab.button { +.tab.button { + margin-left: 5px; /*background: none repeat scroll 0 0 #F8F8F8;*/ border: 1px solid #CCCCCC; border-radius: 3px 3px 3px 3px; - font-weight: bolder; + font-weight: normal; padding: 3px; color: #333333; - text-decoration: none; } #birthday-notice, #event-notice, #birthday-wrapper, #event-wrapper{ margin-bottom: 10px; } - +/*marker*/ right_aside { display: table-cell; vertical-align: top; - width: 170px; - /*padding-right: 10px;*/ + width: 180px; /*border-left: 1px solid #D2D2D2;*/ /* background: #F1F1F1; */ } -right_aside a{color: #1872A2;} -right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 5px; margin-bottom: 0px; +/*marker*/ +right_aside h3 {font-size: 1.05em; border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 9px; margin-bottom: 0px; margin-top:30px;} right_aside .directory-item { width: 50px; height: 50px; vertical-align: center; text-align: center; } right_aside .directory-photo { margin: 0px; } @@ -1232,7 +1240,6 @@ right_aside .icon {width: 10px; height: 10px;} .close_box { background-image: url("../../../view/theme/diabook-blue/icons/close_box.png"); float: right; - cursor: pointer; opacity: 0.1; } .close_box:hover { @@ -1246,28 +1253,28 @@ right_aside .icon {width: 10px; height: 10px;} -ms-transition: all 0.2s ease-in-out; transition: all 0.2s ease-in-out; } + /* wall item */ +/*marker*/ .tread-wrapper { border-bottom: 1px solid #D2D2D2; position: relative; padding: 5px; margin-bottom: 0px; - width: 575px; + width: 775px; + padding-top: 10px; } -.tread-wrapper a{ - color: #1872A2; -} - +/*marker*/ .wall-item-decor { position: absolute; - left: 790px; + left: 780px; top: -10px; width: 16px; } - +/*marker*/ .wall-item-container { display: table; - width: 580px; + width: 770px; } @@ -1317,16 +1324,18 @@ transition: all 0.2s ease-in-out; margin-bottom: 5px; } - +/*marker*/ .wall-item-container .wall-item-content { - font-size: 12.5px; - max-width: 420px; + + max-width: 690px; word-wrap: break-word; - line-height: 1.2; -} + margin-bottom: 14px; +} +/*marker*/ .wall-item-container .wall-item-content img { - max-width: 400px; + + } .wall-item-container .wall-item-links, .wall-item-container .wall-item-actions { display: table-cell; @@ -1377,11 +1386,12 @@ transition: all 0.2s ease-in-out; .wall-item-container .wall-item-actions-tools input { float: right; } +/*marker*/ .wall-item-container.comment { margin-top: 5px; margin-bottom: 5px; margin-left: 80px; - width: 500px; + width: 690px; border-bottom: 1px solid hsl(198, 21%, 79%); } .wall-item-container.comment .contact-photo { @@ -1399,7 +1409,7 @@ transition: all 0.2s ease-in-out; padding-left: 12px; } .wall-item-comment-wrapper { - margin: 1px 5px 1px 80px; + margin: 1px 5px 17px 80px; } .wall-item-comment-wrapper .comment-edit-photo { display: none; @@ -1420,9 +1430,9 @@ transition: all 0.2s ease-in-out; border: 1px solid #2d2d2d; } .comment-edit-preview { - width: 710px; - border: 1px solid #2d2d2d; + width: 500px; margin-top: 10px; + background-color: #fff797; } .comment-edit-preview .contact-photo { width: 32px; @@ -1466,14 +1476,14 @@ transition: all 0.2s ease-in-out; } .tag { /*background: url("../../../images/tag_b.png") repeat-x center left;*/ - color: #999; + color: #3465A4; padding-left: 3px; font-size: 12px; } .tag a { padding-right: 5px; /*background: url("../../../images/tag.png") no-repeat center right;*/ - color: #999; + color: #3465A4; } .wwto { position: absolute !important; @@ -1568,6 +1578,11 @@ transition: all 0.2s ease-in-out; padding: 0.3em; margin-bottom: 10px; } +.grey +{ + display: inline; + float: right; + } #jot #jot-tools { margin: 0px; padding: 0px; @@ -1653,7 +1668,7 @@ transition: all 0.2s ease-in-out; height: 20px; margin: 0 0 5px; width: 60%; - border: 1px solid #ffffff; + border: 1px solid #d2d2d2; } #profile-jot-form #jot-title:-webkit-input-placeholder { font-weight: normal; @@ -1695,20 +1710,22 @@ transition: all 0.2s ease-in-out; cursor: pointer; margin-top: 2px; } +/*marker*/ #profile-jot-wrapper{ - margin: 0 2em 20px 0; - width: 585px; + margin: 0 20px 20px 0; + width: 785px; } - +/*marker*/ #profile-jot-submit-wrapper { margin-bottom: 50px; - width: 585px; + width: 785px; } #profile-jot-submit { float: right; margin-top: 2px; font-size: 14px; + } #profile-upload-wrapper { float: left; @@ -1779,7 +1796,8 @@ transition: all 0.2s ease-in-out; font-weight: bolder; } .button.creation2 { - background-color: #055580; + background-color: #33ACFF; + background-image: -moz-linear-gradient(center top , #66C1FF 0%, #0097FF 100%); border: 1px solid #777777; color: white; border-radius: 3px 3px 3px 3px; @@ -1789,12 +1807,13 @@ transition: all 0.2s ease-in-out; font-weight: bolder; } /*input[type="submit"] { - border: 0px; - background-color: @ButtonBackgroundColor; - color: @ButtonColor; - padding: 0px 10px; - .rounded(5px); - height: 18px; + background-color: #33ACFF; + background-image: -moz-linear-gradient(center top , #66C1FF 0%, #0097FF 100%); + border: 1px solid #777777; + color: white; + border-radius: 3px 3px 3px 3px; + box-shadow: 0 1px 1px #CFCFCF; + margin-left: 5px; }*/ /** acl **/ #photo-edit-perms-select, #photos-upload-permissions-wrapper, #profile-jot-acl-wrapper { @@ -1900,24 +1919,25 @@ transition: all 0.2s ease-in-out; border-color: #ff4141; } /** /acl **/ -/** tab buttons 14618a**/ -ul.rs_tabs { +/** tab buttons **/ +/*marker*/ +ul.tabs { list-style-type: none; - - font-size: 11px; + padding-bottom: 10px; + font-size: 15px; + width: 805px; } -ul.rs_tabs li { +ul.tabs li { float: left; - margin-bottom: 30px; - clear: both; + margin-left: 5px; } -ul.rs_tabs li .active { - background-color: #055580; +ul.tabs li .active { + background-color: #333333; border: 1px solid #777777; color: white; border-radius: 3px 3px 3px 3px; - box-shadow: 2px 2px 2px #CFCFCF; - font-size: 13px; + box-shadow: 0 1px 1px #CFCFCF; + margin-left: 5px; } /** * Form fields @@ -2037,15 +2057,8 @@ ul.rs_tabs li .active { float: left; } /* photo */ -.photo { -box-shadow: 2px 2px 5px 0px #000000; -margin: 2px 5px 2px 5px; -max-height: 85%; -max-width: 85%; -} .lframe { float: left; - /*margin: 0px 10px 10px 0px;*/ } /* profile match wrapper */ .profile-match-wrapper { @@ -2076,7 +2089,7 @@ max-width: 85%; padding: 0px; width: 16px; height: 16px; - top: -20px; left:0px; + top: -16px; left:0px; overflow: hidden; text-indent: 40px; display: none; @@ -2114,6 +2127,10 @@ blockquote { border-left: 1px solid #D2D2D2; padding-left: 9px; margin: 0 0 0 .8ex; + color: #777; +} +.oembed { + font-weight: bold; } .aprofile dt{ box-shadow: 1px 1px 5px 0; @@ -2126,8 +2143,8 @@ box-shadow: 1px 1px 5px 0; /* ================== */ .contact-block-img { - width: 48px; - height: 48px; + width: 55px; + height: 55px; padding-right: 3px; } .contact-block-div { @@ -2162,7 +2179,6 @@ box-shadow: 1px 1px 5px 0; float: right; margin-top: 10px; } - #prvmail-subject { background: none repeat scroll 0 0 #FFFFFF; @@ -2176,7 +2192,6 @@ vertical-align: middle; #prvmail-form{ width: 597px; } - #prvmail-upload-wrapper, #prvmail-link-wrapper, #prvmail-rotator-wrapper { @@ -2332,9 +2347,6 @@ a.mail-list-link { .calendar { font-family: Courier, monospace; } -.calendar.eventcal a { - color: #1872A2; - } .today { font-weight: bold; color: #FF0000; @@ -2455,8 +2467,8 @@ float: left; display: none; /* position: absolute; */ /* position: absolute; */ - left: -2px; - top: -20px; + left: 0px; + top: -16px; } .contact-wrapper { float: left; @@ -2527,36 +2539,30 @@ list-style-type: disc; width: 200px; height: 140px; overflow: hidden; } +/* .photo-top-album-name { - width: 100%; - position: absolute; - bottom: 0px; - padding-left: 3px; - background-color: #EEE; -} -.photo-top-album-link{ - color: #1872A2; - } -.photo-top-album-img{ - - } + position: absolute; + bottom: 0; + padding: 0 5px; +}*/ /*.photo-top-image-wrapper { position: relative; float: left; margin-top: 15px; margin-right: 15px; width: 200px; height: 200px; - overflow: hidden; -} + +}*/ .photo-top-album-name { width: 100%; - min-height: 2em; position: absolute; bottom: 0px; - padding: 0px 3px; - padding-top: 0.5em; - background-color: rgb(255, 255, 255); -}*/ + padding-left: 3px; + background-color: #EEE; +} +.photo-top-album-link{ + color: #3465A4; + } #photo-top-end { clear: both; } @@ -2569,5 +2575,4 @@ list-style-type: disc; #photos-upload-newalbum-div { float: left; width: 175px; -} - +}
\ No newline at end of file diff --git a/view/theme/diabook/style-network.css b/view/theme/diabook/style-network.css index 9e57c17d2..1e57041e4 100644 --- a/view/theme/diabook/style-network.css +++ b/view/theme/diabook/style-network.css @@ -484,8 +484,9 @@ code { } #saved-search-ul .tool:hover, #nets-sidebar .tool:hover, -#sidebar-group-list .tool:hover { - background: #EEE; +#sidebar-group-list .tool:hover, +#fileas-sidebar .tool:hover { + background: #E7F2F7; } .tool .label { float: left; @@ -898,44 +899,57 @@ ul.menu-popup .empty { } .menu-profile-list{ height: auto; - overflow: auto; - padding-top: 3px; - padding-bottom: 3px; - padding-left: 16px; + overflow: auto; min-height: 16px; list-style: none; } .menu-profile-list:hover{ - background: #EEE; + background: #E7F2F7; } .menu-profile-list-item{ padding-left: 5px; + vertical-align: middle; } .menu-profile-list-item:hover{ text-decoration: none; } /*http://prothemedesign.com/circular-icons/*/ -.menu-profile-list.home{ +.menu-profile-icon.home{ background: url("../../../view/theme/diabook/icons/home.png") no-repeat; + float: left; + height: 22px; + width: 22px; } -.menu-profile-list.photos{ +.menu-profile-icon.photos{ background: url("../../../view/theme/diabook/icons/mess_side.png") no-repeat; - } -.menu-profile-list.events{ + float: left; + height: 22px; + width: 22px;} +.menu-profile-icon.events{ background: url("../../../view/theme/diabook/icons/events.png") no-repeat; - } -.menu-profile-list.notes{ + float: left; + height: 22px; + width: 22px;} +.menu-profile-icon.notes{ background: url("../../../view/theme/diabook/icons/notes.png") no-repeat; - } -.menu-profile-list.foren{ + float: left; + height: 22px; + width: 22px;} +.menu-profile-icon.foren{ background: url("../../../view/theme/diabook/icons/pubgroups.png") no-repeat; - } -.menu-profile-list.com_side{ + float: left; + height: 22px; + width: 22px;} +.menu-profile-icon.com_side{ background: url("../../../view/theme/diabook/icons/com_side.png") no-repeat; - } -.menu-profile-list.pscontacts{ + float: left; + height: 22px; + width: 22px;} +.menu-profile-icon.pscontacts{ background: url("../../../view/theme/diabook/icons/pscontacts.png") no-repeat; - } + float: left; + height: 22px; + width: 22px;} /* aside */ aside { @@ -1241,6 +1255,7 @@ transition: all 0.2s ease-in-out; padding: 5px; margin-bottom: 0px; width: 575px; + padding-top: 10px; } .wall-item-decor { position: absolute; @@ -1303,10 +1318,10 @@ transition: all 0.2s ease-in-out; } .wall-item-container .wall-item-content { - font-size: 12.5px; + max-width: 420px; word-wrap: break-word; - line-height: 1.2; + margin-bottom: 14px; } @@ -1385,7 +1400,7 @@ transition: all 0.2s ease-in-out; padding-left: 12px; } .wall-item-comment-wrapper { - margin: 1px 5px 1px 80px; + margin: 1px 5px 17px 80px; } .wall-item-comment-wrapper .comment-edit-photo { display: none; diff --git a/view/theme/diabook/style-settings.css b/view/theme/diabook/style-profile-wide.css index fdb4f24c7..47fb80b6d 100644 --- a/view/theme/diabook/style-settings.css +++ b/view/theme/diabook/style-profile-wide.css @@ -395,11 +395,12 @@ /* global */ body { font-family: 'Lato', "Helvetica Neue", Helvetica, Arial, sans-serif; - font-size: 12.5px; + font-size: 15px; background-color: #ffffff; color: #2d2d2d; margin: 50px auto auto; display: table; + } h4 { @@ -483,8 +484,9 @@ code { } #saved-search-ul .tool:hover, #nets-sidebar .tool:hover, -#sidebar-group-list .tool:hover { - background: #EEE; +#sidebar-group-list .tool:hover, +#fileas-sidebar .tool:hover{ + background: #E7F2F7; } .tool .label { float: left; @@ -669,12 +671,13 @@ nav .nav-menu-icon img { nav .nav-menu-icon .nav-notify { top: 3px; } +/*marker*/ nav .nav-menu { position: relative; height: 16px; padding: 5px; margin: 3px 15px 0px; - font-size: 13px; + font-size: 15px; /*border-bottom: 3px solid #364A84;*/ } nav .nav-menu.selected { @@ -897,8 +900,6 @@ ul.menu-popup .empty { .menu-profile-list{ height: auto; overflow: auto; - padding-top: 3px; - padding-bottom: 3px; padding-left: 16px; min-height: 16px; list-style: none; @@ -908,43 +909,47 @@ ul.menu-popup .empty { } .menu-profile-list-item{ padding-left: 5px; + vertical-align: middle; } .menu-profile-list-item:hover{ text-decoration: none; } /*http://prothemedesign.com/circular-icons/*/ -.menu-profile-list.home{ - background: url("../../../view/theme/diabook-blue/icons/home.png") no-repeat; +.menu-profile-icon.home{ + background: url("../../../view/theme/diabook/icons/home.png") no-repeat; } -.menu-profile-list.photos{ - background: url("../../../view/theme/diabook-blue/icons/mess_side.png") no-repeat; +.menu-profile-icon.photos{ + background: url("../../../view/theme/diabook/icons/mess_side.png") no-repeat; } -.menu-profile-list.events{ - background: url("../../../view/theme/diabook-blue/icons/events.png") no-repeat; +.menu-profile-icon.events{ + background: url("../../../view/theme/diabook/icons/events.png") no-repeat; } -.menu-profile-list.notes{ - background: url("../../../view/theme/diabook-blue/icons/notes.png") no-repeat; +.menu-profile-icon.notes{ + background: url("../../../view/theme/diabook/icons/notes.png") no-repeat; } -.menu-profile-list.foren{ - background: url("../../../view/theme/diabook-blue/icons/pubgroups.png") no-repeat; +.menu-profile-icon.foren{ + background: url("../../../view/theme/diabook/icons/pubgroups.png") no-repeat; } -.menu-profile-list.com_side{ - background: url("../../../view/theme/diabook-blue/icons/com_side.png") no-repeat; +.menu-profile-icon.com_side{ + background: url("../../../view/theme/diabook/icons/com_side.png") no-repeat; } /* aside */ +/*marker*/ aside { display: table-cell; vertical-align: top; - width: 200px; - padding: 0px 10px 0px 10px; + width: 170px; + padding: 0px 10px 0px 0px; border-right: 1px solid #D2D2D2; float: left; /* background: #F1F1F1; */ } -aside .vcard { - display: none; +aside .vcard .fn { + font-size: 18px; + font-weight: bold; + margin-bottom: 5px; } aside .vcard .title { margin-bottom: 5px; @@ -995,6 +1000,8 @@ aside #profiles-menu { } aside #search-text { width: 150px; + height: 17px; + padding-left: 10px; border-top-left-radius: 15px; border-top-right-radius: 15px; border-bottom-right-radius: 15px; @@ -1007,7 +1014,8 @@ aside #side-peoplefind-url { width: 150px; } #contact-block { - display: none; + overflow: auto; + height: auto; } #contact-block .contact-block-h4 { float: left; @@ -1041,9 +1049,11 @@ aside #side-peoplefind-url { .action .s16 { width: 16px; overflow: hidden; padding: 0px;}*/ /* font-size: 12px; */ } +/*marker*/ .widget h3 { padding: 0px; margin: 2px; + font-size: 1.05em; } .widget .action { opacity: 0.1; @@ -1131,19 +1141,20 @@ span.sbox input { section { display: table-cell; vertical-align: top; - width: 650px; - padding: 0px 0px 0px 20px; + width: 610px; + padding: 0px 0px 0px 12px; } body .pageheader{ text-align: center; font-size: 20px; - max-width: 575px; margin-bottom: 20px; margin-top: 0px; max-width: 575px; } - +.qcomment{ + max-width: 122px; + } #id_username { width: 173px; } @@ -1162,39 +1173,37 @@ body .pageheader{ clear: both; display: block; } -.tabs {display: none;} -.tab.button{display: none;} -.rs_tabs { +.tabs { background-position: 0 -20px; background-repeat: repeat-x; height: 27px; padding: 0; } -.rs_tab.button { +.tab.button { + margin-left: 5px; /*background: none repeat scroll 0 0 #F8F8F8;*/ border: 1px solid #CCCCCC; border-radius: 3px 3px 3px 3px; - font-weight: bolder; + font-weight: normal; padding: 3px; color: #333333; - text-decoration: none; } #birthday-notice, #event-notice, #birthday-wrapper, #event-wrapper{ margin-bottom: 10px; } - +/*marker*/ right_aside { display: table-cell; vertical-align: top; - width: 170px; - + width: 180px; /*border-left: 1px solid #D2D2D2;*/ /* background: #F1F1F1; */ } -right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 5px; margin-bottom: 0px; +/*marker*/ +right_aside h3 {font-size: 1.05em; border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 9px; margin-bottom: 0px; margin-top:30px;} right_aside .directory-item { width: 50px; height: 50px; vertical-align: center; text-align: center; } right_aside .directory-photo { margin: 0px; } @@ -1225,23 +1234,26 @@ right_aside .icon {width: 10px; height: 10px;} transition: all 0.2s ease-in-out; } /* wall item */ +/*marker*/ .tread-wrapper { border-bottom: 1px solid #D2D2D2; position: relative; padding: 5px; margin-bottom: 0px; - width: 575px; + width: 775px; + padding-top: 10px; } +/*marker*/ .wall-item-decor { position: absolute; - left: 790px; + left: 780px; top: -10px; width: 16px; } - +/*marker*/ .wall-item-container { display: table; - width: 580px; + width: 770px; } @@ -1291,16 +1303,18 @@ transition: all 0.2s ease-in-out; margin-bottom: 5px; } - +/*marker*/ .wall-item-container .wall-item-content { - font-size: 12.5px; - max-width: 420px; + + max-width: 690px; word-wrap: break-word; - line-height: 1.2; -} + margin-bottom: 14px; +} +/*marker*/ .wall-item-container .wall-item-content img { - max-width: 400px; + + } .wall-item-container .wall-item-links, .wall-item-container .wall-item-actions { display: table-cell; @@ -1351,11 +1365,12 @@ transition: all 0.2s ease-in-out; .wall-item-container .wall-item-actions-tools input { float: right; } +/*marker*/ .wall-item-container.comment { margin-top: 5px; margin-bottom: 5px; margin-left: 80px; - width: 500px; + width: 690px; border-bottom: 1px solid hsl(198, 21%, 79%); } .wall-item-container.comment .contact-photo { @@ -1373,7 +1388,7 @@ transition: all 0.2s ease-in-out; padding-left: 12px; } .wall-item-comment-wrapper { - margin: 1px 5px 1px 80px; + margin: 1px 5px 17px 80px; } .wall-item-comment-wrapper .comment-edit-photo { display: none; @@ -1394,9 +1409,9 @@ transition: all 0.2s ease-in-out; border: 1px solid #2d2d2d; } .comment-edit-preview { - width: 710px; - border: 1px solid #2d2d2d; + width: 500px; margin-top: 10px; + background-color: #fff797; } .comment-edit-preview .contact-photo { width: 32px; @@ -1542,6 +1557,11 @@ transition: all 0.2s ease-in-out; padding: 0.3em; margin-bottom: 10px; } +.grey +{ + display: inline; + float: right; + } #jot #jot-tools { margin: 0px; padding: 0px; @@ -1627,7 +1647,7 @@ transition: all 0.2s ease-in-out; height: 20px; margin: 0 0 5px; width: 60%; - border: 1px solid #ffffff; + border: 1px solid #d2d2d2; } #profile-jot-form #jot-title:-webkit-input-placeholder { font-weight: normal; @@ -1669,14 +1689,15 @@ transition: all 0.2s ease-in-out; cursor: pointer; margin-top: 2px; } +/*marker*/ #profile-jot-wrapper{ - margin: 0 2em 20px 0; - width: 585px; + margin: 0 20px 20px 0; + width: 785px; } - +/*marker*/ #profile-jot-submit-wrapper { margin-bottom: 50px; - width: 585px; + width: 785px; } #profile-jot-submit { @@ -1876,23 +1897,24 @@ transition: all 0.2s ease-in-out; } /** /acl **/ /** tab buttons **/ -ul.rs_tabs { +/*marker*/ +ul.tabs { list-style-type: none; - - font-size: 11px; + padding-bottom: 10px; + font-size: 15px; + width: 805px; } -ul.rs_tabs li { +ul.tabs li { float: left; - margin-bottom: 30px; - clear: both; + margin-left: 5px; } -ul.rs_tabs li .active { - background-color: #333; +ul.tabs li .active { + background-color: #333333; border: 1px solid #777777; color: white; border-radius: 3px 3px 3px 3px; - box-shadow: 2px 2px 2px #CFCFCF; - font-size: 13px; + box-shadow: 0 1px 1px #CFCFCF; + margin-left: 5px; } /** * Form fields @@ -2012,6 +2034,11 @@ ul.rs_tabs li .active { float: left; } /* photo */ +.photo { +border-radius: 10px; +height: 145px !important; +width: 145px !important; + } .lframe { float: left; } @@ -2044,7 +2071,7 @@ ul.rs_tabs li .active { padding: 0px; width: 16px; height: 16px; - top: -20px; left:0px; + top: -16px; left:0px; overflow: hidden; text-indent: 40px; display: none; @@ -2082,6 +2109,10 @@ blockquote { border-left: 1px solid #D2D2D2; padding-left: 9px; margin: 0 0 0 .8ex; + color: #777; +} +.oembed { + font-weight: bold; } .aprofile dt{ box-shadow: 1px 1px 5px 0; @@ -2418,8 +2449,8 @@ float: left; display: none; /* position: absolute; */ /* position: absolute; */ - left: -2px; - top: -20px; + left: 0px; + top: -16px; } .contact-wrapper { float: left; diff --git a/view/theme/diabook/style-profile.css b/view/theme/diabook/style-profile.css index 95e9061ba..ff39a0456 100644 --- a/view/theme/diabook/style-profile.css +++ b/view/theme/diabook/style-profile.css @@ -483,8 +483,9 @@ code { } #saved-search-ul .tool:hover, #nets-sidebar .tool:hover, -#sidebar-group-list .tool:hover { - background: #EEE; +#sidebar-group-list .tool:hover, +#fileas-sidebar .tool:hover{ + background: #E7F2F7; } .tool .label { float: left; @@ -897,8 +898,6 @@ ul.menu-popup .empty { .menu-profile-list{ height: auto; overflow: auto; - padding-top: 3px; - padding-bottom: 3px; padding-left: 16px; min-height: 16px; list-style: none; @@ -908,28 +907,29 @@ ul.menu-popup .empty { } .menu-profile-list-item{ padding-left: 5px; + vertical-align: middle; } .menu-profile-list-item:hover{ text-decoration: none; } /*http://prothemedesign.com/circular-icons/*/ -.menu-profile-list.home{ - background: url("../../../view/theme/diabook-blue/icons/home.png") no-repeat; +.menu-profile-icon.home{ + background: url("../../../view/theme/diabook/icons/home.png") no-repeat; } -.menu-profile-list.photos{ - background: url("../../../view/theme/diabook-blue/icons/mess_side.png") no-repeat; +.menu-profile-icon.photos{ + background: url("../../../view/theme/diabook/icons/mess_side.png") no-repeat; } -.menu-profile-list.events{ - background: url("../../../view/theme/diabook-blue/icons/events.png") no-repeat; +.menu-profile-icon.events{ + background: url("../../../view/theme/diabook/icons/events.png") no-repeat; } -.menu-profile-list.notes{ - background: url("../../../view/theme/diabook-blue/icons/notes.png") no-repeat; +.menu-profile-icon.notes{ + background: url("../../../view/theme/diabook/icons/notes.png") no-repeat; } -.menu-profile-list.foren{ - background: url("../../../view/theme/diabook-blue/icons/pubgroups.png") no-repeat; +.menu-profile-icon.foren{ + background: url("../../../view/theme/diabook/icons/pubgroups.png") no-repeat; } -.menu-profile-list.com_side{ - background: url("../../../view/theme/diabook-blue/icons/com_side.png") no-repeat; +.menu-profile-icon.com_side{ + background: url("../../../view/theme/diabook/icons/com_side.png") no-repeat; } /* aside */ @@ -1235,6 +1235,7 @@ transition: all 0.2s ease-in-out; padding: 5px; margin-bottom: 0px; width: 575px; + padding-top: 10px; } .wall-item-decor { position: absolute; @@ -1297,10 +1298,10 @@ transition: all 0.2s ease-in-out; } .wall-item-container .wall-item-content { - font-size: 12.5px; + max-width: 420px; word-wrap: break-word; - line-height: 1.2; + margin-bottom: 14px; } @@ -1379,7 +1380,7 @@ transition: all 0.2s ease-in-out; padding-left: 12px; } .wall-item-comment-wrapper { - margin: 1px 5px 1px 80px; + margin: 1px 5px 17px 80px; } .wall-item-comment-wrapper .comment-edit-photo { display: none; diff --git a/view/theme/diabook-aerith/style-settings.css b/view/theme/diabook/style-wide.css index 8963065ca..d9a975e2c 100644 --- a/view/theme/diabook-aerith/style-settings.css +++ b/view/theme/diabook/style-wide.css @@ -83,62 +83,90 @@ #adminpage .selectall { text-align: right; } /* icons */ +.icon.bb-url{ + background-image: url("../../../view/theme/diabook/icons/bb-url.png"); + float: right; + margin-top: 2px;} +.icon.quote{ + background-image: url("../../../view/theme/diabook/icons/quote.png"); + float: right; + margin-top: 2px;} +.icon.bold{ + background-image: url("../../../view/theme/diabook/icons/bold.png"); + float: right; + margin-top: 2px;} +.icon.underline{ + background-image: url("../../../view/theme/diabook/icons/underline.png"); + float: right; + margin-top: 2px;} +.icon.italic{ + background-image: url("../../../view/theme/diabook/icons/italic.png"); + float: right; + margin-top: 2px;} +.icon.bb-image{ + background-image: url("../../../view/theme/diabook/icons/bb-image.png"); + float: right; + margin-top: 2px;} +.icon.bb-video{ + background-image: url("../../../view/theme/diabook/icons/bb-video.png"); + float: right; + margin-top: 2px;} + .icon.contacts { - background-image: url("../../../view/theme/diabook-aerith/icons/contacts.png");} + background-image: url("../../../view/theme/diabook/icons/contacts.png");} .icon.notifications { - background-image: url("../../../view/theme/diabook-aerith/icons/notifications.png");} + background-image: url("../../../view/theme/diabook/icons/notifications.png");} .icon.notify { - background-image: url("../../../view/theme/diabook-aerith/icons/notify.png");} + background-image: url("../../../view/theme/diabook/icons/notify.png");} .icon.messages { - background-image: url("../../../view/theme/diabook-aerith/icons/messages.png");} + background-image: url("../../../view/theme/diabook/icons/messages.png");} .icon.community { - background-image: url("../../../view/theme/diabook-aerith/icons/community.png");} + background-image: url("../../../view/theme/diabook/icons/community.png");} -.icon.drop { background-image: url("../../../view/theme/diabook-aerith/icons/drop.png");} -.icon.drophide { background-image: url("../../../view/theme/diabook-aerith/icons/drop.png");} -.icon.dislike { background-image: url("../../../view/theme/diabook-aerith/icons/dislike.png");} -.icon.like { background-image: url("../../../view/theme/diabook-aerith/icons/like.png");} -.icon.pencil { background-image: url("../../../view/theme/diabook-aerith/icons/pencil.png");} -.icon.recycle { background-image: url("../../../view/theme/diabook-aerith/icons/recycle.png");} -.icon.remote-link { background-image: url("../../../view/theme/diabook-aerith/icons/remote.png");} -.icon.tagged { background-image: url("../../../view/theme/diabook-aerith/icons/tagged.png");} -.icon.file-as { background-image: url("../../../view/theme/diabook-aerith/icons/file_as.png");} -.star-item.icon.unstarred { background-image: url("../../../view/theme/diabook-aerith/icons/unstarred.png");} -.star-item.icon.starred { background-image: url("../../../view/theme/diabook-aerith/icons/starred.png");} -.icon.link { background-image: url("../../../view/theme/diabook-aerith/icons/link.png");} -.icon.lock { background-image: url("../../../view/theme/diabook-aerith/icons/lock.png");} -.icon.unlock { background-image: url("../../../view/theme/diabook-aerith/icons/unlock.png");} -.icon.language { background-image: url("../../../view/theme/diabook-aerith/icons/language.png");} - - -.camera { background-image: url("../../../view/theme/diabook-aerith/icons/camera.png"); +.icon.drop { background-image: url("../../../view/theme/diabook/icons/drop.png");} +.icon.drophide { background-image: url("../../../view/theme/diabook/icons/drop.png");} +.icon.dislike { background-image: url("../../../view/theme/diabook/icons/dislike.png");} +.icon.like { background-image: url("../../../view/theme/diabook/icons/like.png");} +.icon.pencil { background-image: url("../../../view/theme/diabook/icons/pencil.png");} +.icon.recycle { background-image: url("../../../view/theme/diabook/icons/recycle.png");} +.icon.remote-link { background-image: url("../../../view/theme/diabook/icons/remote.png");} +.icon.tagged { background-image: url("../../../view/theme/diabook/icons/tagged.png");} +.star-item.icon.unstarred { background-image: url("../../../view/theme/diabook/icons/unstarred.png");} +.star-item.icon.starred { background-image: url("../../../view/theme/diabook/icons/starred.png");} +.icon.link { background-image: url("../../../view/theme/diabook/icons/link.png");} +.icon.lock { background-image: url("../../../view/theme/diabook/icons/lock.png");} +.icon.unlock { background-image: url("../../../view/theme/diabook/icons/unlock.png");} +.icon.language { background-image: url("../../../view/theme/diabook/icons/language.png");} + + +.camera { background-image: url("../../../view/theme/diabook/icons/camera.png"); display: block; width: 28px; height: 28px; background-repeat: no-repeat; } -.attach { background-image: url("../../../view/theme/diabook-aerith/icons/attach.png"); +.attach { background-image: url("../../../view/theme/diabook/icons/attach.png"); display: block; width: 28px; height: 28px; background-repeat: no-repeat; } -.video2 { background-image: url("../../../view/theme/diabook-aerith/icons/video.png"); +.video2 { background-image: url("../../../view/theme/diabook/icons/video.png"); display: block; width: 28px; height: 28px; background-repeat: no-repeat; } -.video { background-image: url("../../../view/theme/diabook-aerith/icons/video.png"); +.video { background-image: url("../../../view/theme/diabook/icons/video.png"); display: block; width: 100%; height: 28px; background-repeat: no-repeat; } -.audio2 { background-image: url("../../../view/theme/diabook-aerith/icons/audio.png"); +.audio2 { background-image: url("../../../view/theme/diabook/icons/audio.png"); display: block; width: 28px; height: 28px; background-repeat: no-repeat; } -.audio { background-image: url("../../../view/theme/diabook-aerith/icons/audio.png"); +.audio { background-image: url("../../../view/theme/diabook/icons/audio.png"); display: block; width: 28px; height: 28px; background-repeat: no-repeat; } -.weblink { background-image: url("../../../view/theme/diabook-aerith/icons/weblink.png"); +.weblink { background-image: url("../../../view/theme/diabook/icons/weblink.png"); display: block; width: 28px; height: 28px; background-repeat: no-repeat; } -.globe { background-image: url("../../../view/theme/diabook-aerith/icons/globe.png"); +.globe { background-image: url("../../../view/theme/diabook/icons/globe.png"); display: block; width: 28px; height: 28px; background-repeat: no-repeat; } -.unglobe { background-image: url("../../../view/theme/diabook-aerith/icons/unglobe.png"); +.unglobe { background-image: url("../../../view/theme/diabook/icons/unglobe.png"); display: block; width: 28px; height: 28px; background-repeat: no-repeat; } -.edit {background-image: url("../../../view/theme/diabook-aerith/icons/pencil2.png"); +.edit {background-image: url("../../../view/theme/diabook/icons/pencil2.png"); display: block; width: 28px; height: 28px; background-repeat: no-repeat;} @@ -176,10 +204,10 @@ /*.language { background-position: -210px -40px;}*/ -.icon.on { background-image: url("../../../view/theme/diabook-aerith/icons/toogle_on.png"); background-repeat: no-repeat;} -.icon.off { background-image: url("../../../view/theme/diabook-aerith/icons/toogle_off.png"); background-repeat: no-repeat;} -.prev { background-position: -90px -60px;} -.next { background-position: -110px -60px;} +.icon.on { background-image: url("../../../view/theme/diabook/icons/toogle_on.png"); background-repeat: no-repeat;} +.icon.off { background-image: url("../../../view/theme/diabook/icons/toogle_off.png"); background-repeat: no-repeat;} +.icon.prev { background-image: url("../../../view/theme/diabook/icons/prev.png"); background-repeat: no-repeat;} +.icon.next { background-image: url("../../../view/theme/diabook/icons/next.png"); background-repeat: no-repeat;} /*.tagged { background-position: -130px -60px;}*/ .attachtype { @@ -215,12 +243,12 @@ } .icon.border.camera{ - background-image: url("../../../view/theme/diabook-aerith/icons/camera.png"); + background-image: url("../../../view/theme/diabook/icons/camera.png"); display: block; width: 28px; height: 28px; background-repeat: no-repeat; } .icon.border.link{ - background-image: url("../../../view/theme/diabook-aerith/icons/weblink.png"); + background-image: url("../../../view/theme/diabook/icons/weblink.png"); display: block; width: 28px; height: 28px; background-repeat: no-repeat; margin-left: 10px; } @@ -384,21 +412,23 @@ .hide-comments-outer { margin-left: 80px; - margin-bottom: 1px; - width: 484px; + margin-bottom: 5px; + width: 684px; border-bottom: 1px solid #BDCDD4; - background-color: #fff; + border-top: 1px solid #BDCDD4; + padding: 8px; } /* global */ body { font-family: 'Lato', "Helvetica Neue", Helvetica, Arial, sans-serif; - font-size: 12.5px; + font-size: 15px; background-color: #ffffff; color: #2d2d2d; margin: 50px auto auto; display: table; + } h4 { @@ -406,7 +436,7 @@ h4 { } a { - color: #333333; + color: #3465A4; /* color: #3e3e8c; */ text-decoration: none; } @@ -449,6 +479,24 @@ a:hover { /*color: #005c94; */ text-decoration: underline; } +.intro-end { + border-bottom: 1px solid black; + clear: both; + margin-bottom: 25px; + padding-bottom: 25px; + width: 75%; + } +.intro-form-end { + clear: both; + } +.intro-fullname { + padding-bottom: 5px; + padding-top: 5px; + } +.intro-wrapper-end { + clear: both; + padding-bottom: 5px; + } code { font-family: Courier, monospace; white-space: pre; @@ -482,8 +530,9 @@ code { } #saved-search-ul .tool:hover, #nets-sidebar .tool:hover, -#sidebar-group-list .tool:hover { - background: #EEE; +#sidebar-group-list .tool:hover, +#fileas-sidebar .tool:hover { + background: #E7F2F7; } .tool .label { float: left; @@ -492,7 +541,7 @@ code { float: right; } .tool a { - color: #3465A4; + color: ##3F8FBA; } .tool a:hover { text-decoration: none; @@ -518,25 +567,11 @@ header { padding: 0px; width: 22%; height: 32px; - background: #ff500f; - background-color: #ff500f; + background: #000; z-index: 100; - border-bottom: 1px; - border-bottom-color: black; - border-bottom-style: inset; - background-image: linear-gradient(bottom, rgb(215,227,241) 26%, rgb(255,255,255) 82%); -background-image: -o-linear-gradient(bottom, rgb(215,227,241) 26%, rgb(255,255,255) 82%); -background-image: -moz-linear-gradient(bottom, rgb(215,227,241) 26%, rgb(255,255,255) 82%); -background-image: -webkit-linear-gradient(bottom, rgb(215,227,241) 26%, rgb(255,255,255) 82%); -background-image: -ms-linear-gradient(bottom, rgb(215,227,241) 26%, rgb(255,255,255) 82%); - -background-image: -webkit-gradient( - linear, - left bottom, - left top, - color-stop(0.26, rgb(215,227,241)), - color-stop(0.82, rgb(255,255,255)) -); + -webkit-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7); + -moz-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7); + box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7); } header #site-location { display: none; @@ -552,11 +587,11 @@ header #banner a:active, header #banner a:visited, header #banner a:link, header #banner a:hover { - color: black; + color: #ffffff; text-decoration: none; outline: none; vertical-align: middle; - font-weight: bolder; + font-weight: bolder; margin-left: 3px; } header #banner #logo-img { @@ -568,6 +603,86 @@ header #banner #logo-text { position: absolute; top: 10%; } +/* messages */ +#message-new { + background: #19aeff; + border: 1px solid #005c94; + width: 150px; +} +#message-new a { + color: #ffffff; + text-align: center; + display: block; + font-weight: bold; + padding: 1em 0px; + text-decoration: none; +} +.mail-list-wrapper { + background-color: #f6f7f8; + margin-bottom: 5px; + width: 100%; + height: auto; + overflow: hidden; +} +.mail-list-wrapper span { + display: block; + float: left; + width: 20%; + overflow: hidden; +} +.mail-list-wrapper .mail-subject { + width: 30%; + padding: 4px 0px 0px 4px; +} +.mail-list-wrapper .mail-subject a { + display: block; +} +.mail-list-wrapper .mail-subject.unseen a { + font-weight: bold; +} +.mail-list-wrapper .mail-date { + padding: 4px 4px 0px 4px; +} +.mail-list-wrapper .mail-from { + padding: 4px 4px 0px 4px; +} +.mail-list-wrapper .mail-count { + padding: 4px 4px 0px 4px; + text-align: right; +} +.mail-list-wrapper .mail-delete { + float: right; +} +#mail-display-subject { + background-color: #f6f7f8; + color: #2d2d2d; + margin-bottom: 10px; + width: 100%; + height: auto; + overflow: hidden; +} +#mail-display-subject span { + float: left; + overflow: hidden; + padding: 4px 0px 0px 10px; +} +#mail-display-subject .mail-delete { + float: right; + opacity: 0.5; + -webkit-transition: all 0.2s ease-in-out; + -moz-transition: all 0.2s ease-in-out; + -o-transition: all 0.2s ease-in-out; + -ms-transition: all 0.2s ease-in-out; + transition: all 0.2s ease-in-out; +} +#mail-display-subject:hover .mail-delete { + opacity: 1; + -webkit-transition: all 0.2s ease-in-out; + -moz-transition: all 0.2s ease-in-out; + -o-transition: all 0.2s ease-in-out; + -ms-transition: all 0.2s ease-in-out; + transition: all 0.2s ease-in-out; +} /* nav */ nav { width: 80%; @@ -576,32 +691,19 @@ nav { left: 22%; top: 0px; padding: 0px; - background: #ff500f; - color: #000; + background: #000; + color: #ffffff; z-index: 99; - border-bottom: 1px; - border-bottom-color: black; - border-bottom-style: inset; - background-image: linear-gradient(bottom, rgb(215,227,241) 26%, rgb(255,255,255) 82%); -background-image: -o-linear-gradient(bottom, rgb(215,227,241) 26%, rgb(255,255,255) 82%); -background-image: -moz-linear-gradient(bottom, rgb(215,227,241) 26%, rgb(255,255,255) 82%); -background-image: -webkit-linear-gradient(bottom, rgb(215,227,241) 26%, rgb(255,255,255) 82%); -background-image: -ms-linear-gradient(bottom, rgb(215,227,241) 26%, rgb(255,255,255) 82%); - -background-image: -webkit-gradient( - linear, - left bottom, - left top, - color-stop(0.26, rgb(215,227,241)), - color-stop(0.82, rgb(255,255,255)) -); + -webkit-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7); + -moz-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7); + box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7); } nav a, nav a:active, nav a:visited, nav a:link, nav a:hover { - /*color: #1f1f1f;*/ + color: #ffffff; text-decoration: none; outline: none; } @@ -680,21 +782,11 @@ nav .nav-menu-icon { position: relative; height: 22px; padding: 5px; - margin: 0px 5px; - -moz-border-radius: 5px 5px 0 0; - -webkit-border-radius: 5px 5px 0 0; - border-radius: 5px 5px 0 0; -} -nav .nav-menu-icon:hover { - position: relative; - height: 22px; - padding: 5px; - margin: 0px 5px; + margin: 0px 7px; -moz-border-radius: 5px 5px 0 0; -webkit-border-radius: 5px 5px 0 0; border-radius: 5px 5px 0 0; } - nav .nav-menu-icon.selected { background-color: #fff; } @@ -705,13 +797,14 @@ nav .nav-menu-icon img { nav .nav-menu-icon .nav-notify { top: 3px; } +/*marker*/ nav .nav-menu { position: relative; height: 16px; padding: 5px; margin: 3px 15px 0px; - font-size: 13px; - /*border: 3px solid #364A84;*/ + font-size: 15px; + /*border-bottom: 3px solid #364A84;*/ } nav .nav-menu.selected { /*border-bottom: 3px solid #9eabb0;*/ @@ -719,7 +812,7 @@ nav .nav-menu.selected { nav .nav-notify { display: none; position: absolute; - background-color: #fff; + background-color: #ff0000; /* background-color: #19aeff; */ -moz-border-radius: 5px 5px 5px 5px; -webkit-border-radius: 5px 5px 5px 5px; @@ -731,7 +824,6 @@ nav .nav-notify { right: -6px; min-width: 10px; text-align: center; - border: 1px solid black; } nav .nav-notify.show { display: block; @@ -754,7 +846,6 @@ nav #nav-home-link, #nav-directory-link, #nav-apps-link{ margin-right: 0px; font-weight: bold; margin: 3px 5px; - font-size: 14px; } nav #nav-directory-link{ margin-right: 0px; @@ -772,22 +863,19 @@ nav #nav-site-linkmenu .menu-popup { } nav #nav-messages-linkmenu.on .icon.messages, nav #nav-messages-linkmenu.selected .icon.messages{ - background-image: url("../../../view/theme/diabook-aerith/icons/messages.png"); + background-image: url("../../../view/theme/diabook/icons/messages2.png"); } /*nav #nav-notifications-linkmenu.on .icon.notify,*/ nav #nav-notifications-linkmenu.selected .icon.notify{ - background-image: url("../../../view/theme/diabook-aerith/icons/notify.png"); + background-image: url("../../../view/theme/diabook/icons/notify2.png"); } nav #nav-contacts-linkmenu.on .icon.contacts, nav #nav-contacts-linkmenu.selected .icon.contacts{ - background-image: url("../../../view/theme/diabook-aerith/icons/contacts.png"); + background-image: url("../../../view/theme/diabook/icons/contacts2.png"); } nav #nav-apps-link.selected { - background-color: #fff; - moz-border-radius: 5px 5px 0 0; --webkit-border-radius: 5px 5px 0 0; -border-radius: 5px 5px 0 0; + background-color: #364e59; } #nav-notifications-mark-all { @@ -812,7 +900,7 @@ ul.menu-popup { position: absolute; display: none; width: 11em; - background: #fff; + background: #ffffff; color: #2d2d2d; margin: 0px; padding: 0px; @@ -829,8 +917,8 @@ ul.menu-popup a { text-decoration: none; } ul.menu-popup a:hover { - background-color: #3465A4; /*bdcdd4;*/ - color: #fff; + background-color: #fff797; /*bdcdd4;*/ + color: #000; } ul.menu-popup .menu-sep { border-top: 1px solid #9eabb0; @@ -912,10 +1000,6 @@ ul.menu-popup .empty { /*profile_side*/ #profile_side { margin-bottom: 30px; - -} -#profile_side a{ - color: #333; } #ps-usericon{ height: 25px @@ -927,6 +1011,7 @@ ul.menu-popup .empty { position: absolute; padding-top: 4px; padding-left: 5px; + color: #2D2D2D; word-wrap: break-word; width: 130px; } @@ -941,55 +1026,74 @@ ul.menu-popup .empty { .menu-profile-list{ height: auto; overflow: auto; - padding-top: 3px; - padding-bottom: 3px; - padding-left: 16px; min-height: 16px; list-style: none; } .menu-profile-list:hover{ - background: #EEE; + background: #E7F2F7; } .menu-profile-list-item{ padding-left: 5px; + vertical-align: middle; } .menu-profile-list-item:hover{ text-decoration: none; } /*http://prothemedesign.com/circular-icons/*/ -.menu-profile-list.home{ - background: url("../../../view/theme/diabook-aerith/icons/home.png") no-repeat; - } -.menu-profile-list.photos{ - background: url("../../../view/theme/diabook-aerith/icons/mess_side.png") no-repeat; - } -.menu-profile-list.events{ - background: url("../../../view/theme/diabook-aerith/icons/events.png") no-repeat; - } -.menu-profile-list.notes{ - background: url("../../../view/theme/diabook-aerith/icons/notes.png") no-repeat; - } -.menu-profile-list.foren{ - background: url("../../../view/theme/diabook-aerith/icons/pubgroups.png") no-repeat; - } -.menu-profile-list.com_side{ - background: url("../../../view/theme/diabook-aerith/icons/com_side.png") no-repeat; - } -.menu-profile-list.pscontacts{ - background: url("../../../view/theme/diabook-aerith/icons/pscontacts.png") no-repeat; +.menu-profile-icon.home{ + background: url("../../../view/theme/diabook/icons/home.png") no-repeat; + float: left; + height: 22px; + width: 22px; } +.menu-profile-icon.photos{ + background: url("../../../view/theme/diabook/icons/mess_side.png") no-repeat; + float: left; + height: 22px; + width: 22px;} +.menu-profile-icon.events{ + background: url("../../../view/theme/diabook/icons/events.png") no-repeat; + float: left; + height: 22px; + width: 22px;} +.menu-profile-icon.notes{ + background: url("../../../view/theme/diabook/icons/notes.png") no-repeat; + float: left; + height: 22px; + width: 22px;} +.menu-profile-icon.foren{ + background: url("../../../view/theme/diabook/icons/pubgroups.png") no-repeat; + float: left; + height: 22px; + width: 22px;} +.menu-profile-icon.com_side{ + background: url("../../../view/theme/diabook/icons/com_side.png") no-repeat; + float: left; + height: 22px; + width: 22px;} +.menu-profile-icon.pscontacts{ + background: url("../../../view/theme/diabook/icons/pscontacts.png") no-repeat; + float: left; + height: 22px; + width: 22px;} + /* aside */ +/*marker*/ aside { display: table-cell; vertical-align: top; - width: 200px; - padding: 0px 10px 0px 10px; + width: 170px; + padding: 0px 10px 0px 0px; border-right: 1px solid #D2D2D2; float: left; /* background: #F1F1F1; */ } aside #page-sidebar{display: none;} -aside .vcard {display: none;} +aside .vcard .fn { + font-size: 18px; + font-weight: bold; + margin-bottom: 5px; +} aside .vcard .title { margin-bottom: 5px; } @@ -1047,12 +1151,15 @@ border-bottom-right-radius: 15px; border-bottom-left-radius: 15px; } aside #side-follow-url { - width: 150px; + width: 173px; } aside #side-peoplefind-url { - width: 150px; + width: 173px; } -#contact-block {display: none;} +#contact-block { + overflow: auto; + height: auto; +} #contact-block .contact-block-h4 { float: left; margin: 5px 0px; @@ -1085,9 +1192,11 @@ aside #side-peoplefind-url { .action .s16 { width: 16px; overflow: hidden; padding: 0px;}*/ /* font-size: 12px; */ } +/*marker*/ .widget h3 { padding: 0px; margin: 2px; + font-size: 1.05em; } .widget .action { opacity: 0.1; @@ -1137,46 +1246,51 @@ aside #side-peoplefind-url { min-height: 16px; list-style: none; } -#side-bar-photos-albums li{ -list-style-type: disc; -} -#side-bar-photos-albums ul li{ - margin-left: 30px; - padding-left: 0px; - } -#side-bar-photos-albums ul li a{ - color: #3465A4; -} -.widget .tool.selected { - background: url("../../../view/theme/diabook-aerith/icons/selected.png") no-repeat left center; +.group_selected { + background: url("../../../view/theme/diabook/icons/selected.png") no-repeat left center; + float: left; + height: 22px; + width: 22px; } -/* widget: search */ -span.sbox_l { - background: white url('../../../view/theme/diabook/icons/srch_l.gif') no-repeat top left; - float: left; - width: 19px; height: 19px; - margin-left: 10px; - margin-top: 5px; - +.group_unselected { + background: url("../../../view/theme/diabook/icons/unselected.png") no-repeat left center; + float: left; + height: 22px; + width: 22px; } - -span.sbox_r { - background: white url('../../../view/theme/diabook/icons/srch_r.gif') no-repeat top left; - float: left; - width: 19px; height: 19px; - margin-top: 5px; +.icon.text_add { + background-image: url("../../../images/icons/16/add.png"); + float: right; + opacity: 0.1; + margin-right: 14px; + } +.icon.text_add:hover { + background-image: url("../../../images/icons/16/add.png"); + float: right; + cursor: pointer; + margin-right: 14px; + opacity: 1; +-webkit-transition: all 0.2s ease-in-out; +-moz-transition: all 0.2s ease-in-out; +-o-transition: all 0.2s ease-in-out; +-ms-transition: all 0.2s ease-in-out; +transition: all 0.2s ease-in-out; + } +.icon.text_edit { + background-image: url("../../../images/icons/10/edit.png"); + opacity: 0.1; + margin-top: 6px; + float: right; + height: 10px; } - -span.sbox input { - background: white url('../../../view/theme/diabook/icons/srch_bg.gif') repeat-x top left; - float: left; - margin-top: 5px; - border: 0; - height: 13px; width: 100px; - padding: 3px; - font: 11px/13px arial; - color: #000; +.icon.text_edit:hover { + background-image: url("../../../images/icons/10/edit.png"); + opacity: 1; + margin-top: 6px; + float: right; + height: 10px; } +/* widget: search */ #add-search-popup { width: 200px; top: 18px; @@ -1185,8 +1299,8 @@ span.sbox input { section { display: table-cell; vertical-align: top; - width: 650px; - padding: 0px 0px 0px 20px; + width: 800px; + padding: 0px 0px 0px 12px; } body .pageheader{ @@ -1194,9 +1308,11 @@ body .pageheader{ font-size: 20px; margin-bottom: 20px; margin-top: 0px; - max-width: 575px; + max-width: 775px; + } +.qcomment{ + max-width: 122px; } - #id_username { width: 173px; } @@ -1215,103 +1331,56 @@ body .pageheader{ clear: both; display: block; } -.tabs {display: none;} -.tab.button{display: none;} -.rs_tabs { +.tabs { background-position: 0 -20px; background-repeat: repeat-x; height: 27px; padding: 0; } -.rs_tab.button { +.tab.button { + margin-left: 5px; /*background: none repeat scroll 0 0 #F8F8F8;*/ border: 1px solid #CCCCCC; border-radius: 3px 3px 3px 3px; - font-weight: bolder; + font-weight: normal; padding: 3px; color: #333333; - text-decoration: none; } + #birthday-notice, #event-notice, #birthday-wrapper, #event-wrapper{ margin-bottom: 10px; } -#birthday-wrapper a { - color: #3465A4; - } - -right_aside { - display: table-cell; - vertical-align: top; - width: 170px; - - /*border-left: 1px solid #D2D2D2;*/ - - /* background: #F1F1F1; */ -} -right_aside a{color: #3465A4;} -right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 5px; margin-bottom: 0px; -margin-top:30px;} -right_aside .directory-item { width: 50px; height: 50px; vertical-align: center; text-align: center; } -right_aside .directory-photo { margin: 0px; } -right_aside .directory-photo-img { max-width: 45px; max-height: 45px; } -right_aside #likes { margin: 0px; padding: 0px; list-style: none; } -right_aside .items-wrapper{ overflow: auto; width: 100%; } -right_aside #lastusers-wrapper { padding-left: 6px; padding-top: 3px; overflow: auto; width: 100%; } -right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow: auto; width: 100%; } -#page-sidebar-right_aside{margin-top: 0px; margin-bottom: 30px;} -#page-sidebar-right_aside ul {margin-top: 0px;} -#page-sidebar-right_aside .label {max-width: 128px;} -right_aside .icon {width: 10px; height: 10px;} -.close_box { - background-image: url("../../../view/theme/diabook-aerith/icons/close_box.png"); - float: right; - cursor: pointer; - opacity: 0.1; - } -.close_box:hover { - background-image: url("../../../view/theme/diabook-aerith/icons/close_box.png"); - float: right; - cursor: pointer; - opacity: 1; --webkit-transition: all 0.2s ease-in-out; --moz-transition: all 0.2s ease-in-out; --o-transition: all 0.2s ease-in-out; --ms-transition: all 0.2s ease-in-out; -transition: all 0.2s ease-in-out; - } - - /* wall item */ +/*marker*/ .tread-wrapper { border-bottom: 1px solid #D2D2D2; position: relative; padding: 5px; margin-bottom: 0px; - width: 575px; -} -.tread-wrapper a{ - color: #3465A4; + width: 775px; + padding-top: 10px; } .wall-item-decor { position: absolute; - left: 790px; + left: 780px; top: -10px; width: 16px; } - +/*marker*/ .wall-item-container { display: table; - width: 580px; + width: 770px; } - .wall-item-container .wall-item-item, .wall-item-container .wall-item-bottom { display: table-row; } - +.wall-item-photo-container .wall-item-item, .wall-item-container .wall-item-bottom { + display: table-row; +} .wall-item-bottom { font-size: 13px; } @@ -1337,16 +1406,32 @@ transition: all 0.2s ease-in-out; text-align: left; width: 80px; } +.wall-item-photo-container .wall-item-info { + display: table-cell; + vertical-align: top; + text-align: left; + width: 80px; +} .wall-item-container .wall-item-location { padding-right: 40px; display: table-cell; } +.wall-item-photo-container .wall-item-location { + padding-right: 40px; + display: table-cell; +} .wall-item-container .wall-item-ago { word-wrap: break-word; width: 50px; margin-left: 10px; color: #999; } +.wall-item-photo-container .wall-item-ago { + word-wrap: break-word; + width: 50px; + margin-left: 10px; + color: #999; +} .wall-item-location { clear: both; @@ -1354,21 +1439,36 @@ transition: all 0.2s ease-in-out; margin-bottom: 5px; } - +/*marker*/ .wall-item-container .wall-item-content { - font-size: 12.5px; - max-width: 420px; + + max-width: 690px; word-wrap: break-word; - line-height: 1.2; + + margin-bottom: 14px; } +/*marker*/ +.wall-item-photo-container .wall-item-content { + max-width: 690px; + word-wrap: break-word; + + margin-bottom: 14px; +} .wall-item-container .wall-item-content img { - max-width: 400px; + max-width: 700px; +} +.wall-item-photo-container .wall-item-content img { + max-width: 700px; } .wall-item-container .wall-item-links, .wall-item-container .wall-item-actions { display: table-cell; vertical-align: middle; } +.wall-item-photo-container .wall-item-links, .wall-item-photo-container .wall-item-actions { + display: table-cell; + vertical-align: middle; +} .wall-item-container .wall-item-links .icon, .wall-item-container .wall-item-actions .icon { opacity: 0.5; -webkit-transition: all 0.2s ease-in-out; @@ -1377,6 +1477,14 @@ transition: all 0.2s ease-in-out; -ms-transition: all 0.2s ease-in-out; transition: all 0.2s ease-in-out; } +.wall-item-photo-container .wall-item-links .icon, .wall-item-photo-container .wall-item-actions .icon { + opacity: 0.5; + -webkit-transition: all 0.2s ease-in-out; + -moz-transition: all 0.2s ease-in-out; + -o-transition: all 0.2s ease-in-out; + -ms-transition: all 0.2s ease-in-out; + transition: all 0.2s ease-in-out; +} .wall-item-container .wall-item-links .icon:hover, .wall-item-container .wall-item-actions .icon:hover { opacity: 1; -webkit-transition: all 0.2s ease-in-out; @@ -1385,14 +1493,22 @@ transition: all 0.2s ease-in-out; -ms-transition: all 0.2s ease-in-out; transition: all 0.2s ease-in-out; } -.wall-item-container .wall-item-name { +.wall-item-photo-container .wall-item-links .icon:hover, .wall-item-photo-container .wall-item-actions .icon:hover { + opacity: 1; + -webkit-transition: all 0.2s ease-in-out; + -moz-transition: all 0.2s ease-in-out; + -o-transition: all 0.2s ease-in-out; + -ms-transition: all 0.2s ease-in-out; + transition: all 0.2s ease-in-out; +} +.wall-item-container .wall-item-name, .wall-item-photo-container .wall-item-name { font-weight: bold; } -.wall-item-container .wall-item-actions-author { +.wall-item-container .wall-item-actions-author, .wall-item-photo-container .wall-item-actions-author { width: 100%; margin-bottom: 0.3em; } -.wall-item-container .wall-item-actions-social { +.wall-item-container .wall-item-actions-social, .wall-item-photo-container .wall-item-actions-social { float: left; margin-bottom: 1px; display: table-cell; @@ -1400,27 +1516,85 @@ transition: all 0.2s ease-in-out; .wall-item-container .wall-item-actions-social a { margin-right: 1em; } +.wall-item-photo-container .wall-item-actions-social a { + margin-right: 1em; +} .wall-item-actions-social a { float: left; } + .wall-item-container .wall-item-actions-tools { float: right; width: 80px; display: table-cell; } +.wall-item-photo-container .wall-item-actions-tools { + float: right; + width: 80px; + display: table-cell; +} .wall-item-container .wall-item-actions-tools a { float: right; } +.wall-item-photo-container .wall-item-actions-tools a { + float: right; +} .wall-item-container .wall-item-actions-tools input { float: right; } +.wall-item-photo-container .wall-item-actions-tools input { + float: right; +} +/*marker*/ .wall-item-container.comment { margin-top: 5px; margin-bottom: 5px; margin-left: 80px; - width: 500px; + width: 690px; border-bottom: 1px solid hsl(198, 21%, 79%); } +.wall-item-photo-container.comment { + margin-top: 5px; + margin-bottom: 5px; + margin-left: 40px; + width: 650px; + border-bottom: 1px solid #D2D2D2; +} +.wall-item-photo-container.comment { + top: 15px !important; + left: 15px !important; +} +.wall-item-photo-container { + display: table; + width: 780px; +} + +.my-comment-photo { + width: 48px; + margin-left: 40px; + margin-right: 32px; + } +.comment-edit-preview { + width: 500px; + margin-top: 10px; +} +.comment-edit-text-empty { + width: 500px; + border: 1px solid #D2D2D2; + height: 3.2em; + color: #2d2d2d; +} +.comment-edit-text-full { + font-size: 12.5px; + height: 3.3em; + + border: 1px solid #D2D2D2; + width: 500px; +} +.comment-edit-photo { + margin: 10px 0 0; + display: table-cell; +} .wall-item-container.comment .contact-photo { width: 32px; height: 32px; @@ -1435,24 +1609,20 @@ transition: all 0.2s ease-in-out; .wall-item-container.comment .wall-item-links { padding-left: 12px; } - .wall-item-comment-wrapper { - margin: 1px 0px 0px 80px; - background-color: #fff; - width: 500px; + margin: 1px 5px 17px 80px; } .wall-item-comment-wrapper .comment-edit-photo { display: none; } .wall-item-comment-wrapper textarea { height: 2.0em; - width: 93%; + width: 100%; font-size: 10px; color: #999999; border: 1px solid #DDD; padding: 0.3em; font-size: 14px; - margin-left: 20px; } .wall-item-comment-wrapper .comment-edit-text-full { font-size: 14px; @@ -1460,11 +1630,7 @@ transition: all 0.2s ease-in-out; color: #2d2d2d; border: 1px solid #2d2d2d; } -.comment-edit-preview { - width: 710px; - border: 1px solid #2d2d2d; - margin-top: 10px; -} + .comment-edit-preview .contact-photo { width: 32px; height: 32px; @@ -1476,6 +1642,11 @@ transition: all 0.2s ease-in-out; top: 15px !important; left: 15px !important; } +.comment-edit-preview { + width: 500px; + margin-top: 10px; + background-color: #fff797; +} .comment-edit-preview .wall-item-links { padding-left: 12px; } @@ -1507,14 +1678,14 @@ transition: all 0.2s ease-in-out; } .tag { /*background: url("../../../images/tag_b.png") repeat-x center left;*/ - color: #999; + color: #3465A4; padding-left: 3px; font-size: 12px; } .tag a { padding-right: 5px; /*background: url("../../../images/tag.png") no-repeat center right;*/ - color: #999; + color: #3465A4; } .wwto { position: absolute !important; @@ -1597,7 +1768,7 @@ transition: all 0.2s ease-in-out; display: none; } #jot { - width: 585px; + width: 785px; margin: 0px 2em 20px 0px; } #profile-jot-form #profile-jot-text { @@ -1609,12 +1780,17 @@ transition: all 0.2s ease-in-out; padding: 0.3em; margin-bottom: 10px; } +.grey +{ + display: inline; + float: right; + } #jot #jot-tools { margin: 0px; padding: 0px; height: 40px; overflow: none; - width: 583px; + width: 783px; background-color: #fff; border-bottom: 2px solid #9eabb0; } @@ -1694,7 +1870,7 @@ transition: all 0.2s ease-in-out; height: 20px; margin: 0 0 5px; width: 60%; - border: 1px solid #ffffff; + border: 1px solid #d2d2d2; } #profile-jot-form #jot-title:-webkit-input-placeholder { font-weight: normal; @@ -1703,7 +1879,7 @@ transition: all 0.2s ease-in-out; font-weight: normal; } #profile-jot-form #profile-jot-text_parent #profile-jot-text_tbl{ - width: 585px; + width: 785px; height: 100px; } #jot #jot-title:hover { @@ -1736,21 +1912,21 @@ transition: all 0.2s ease-in-out; cursor: pointer; margin-top: 2px; } +/*marker*/ #profile-jot-wrapper{ - margin: 0 2em 20px 0; - width: 585px; + margin: 0 20px 20px 0; + width: 785px; } - +/*marker*/ #profile-jot-submit-wrapper { margin-bottom: 50px; - width: 585px; + width: 785px; } #profile-jot-submit { float: right; margin-top: 2px; font-size: 14px; - } #profile-upload-wrapper { float: left; @@ -1821,7 +1997,8 @@ transition: all 0.2s ease-in-out; font-weight: bolder; } .button.creation2 { - background-color: #3465A4; + background-color: #33ACFF; + background-image: -moz-linear-gradient(center top , #66C1FF 0%, #0097FF 100%); border: 1px solid #777777; color: white; border-radius: 3px 3px 3px 3px; @@ -1942,10 +2119,29 @@ transition: all 0.2s ease-in-out; border-color: #ff4141; } /** /acl **/ -/** tab buttons 14618a**/ +/** tab buttons **/ +/*marker*/ +ul.tabs { + list-style-type: none; + padding-bottom: 10px; + font-size: 15px; + width: 805px; +} +ul.tabs li { + float: left; + margin-left: 5px; +} +ul.tabs li .active { + background-color: #333333; + border: 1px solid #777777; + color: white; + border-radius: 3px 3px 3px 3px; + box-shadow: 0 1px 1px #CFCFCF; + margin-left: 5px; +} +//settings tabs ul.rs_tabs { list-style-type: none; - font-size: 11px; } ul.rs_tabs li { @@ -1953,14 +2149,31 @@ ul.rs_tabs li { margin-bottom: 30px; clear: both; } -ul.rs_tabs li .active { - background-color: #3465A4; +ul.rs_tabs li .selected { + background-color: #333; border: 1px solid #777777; color: white; border-radius: 3px 3px 3px 3px; box-shadow: 2px 2px 2px #CFCFCF; font-size: 13px; } +.rs_tabs { + list-style-type: none; + font-size: 11px; + background-position: 0 -20px; + background-repeat: repeat-x; + height: 27px; + padding: 0; + } +.rs_tab.button { + /*background: none repeat scroll 0 0 #F8F8F8;*/ + border: 1px solid #CCCCCC; + border-radius: 3px 3px 3px 3px; + font-weight: bolder; + padding: 3px; + color: #333333; + text-decoration: none; + } /** * Form fields */ @@ -2020,6 +2233,14 @@ ul.rs_tabs li .active { .field.radio .field_help { margin-left: 0px; } +.suggest-select { +width: 500px; +height: 350px; + } +.message-to-select { + width: 400px; + height: 150px; + } #directory-search-form{ margin-bottom: 50px; } @@ -2080,14 +2301,12 @@ ul.rs_tabs li .active { } /* photo */ .photo { -box-shadow: 2px 2px 5px 0px #000000; -margin: 2px 5px 2px 5px; -max-height: 85%; -max-width: 85%; -} +border-radius: 10px; +height: 145px !important; +width: 145px !important; + } .lframe { float: left; - /*margin: 0px 10px 10px 0px;*/ } /* profile match wrapper */ .profile-match-wrapper { @@ -2118,7 +2337,7 @@ max-width: 85%; padding: 0px; width: 16px; height: 16px; - top: -20px; left:0px; + top: -16px; left:0px; overflow: hidden; text-indent: 40px; display: none; @@ -2156,6 +2375,10 @@ blockquote { border-left: 1px solid #D2D2D2; padding-left: 9px; margin: 0 0 0 .8ex; + color: #777; +} +.oembed { + font-weight: bold; } .aprofile dt{ box-shadow: 1px 1px 5px 0; @@ -2204,7 +2427,6 @@ box-shadow: 1px 1px 5px 0; float: right; margin-top: 10px; } - #prvmail-subject { background: none repeat scroll 0 0 #FFFFFF; @@ -2218,7 +2440,6 @@ vertical-align: middle; #prvmail-form{ width: 597px; } - #prvmail-upload-wrapper, #prvmail-link-wrapper, #prvmail-rotator-wrapper { @@ -2374,9 +2595,6 @@ a.mail-list-link { .calendar { font-family: Courier, monospace; } -.calendar.eventcal a { - color: #3465A4; - } .today { font-weight: bold; color: #FF0000; @@ -2421,13 +2639,8 @@ a.mail-list-link { margin-right: 5px; margin-top: 30px; } -.comment-edit-text-empty { - margin: 10px 0 0; - width: 85%; -} -.comment-edit-photo { - margin: 10px 0 0; -} + + .wall-item-like-buttons .icon.like { float: left; } @@ -2497,8 +2710,8 @@ float: left; display: none; /* position: absolute; */ /* position: absolute; */ - left: -2px; - top: -20px; + left: 0px; + top: -16px; } .contact-wrapper { float: left; @@ -2569,36 +2782,30 @@ list-style-type: disc; width: 200px; height: 140px; overflow: hidden; } +/* .photo-top-album-name { - width: 100%; - position: absolute; - bottom: 0px; - padding-left: 3px; - background-color: #EEE; -} -.photo-top-album-link{ - color: #3465A4; - } -.photo-top-album-img{ - - } + position: absolute; + bottom: 0; + padding: 0 5px; +}*/ /*.photo-top-image-wrapper { position: relative; float: left; margin-top: 15px; margin-right: 15px; width: 200px; height: 200px; - overflow: hidden; -} + +}*/ .photo-top-album-name { width: 100%; - min-height: 2em; position: absolute; bottom: 0px; - padding: 0px 3px; - padding-top: 0.5em; - background-color: rgb(255, 255, 255); -}*/ + padding-left: 3px; + background-color: #EEE; +} +.photo-top-album-link{ + color: #3465A4; + } #photo-top-end { clear: both; } @@ -2611,5 +2818,4 @@ list-style-type: disc; #photos-upload-newalbum-div { float: left; width: 175px; -} - +}
\ No newline at end of file diff --git a/view/theme/diabook/style.css b/view/theme/diabook/style.css index d11e3191a..e73bd1f57 100644 --- a/view/theme/diabook/style.css +++ b/view/theme/diabook/style.css @@ -83,6 +83,35 @@ #adminpage .selectall { text-align: right; } /* icons */ +.icon.bb-url{ + background-image: url("../../../view/theme/diabook/icons/bb-url.png"); + float: right; + margin-top: 2px;} +.icon.quote{ + background-image: url("../../../view/theme/diabook/icons/quote.png"); + float: right; + margin-top: 2px;} +.icon.bold{ + background-image: url("../../../view/theme/diabook/icons/bold.png"); + float: right; + margin-top: 2px;} +.icon.underline{ + background-image: url("../../../view/theme/diabook/icons/underline.png"); + float: right; + margin-top: 2px;} +.icon.italic{ + background-image: url("../../../view/theme/diabook/icons/italic.png"); + float: right; + margin-top: 2px;} +.icon.bb-image{ + background-image: url("../../../view/theme/diabook/icons/bb-image.png"); + float: right; + margin-top: 2px;} +.icon.bb-video{ + background-image: url("../../../view/theme/diabook/icons/bb-video.png"); + float: right; + margin-top: 2px;} + .icon.contacts { background-image: url("../../../view/theme/diabook/icons/contacts.png");} .icon.notifications { @@ -500,8 +529,9 @@ code { } #saved-search-ul .tool:hover, #nets-sidebar .tool:hover, -#sidebar-group-list .tool:hover { - background: #EEE; +#sidebar-group-list .tool:hover, +#fileas-sidebar .tool:hover { + background: #E7F2F7; } .tool .label { float: left; @@ -994,43 +1024,56 @@ ul.menu-popup .empty { .menu-profile-list{ height: auto; overflow: auto; - padding-top: 3px; - padding-bottom: 3px; - padding-left: 16px; min-height: 16px; list-style: none; } .menu-profile-list:hover{ - background: #EEE; + background: #E7F2F7; } .menu-profile-list-item{ padding-left: 5px; + vertical-align: middle; } .menu-profile-list-item:hover{ text-decoration: none; } /*http://prothemedesign.com/circular-icons/*/ -.menu-profile-list.home{ - background: url("../../../view/theme/diabook-blue/icons/home.png") no-repeat; - } -.menu-profile-list.photos{ - background: url("../../../view/theme/diabook-blue/icons/mess_side.png") no-repeat; - } -.menu-profile-list.events{ - background: url("../../../view/theme/diabook-blue/icons/events.png") no-repeat; - } -.menu-profile-list.notes{ - background: url("../../../view/theme/diabook-blue/icons/notes.png") no-repeat; - } -.menu-profile-list.foren{ - background: url("../../../view/theme/diabook-blue/icons/pubgroups.png") no-repeat; - } -.menu-profile-list.com_side{ - background: url("../../../view/theme/diabook-blue/icons/com_side.png") no-repeat; +.menu-profile-icon.home{ + background: url("../../../view/theme/diabook/icons/home.png") no-repeat; + float: left; + height: 22px; + width: 22px; } -.menu-profile-list.pscontacts{ +.menu-profile-icon.photos{ + background: url("../../../view/theme/diabook/icons/mess_side.png") no-repeat; + float: left; + height: 22px; + width: 22px;} +.menu-profile-icon.events{ + background: url("../../../view/theme/diabook/icons/events.png") no-repeat; + float: left; + height: 22px; + width: 22px;} +.menu-profile-icon.notes{ + background: url("../../../view/theme/diabook/icons/notes.png") no-repeat; + float: left; + height: 22px; + width: 22px;} +.menu-profile-icon.foren{ + background: url("../../../view/theme/diabook/icons/pubgroups.png") no-repeat; + float: left; + height: 22px; + width: 22px;} +.menu-profile-icon.com_side{ + background: url("../../../view/theme/diabook/icons/com_side.png") no-repeat; + float: left; + height: 22px; + width: 22px;} +.menu-profile-icon.pscontacts{ background: url("../../../view/theme/diabook/icons/pscontacts.png") no-repeat; - } + float: left; + height: 22px; + width: 22px;} /* aside */ aside { @@ -1198,8 +1241,49 @@ aside #side-peoplefind-url { min-height: 16px; list-style: none; } -.widget .tool.selected { +.group_selected { background: url("../../../view/theme/diabook/icons/selected.png") no-repeat left center; + float: left; + height: 22px; + width: 22px; +} +.group_unselected { + background: url("../../../view/theme/diabook/icons/unselected.png") no-repeat left center; + float: left; + height: 22px; + width: 22px; +} +.icon.text_add { + background-image: url("../../../images/icons/16/add.png"); + float: right; + opacity: 0.1; + margin-right: 14px; + } +.icon.text_add:hover { + background-image: url("../../../images/icons/16/add.png"); + float: right; + cursor: pointer; + margin-right: 14px; + opacity: 1; +-webkit-transition: all 0.2s ease-in-out; +-moz-transition: all 0.2s ease-in-out; +-o-transition: all 0.2s ease-in-out; +-ms-transition: all 0.2s ease-in-out; +transition: all 0.2s ease-in-out; + } +.icon.text_edit { + background-image: url("../../../images/icons/10/edit.png"); + opacity: 0.1; + margin-top: 6px; + float: right; + height: 10px; +} +.icon.text_edit:hover { + background-image: url("../../../images/icons/10/edit.png"); + opacity: 1; + margin-top: 6px; + float: right; + height: 10px; } /* widget: search */ #add-search-popup { @@ -1258,6 +1342,7 @@ body .pageheader{ padding: 3px; color: #333333; } + #birthday-notice, #event-notice, #birthday-wrapper, #event-wrapper{ margin-bottom: 10px; @@ -1269,6 +1354,7 @@ body .pageheader{ padding: 5px; margin-bottom: 0px; width: 775px; + padding-top: 10px; } .wall-item-decor { @@ -1349,17 +1435,17 @@ body .pageheader{ } .wall-item-container .wall-item-content { - font-size: 12.5px; + max-width: 720px; word-wrap: break-word; - line-height: 1.2; + margin-bottom: 14px; } .wall-item-photo-container .wall-item-content { - font-size: 12.5px; + max-width: 720px; word-wrap: break-word; - line-height: 1.2; + margin-bottom: 14px; } .wall-item-container .wall-item-content img { @@ -1516,7 +1602,7 @@ body .pageheader{ padding-left: 12px; } .wall-item-comment-wrapper { - margin: 1px 5px 1px 80px; + margin: 1px 5px 17px 80px; } .wall-item-comment-wrapper .comment-edit-photo { display: none; @@ -2042,6 +2128,41 @@ ul.tabs li .active { box-shadow: 0 1px 1px #CFCFCF; margin-left: 5px; } +//settings tabs +ul.rs_tabs { + list-style-type: none; + font-size: 11px; +} +ul.rs_tabs li { + float: left; + margin-bottom: 30px; + clear: both; +} +ul.rs_tabs li .selected { + background-color: #333; + border: 1px solid #777777; + color: white; + border-radius: 3px 3px 3px 3px; + box-shadow: 2px 2px 2px #CFCFCF; + font-size: 13px; +} +.rs_tabs { + list-style-type: none; + font-size: 11px; + background-position: 0 -20px; + background-repeat: repeat-x; + height: 27px; + padding: 0; + } +.rs_tab.button { + /*background: none repeat scroll 0 0 #F8F8F8;*/ + border: 1px solid #CCCCCC; + border-radius: 3px 3px 3px 3px; + font-weight: bolder; + padding: 3px; + color: #333333; + text-decoration: none; + } /** * Form fields */ diff --git a/view/theme/diabook/style.php b/view/theme/diabook/style.php new file mode 100644 index 000000000..770124841 --- /dev/null +++ b/view/theme/diabook/style.php @@ -0,0 +1,277 @@ +<?php + $line_height=false; + $diabook_font_size=false; + $resolution=false; + $site_line_height = get_config("diabook","line_height"); + $site_diabook_font_size = get_config("diabook", "font_size" ); + $site_resolution = get_config("diabook", "resolution" ); + + + if (local_user()) { + $line_height = get_pconfig(local_user(), "diabook","line_height"); + $diabook_font_size = get_pconfig(local_user(), "diabook", "font_size"); + $resolution = get_pconfig(local_user(), "diabook", "resolution"); + } + + if ($line_height===false) $line_height=$site_line_height; + if ($line_height===false) $line_height="1.3"; + if ($diabook_font_size===false) $diabook_font_size=$site_diabook_font_size; + if ($diabook_font_size===false) $diabook_font_size="13"; + if ($resolution===false) $resolution=$site_resolution; + if ($resolution===false) $resolution="normal"; + + + if($resolution == "normal") { + if (file_exists("$THEMEPATH/style.css")){ + echo file_get_contents("$THEMEPATH/style.css"); + } + + if($diabook_font_size == "15"){ + echo " + .wall-item-container .wall-item-content { + font-size: 15px; + } + + .wall-item-photo-container .wall-item-content { + font-size: 15px; + } + "; + } + if($diabook_font_size == "14"){ + echo " + .wall-item-container .wall-item-content { + font-size: 14px; + } + + .wall-item-photo-container .wall-item-content { + font-size: 14px; + } + "; + } + if($diabook_font_size == "13.5"){ + echo " + .wall-item-container .wall-item-content { + font-size: 13.5px; + } + + .wall-item-photo-container .wall-item-content { + font-size: 13.5px; + } + "; + } + if($diabook_font_size == "13"){ + echo " + .wall-item-container .wall-item-content { + font-size: 13px; + } + + .wall-item-photo-container .wall-item-content { + font-size: 13px; + } + "; + } + if($diabook_font_size == "12.5"){ + echo " + .wall-item-container .wall-item-content { + font-size: 12.5px; + } + + .wall-item-photo-container .wall-item-content { + font-size: 12.5px; + } + "; + } + if($diabook_font_size == "12"){ + echo " + .wall-item-container .wall-item-content { + font-size: 12px; + } + + .wall-item-photo-container .wall-item-content { + font-size: 12px; + } + "; + } + if($line_height == "1.5"){ + echo " + .wall-item-container .wall-item-content { + line-height: 1.5; + } + + .wall-item-photo-container .wall-item-content { + line-height: 1.5; + } + "; + } + if($line_height == "1.4"){ + echo " + .wall-item-container .wall-item-content { + line-height: 1.4; + } + + .wall-item-photo-container .wall-item-content { + line-height: 1.4; + } + "; + } + if($line_height == "1.3"){ + echo " + .wall-item-container .wall-item-content { + line-height: 1.3; + } + + .wall-item-photo-container .wall-item-content { + line-height: 1.3; + } + "; + } + if($line_height == "1.2"){ + echo " + .wall-item-container .wall-item-content { + line-height: 1.2; + } + + .wall-item-photo-container .wall-item-content { + line-height: 1.2; + } + "; + } + if($line_height == "1.1"){ + echo " + .wall-item-container .wall-item-content { + line-height: 1.1; + } + + .wall-item-photo-container .wall-item-content { + line-height: 1.1; + } + "; + } + } + + if($resolution == "wide") { + if (file_exists("$THEMEPATH/style-wide.css")){ + echo file_get_contents("$THEMEPATH/style-wide.css"); + } + if($diabook_font_size == "15"){ + echo " + .wall-item-container .wall-item-content { + font-size: 15px; + } + + .wall-item-photo-container .wall-item-content { + font-size: 15px; + } + "; + } + if($diabook_font_size == "14"){ + echo " + .wall-item-container .wall-item-content { + font-size: 14px; + } + + .wall-item-photo-container .wall-item-content { + font-size: 14px; + } + "; + } + if($diabook_font_size == "13.5"){ + echo " + .wall-item-container .wall-item-content { + font-size: 13.5px; + } + + .wall-item-photo-container .wall-item-content { + font-size: 13.5px; + } + "; + } + if($diabook_font_size == "13"){ + echo " + .wall-item-container .wall-item-content { + font-size: 13px; + } + + .wall-item-photo-container .wall-item-content { + font-size: 13px; + } + "; + } + if($diabook_font_size == "12.5"){ + echo " + .wall-item-container .wall-item-content { + font-size: 12.5px; + } + + .wall-item-photo-container .wall-item-content { + font-size: 12.5px; + } + "; + } + if($diabook_font_size == "12"){ + echo " + .wall-item-container .wall-item-content { + font-size: 12px; + } + + .wall-item-photo-container .wall-item-content { + font-size: 12px; + } + "; + } + if($line_height == "1.5"){ + echo " + .wall-item-container .wall-item-content { + line-height: 1.5; + } + + .wall-item-photo-container .wall-item-content { + line-height: 1.5; + } + "; + } + if($line_height == "1.4"){ + echo " + .wall-item-container .wall-item-content { + line-height: 1.4; + } + + .wall-item-photo-container .wall-item-content { + line-height: 1.4; + } + "; + } + if($line_height == "1.3"){ + echo " + .wall-item-container .wall-item-content { + line-height: 1.3; + } + + .wall-item-photo-container .wall-item-content { + line-height: 1.3; + } + "; + } + if($line_height == "1.2"){ + echo " + .wall-item-container .wall-item-content { + line-height: 1.2; + } + + .wall-item-photo-container .wall-item-content { + line-height: 1.2; + } + "; + } + if($line_height == "1.1"){ + echo " + .wall-item-container .wall-item-content { + line-height: 1.1; + } + + .wall-item-photo-container .wall-item-content { + line-height: 1.1; + } + "; + } + }
\ No newline at end of file diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php index 924639625..8c5521eec 100755 --- a/view/theme/diabook/theme.php +++ b/view/theme/diabook/theme.php @@ -3,18 +3,20 @@ /* * Name: Diabook * Description: Diabook: report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu - * Version: (Version: 1.015) + * Version: (Version: 1.018) * Author: */ //print diabook-version for debugging -$diabook_version = "Diabook (Version: 1.015)"; +$diabook_version = "Diabook (Version: 1.018)"; $a->page['htmlhead'] .= sprintf('<script "%s" ></script>', $diabook_version); //change css on network and profilepages $cssFile = null; - +$resolution=false; +$resolution = get_pconfig(local_user(), "diabook", "resolution"); +if ($resolution===false) $resolution="normal"; /** * prints last community activity @@ -24,7 +26,7 @@ $cssFile = null; function diabook_community_info(){ $a = get_app(); - //right_aside at networkpages + // last 12 users $aside['$lastusers_title'] = t('Last users'); @@ -267,9 +269,10 @@ if ($a->argv[0] === "network" && local_user()){ if($ccCookie != "8") { // COMMUNITY diabook_community_info(); - + // CUSTOM CSS - $cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook/style-network.css"; + if($resolution == "normal") {$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook/style-network.css";} + if($resolution == "wide") {$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook/style-network-wide.css";} } } @@ -282,67 +285,17 @@ if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname']){ diabook_community_info(); // CUSTOM CSS - $cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook/style-profile.css"; - + if($resolution == "normal") {$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook/style-profile.css";} + if($resolution == "wide") {$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook/style-profile-wide.css";} } } - - -//tabs at aside on settings page -if ($a->argv[0] === "settings"){ - - $tabs = array( - array( - 'label' => t('Account settings'), - 'url' => $a->get_baseurl(true).'/settings', - 'sel' => (($a->argc == 1)?'active':''), - ), - array( - 'label' => t('Display settings'), - 'url' => $a->get_baseurl(true).'/settings/display', - 'sel' => (($a->argc > 1) && ($a->argv[1] === 'display')?'active':''), - ), - array( - 'label' => t('Edit/Manage Profiles'), - 'url' => $a->get_baseurl(true).'/profiles', - ), - array( - 'label' => t('Connector settings'), - 'url' => $a->get_baseurl(true).'/settings/connectors', - 'sel' => (($a->argc > 1) && ($a->argv[1] === 'connectors')?'active':''), - ), - array( - 'label' => t('Plugin settings'), - 'url' => $a->get_baseurl(true).'/settings/addon', - 'sel' => (($a->argc > 1) && ($a->argv[1] === 'addon')?'active':''), - ), - array( - 'label' => t('Connections'), - 'url' => $a->get_baseurl(true) . '/settings/oauth', - 'sel' => (($a->argc > 1) && ($a->argv[1] === 'oauth')?'active':''), - ), - array( - 'label' => t('Export personal data'), - 'url' => $a->get_baseurl(true) . '/uexport', - 'sel' => '' - ) - ); - $tabtpl = file_get_contents(dirname(__file__).'/rs_common_tabs.tpl') ; - $a->page['aside'] = replace_macros($tabtpl, array( - '$tabs' => $tabs, - )); - - - // CUSTOM CSS - $cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook/style-settings.css"; - -} - // custom css if (!is_null($cssFile)) $a->page['htmlhead'] .= sprintf('<link rel="stylesheet" type="text/css" href="%s" />', $cssFile); + + //load jquery.cookie.js $cookieJS = $a->get_baseurl($ssl_state)."/view/theme/diabook/js/jquery.cookie.js"; $a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s"></script>', $cookieJS); @@ -351,6 +304,9 @@ $a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s"></script $imageresizeJS = $a->get_baseurl($ssl_state)."/view/theme/diabook/js/jquery.ae.image.resize.js"; $a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s" ></script>', $imageresizeJS); +//load jquery.autogrow-textarea.js +$autogrowJS = $a->get_baseurl($ssl_state)."/view/theme/diabook/js/jquery.autogrow.textarea.js"; +$a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s" ></script>', $autogrowJS); //js scripts //comment-edit-wrapper on photo_view @@ -376,6 +332,15 @@ $a->page['htmlhead'] .= ' </script>'; +$a->page['htmlhead'] .= ' + +<script type="text/javascript"> + +function tautogrow(id){ + $("textarea#comment-edit-text-" +id).autogrow(); + }; + </script>'; + $a->page['htmlhead'] .= ' <script> @@ -519,4 +484,38 @@ function restore_boxes(){ $.cookie("close_lastlikes","2", { expires: 365, path: "/" }); alert("Right-hand column was restored. Please refresh your browser"); } -</script>';}
\ No newline at end of file +</script>';} + + +$a->page['htmlhead'] .= ' + +<script> +function insertFormatting(comment,BBcode,id) { + + var tmpStr = $("#comment-edit-text-" + id).val(); + if(tmpStr == comment) { + tmpStr = ""; + $("#comment-edit-text-" + id).addClass("comment-edit-text-full"); + $("#comment-edit-text-" + id).removeClass("comment-edit-text-empty"); + openMenu("comment-edit-submit-wrapper-" + id); + } + + textarea = document.getElementById("comment-edit-text-" +id); + if (document.selection) { + textarea.focus(); + selected = document.selection.createRange(); + if (BBcode == "url"){ + selected.text = "["+BBcode+"]" + "http://" + selected.text + "[/"+BBcode+"]"; + } else + selected.text = "["+BBcode+"]" + selected.text + "[/"+BBcode+"]"; + } else if (textarea.selectionStart || textarea.selectionStart == "0") { + var start = textarea.selectionStart; + var end = textarea.selectionEnd; + if (BBcode == "url"){ + textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + "http://" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length); + } else + textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length); + } + return true; +} +</script> ';
\ No newline at end of file diff --git a/view/theme/diabook/theme_settings.tpl b/view/theme/diabook/theme_settings.tpl new file mode 100644 index 000000000..204a115f9 --- /dev/null +++ b/view/theme/diabook/theme_settings.tpl @@ -0,0 +1,10 @@ +{{inc field_select.tpl with $field=$font_size}}{{endinc}} + +{{inc field_select.tpl with $field=$line_height}}{{endinc}} + +{{inc field_select.tpl with $field=$resolution}}{{endinc}} + +<div class="settings-submit-wrapper"> + <input type="submit" value="$submit" class="settings-submit" name="diabook-settings-submit" /> +</div> + diff --git a/view/theme/dispy-dark/bottom.tpl b/view/theme/dispy-dark/bottom.tpl new file mode 100644 index 000000000..1b7dda8f8 --- /dev/null +++ b/view/theme/dispy-dark/bottom.tpl @@ -0,0 +1 @@ +<script type="text/javascript" src="$baseurl/view/theme/dispy/js/jquery.autogrow.textarea.js"></script> diff --git a/view/theme/dispy-dark/communityhome.tpl b/view/theme/dispy-dark/communityhome.tpl index 340b7216c..df8bbad7c 100644 --- a/view/theme/dispy-dark/communityhome.tpl +++ b/view/theme/dispy-dark/communityhome.tpl @@ -37,10 +37,8 @@ </div> {{ endif }} -{{ if $lastusers_title }} -<h3 id="postit-header">PostIt to Friendica</h3> +<h3 id="postit-header">'PostIt' to Friendica</h3> <div id="postit"> -<a href="$fostitJS" title="PostIt">Post to Friendica</a> from anywhere by bookmarking this link. +<a href="$fpostitJS" title="PostIt">Post to Friendica</a> from anywhere by bookmarking this link. </div> -{{ endif }} diff --git a/view/theme/dispy-dark/default.php b/view/theme/dispy-dark/default.php index e74ec1a4f..729f9be2a 100644 --- a/view/theme/dispy-dark/default.php +++ b/view/theme/dispy-dark/default.php @@ -1,20 +1,37 @@ <!DOCTYPE html> <html> <head> - <title><?php if(x($page,'title')) echo $page['title'] ?></title> + <title><?php if(x($page,'title')) echo $page['title']; ?></title> <script>var baseurl="<?php echo $a->get_baseurl() ?>";</script> - <?php if(x($page,'htmlhead')) echo $page['htmlhead'] ?> + <?php if(x($page,'htmlhead')) echo $page['htmlhead']; ?> </head> <body> - <?php if(x($page,'nav')) echo $page['nav']; ?> - <aside> - <?php if(x($page,'aside')) echo $page['aside']; ?> - <?php if(x($page,'aside_bottom')) echo $page['aside_bottom']; ?> - </aside> - <section><?php if(x($page,'content')) echo $page['content']; ?> - <div id="page-footer"></div> - </section> - <footer><?php if(x($page,'footer')) echo $page['footer']; ?></footer> + <header> + <?php if(x($page, 'header')) echo $page['header']; ?> + </header> + <article id="articlemain"> + <?php if(x($page,'nav')) echo $page['nav']; ?> + <aside id="asideleft"> + <?php if(x($page,'aside_left')) echo $page['aside_left']; ?> + <?php if(x($page,'aside_left_bottom')) echo $page['aside_left_bottom']; ?> + </aside> + <section id="sectionmain"> + <?php if(x($page,'content')) echo $page['content']; ?> + <footer id="section-footer"></footer> + </section> + <aside id="asidemain"> + <?php if(x($page,'aside')) echo $page['aside']; ?> + <?php if(x($page,'aside_bottom')) echo $page['aside_bottom']; ?> + </aside> + <aside id="asideright"> + <?php if(x($page,'aside_right')) echo $page['aside_right']; ?> + <?php if(x($page,'aside_right_bottom')) echo $page['aside_right_bottom']; ?> + </aside> + </article> + <footer id="footer"> + <?php if(x($page, 'footer')) echo $page['footer']; ?> + </footer> + <?php if (x($page, 'bottom')) echo $page['bottom']; ?> </body> </html> diff --git a/view/theme/dispy-dark/head.tpl b/view/theme/dispy-dark/head.tpl index cd6f5ca97..d42b19aef 100644 --- a/view/theme/dispy-dark/head.tpl +++ b/view/theme/dispy-dark/head.tpl @@ -1,33 +1,29 @@ <meta http-equiv="Content-Type" content="text/html;charset=utf-8" /> +<meta charset="UTF-8" /> <base href="$baseurl/" /> <meta name="generator" content="$generator" /> +<link rel="shortcut icon" href="$baseurl/images/friendica-32.png" /> +<link rel="search" href="$baseurl/opensearch" + type="application/opensearchdescription+xml" title="Search in Friendica" /> <link rel="stylesheet" href="$baseurl/library/fancybox/jquery.fancybox-1.3.4.css" type="text/css" media="screen" /> <link rel="stylesheet" href="$baseurl/library/tiptip/tipTip.css" type="text/css" media="screen" /> <link rel="stylesheet" href="$baseurl/library/jgrowl/jquery.jgrowl.css" type="text/css" media="screen" /> - <link rel="stylesheet" type="text/css" href="$stylesheet" media="all" /> - -<link rel="shortcut icon" href="$baseurl/images/friendica-32.png" /> -<link rel="search" - href="$baseurl/opensearch" - type="application/opensearchdescription+xml" - title="Search in Friendica" /> - <!--[if IE]> <script type="text/javascript" src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script> <![endif]--> -<script type="text/javascript" src="$baseurl/js/jquery.js" ></script> -<script type="text/javascript" src="$baseurl/js/jquery.textinputs.js" ></script> -<script type="text/javascript" src="$baseurl/js/fk.autocomplete.js" ></script> +<script type="text/javascript" src="$baseurl/js/jquery.js"></script> +<script type="text/javascript" src="$baseurl/js/acl.js"></script> +<script type="text/javascript" src="$baseurl/js/main.js"></script> +<script type="text/javascript" src="$baseurl/js/jquery.textinputs.js"></script> +<script type="text/javascript" src="$baseurl/js/fk.autocomplete.js"></script> <script type="text/javascript" src="$baseurl/library/fancybox/jquery.fancybox-1.3.4.pack.js"></script> <script type="text/javascript" src="$baseurl/library/tiptip/jquery.tipTip.minified.js"></script> <script type="text/javascript" src="$baseurl/library/jgrowl/jquery.jgrowl_minimized.js"></script> -<script type="text/javascript" src="$baseurl/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js" ></script> -<script type="text/javascript" src="$baseurl/js/acl.js" ></script> -<script type="text/javascript" src="$baseurl/js/webtoolkit.base64.js" ></script> -<script type="text/javascript" src="$baseurl/js/main.js" ></script> +<script type="text/javascript" src="$baseurl/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js"></script> +<script type="text/javascript" src="$baseurl/js/webtoolkit.base64.js"></script> +<!-- in dispy-dark --> <script> - var updateInterval = $update_interval; function confirmDelete() { return confirm("$delitem"); } @@ -48,7 +44,6 @@ } } - function commentInsert(obj,id) { var tmpStr = $("#comment-edit-text-" + id).val(); if(tmpStr == '$comment') { @@ -91,8 +86,4 @@ $('#hide-comments-' + id).html('$showfewer'); } } - - </script> - - diff --git a/view/theme/dispy-dark/header.tpl b/view/theme/dispy-dark/header.tpl new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/view/theme/dispy-dark/header.tpl diff --git a/view/theme/dispy-dark/jot-header.tpl b/view/theme/dispy-dark/jot-header.tpl index 5838729cc..c55ac503a 100644 --- a/view/theme/dispy-dark/jot-header.tpl +++ b/view/theme/dispy-dark/jot-header.tpl @@ -346,4 +346,3 @@ function enableOnUser(){ } </script> - diff --git a/view/theme/dispy-dark/lang_selector.tpl b/view/theme/dispy-dark/lang_selector.tpl new file mode 100644 index 000000000..e777a0a86 --- /dev/null +++ b/view/theme/dispy-dark/lang_selector.tpl @@ -0,0 +1,10 @@ +<div id="lang-select-icon" class="icon s22 language" title="$title" onclick="openClose('language-selector');" ></div> +<div id="language-selector" style="display: none;" > + <form action="#" method="post" > + <select name="system_language" onchange="this.form.submit();" > + {{ for $langs.0 as $v=>$l }} + <option value="$v" {{if $v==$langs.1}}selected="selected"{{endif}}>$l</option> + {{ endfor }} + </select> + </form> +</div> diff --git a/view/theme/dispy-dark/nav.tpl b/view/theme/dispy-dark/nav.tpl index 34aba50de..b58ae7e3a 100644 --- a/view/theme/dispy-dark/nav.tpl +++ b/view/theme/dispy-dark/nav.tpl @@ -4,7 +4,7 @@ <!-- yes, they're going the other way. seems that's how the template renderer works --> - +<a name="top" id="top"></a> <div id="nav-floater"> <div id="nav-buttons"> {{ if $nav.help }} @@ -116,6 +116,12 @@ works --> $langselector </div> +<div id="scrollup"> +<a href="#top"><img + src="view/theme/dispy/icons/scroll_top.png" + alt="back to top" title="Back to top" /></a> +</div> + <div class="search-box"> <form method="get" action="$nav.search.0"> <input id="search-text" class="nav-menu-search" type="search" placeholder="Search" value="" id="search" name="search" /> diff --git a/view/theme/dispy-dark/style.css b/view/theme/dispy-dark/style.css index a3248c13c..20f5c5898 100644 --- a/view/theme/dispy-dark/style.css +++ b/view/theme/dispy-dark/style.css @@ -1,7 +1,7 @@ /* * dispy-dark * - * modernised, sort of, by simon <http://simon.kisikew.org/> + * author, maintainer: simon <http://simon.kisikew.org/> * */ @@ -210,12 +210,17 @@ input[type=submit] { margin: 5px 0; list-style: none; } +#articlemain { + width: 100%; + height: 100%; + margin: 0 auto; +} /** * login */ -aside .field { +#asidemain .field { overflow: hidden; width: 200px; } @@ -247,7 +252,7 @@ aside .field { #login-submit-button { margin-left: 0px !important; } -aside #login_openid { +#asidemain #login_openid { position: relative !important; float: none !important; margin-left: 0px !important; @@ -268,13 +273,10 @@ aside #login_openid { */ nav { height: 60px; - display: block; background-color: #1d1f1d; color: #eeeeec; position: relative; padding: 20px 20px 10px 95px; - margin-left: auto; - margin-right: auto; } nav a { text-decoration: none; @@ -309,6 +311,7 @@ ul#user-menu-popup { -webkit-border-radius: 0 0 5px 5px; -moz-border-radius: 0 0 5px 5px; border-radius: 0 0 5px 5px; + box-shadow: 5px 10px 10px 0 #111; z-index: 10000; } ul#user-menu-popup li { @@ -541,7 +544,18 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link width: 10em; color: #eec; } +#scrollup { + position: fixed; + right: 5px; + bottom: 40px; + z-index: 100; +} +#scrollup a:hover { + text-decoration: none; + border: 0; +} #user-menu { + box-shadow: 5px 0 10px 0 #111; display: block; width: 75%; margin: 3px 0 0 0; @@ -707,12 +721,16 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link /** * aside **/ -aside { - position: absolute; - right: 15px; - width: 245px; - padding-top: 15px; +#asidemain { + float: left; font-size: smaller; + margin: 20px 0 20px 35px; + width: 25%; + display: inline; +} +/* for now, disappear these */ +#asideright, #asideleft { + display: none; } .vcard .fn { font-size: 1.7em; @@ -742,10 +760,10 @@ aside { .vcard #profile-photo-wrapper img { box-shadow: 3px 3px 10px 0 #000; } -aside h4 { +#asidemain h4 { font-size: 1.2em; } -aside #viewcontacts { +#asidemain #viewcontacts { text-align: right; } .aprofile dt { @@ -874,12 +892,24 @@ aside #viewcontacts { line-height: 20px; padding: 2px 20px 5px 0; } +#profile-jot-text_parent { + /*border-radius: 10px;*/ + box-shadow: 5px 0 10px 0 #111; +} #profile-jot-text_tbl { margin-bottom: 10px; + /*border-radius: 10px;*/ + background: #888; } #profile-jot-text_ifr { width:99.900002% !important; } +#profile-jot-text_toolbargroup { + background: #888; +} +.mceCenter table tr { + background: #888; +} [id$="jot-text_ifr"] { width: 99.900002% !important; color: #2e2f2e; @@ -889,6 +919,15 @@ aside #viewcontacts { color: #2e2f2e; background: #eec; } +.mceFirst tr { + background: #888; +} +.mceFirst td { + /*border-radius: 10px 10px 0px 0px;*/ +} +.mceLast td { + /*border-radius: 0 0 10px 10px;*/ +} #profile-attach-wrapper, #profile-audio-wrapper, #profile-link-wrapper, @@ -1064,12 +1103,13 @@ aside #viewcontacts { /** * section */ -section { - margin: 20px 9% 0 4%; +#sectionmain { + margin: 20px; font-size: 0.8em; - padding-right: 230px; min-width: 475px; - width: 65%; + width: 67%; + float: left; + display: inline; } /** tabs **/ @@ -1114,6 +1154,7 @@ section { .wall-item-outside-wrapper { border: 1px solid #aaa; border-radius: 5px; + box-shadow: 5px 0 10px 0 #111; } .wall-item-outside-wrapper.comment { margin-top: 5px; @@ -1333,19 +1374,19 @@ section { width: 100%; } #connect-services-header { - + margin: 5px 0 0 0; } #connect-services { margin: 5px 0 0 0; } #extra-help-header { - + margin: 5px 0 0 0; } #extra-help { margin: 5px 0 0 0; } #postit-header { - + margin: 5px 0 0 0; } #postit { margin: 5px 0 0 0; @@ -1938,8 +1979,8 @@ div[id$="wrapper"] br { margin: 0 0 -18px; position: absolute; text-decoration: none; - top: 18px; - right: 226px; + top: 113px; + right: 260px; } #profile-edit-links ul { margin: 20px 0; @@ -2353,6 +2394,12 @@ div[id$="wrapper"] br { .admin.link { list-style-position: inside; } +#adminpage { + color: #eec; + background: #2e2f2e; + margin: 5px; + padding: 10px; +} #adminpage dl { clear:left; margin-bottom: 2px; @@ -2374,7 +2421,6 @@ div[id$="wrapper"] br { #adminpage .submit { clear:left; } - #adminpage #pluginslist { margin: 0; padding: 0; @@ -2391,7 +2437,6 @@ div[id$="wrapper"] br { float:left; margin-right: 1em; } - #adminpage table { width: 100%; border-bottom: 1px solid #000; @@ -2414,9 +2459,13 @@ div[id$="wrapper"] br { text-align: right; } #adminpage #users a { - color: #2e2f2e; + color: #eec; text-decoration: underline; } +#users .name { + color: #eec; +} + /** * Form fields @@ -2603,8 +2652,8 @@ div[id$="wrapper"] br { } .icon.drop, .icon.drophide, .icon.delete { - float: right; - margin: 5px; + float: left; + margin: 0 2px; } .icon.s22.delete { display: block; @@ -2735,8 +2784,8 @@ div[id$="wrapper"] br { } #pause { position: fixed; - bottom: 5px; - right: 5px; + bottom: 40px; + right: 30px; } .border, .border:hover { border: 1px solid #babdb6; @@ -2776,7 +2825,7 @@ div[id$="wrapper"] br { } footer { display: block; - margin: 50px 20%; + /*margin: 50px 20%;*/ clear: both; } #profile-jot-text { @@ -2805,6 +2854,7 @@ footer { background: #fff url("../../../images/search_18.png") no-repeat right center; padding-right: 20px; margin: 6px; + color: #111; } #acl-showall { float: left; diff --git a/view/theme/dispy-dark/theme.php b/view/theme/dispy-dark/theme.php index e1dc8ba0c..6275980bc 100644 --- a/view/theme/dispy-dark/theme.php +++ b/view/theme/dispy-dark/theme.php @@ -3,150 +3,169 @@ /* * Name: Dispy Dark * Description: Dispy Dark, Friendica theme - * Version: 1.0 + * Version: 1.1 * Author: Simon <http://simon.kisikew.org/> * Maintainer: Simon <http://simon.kisikew.org/> * Screenshot: <a href="screenshot.jpg">Screenshot</a> */ +$a = get_app(); $a->theme_info = array( - 'extends' => 'dispy-dark', + 'name' => 'dispy-dark', + 'version' => '1.1' ); -$a->page['htmlhead'] .= <<< EOT -<script> -$(document).ready(function() { - $('.group-edit-icon').hover( - function() { - $(this).addClass('icon'); - $(this).removeClass('iconspacer'); }, - - function() { - $(this).removeClass('icon'); - $(this).addClass('iconspacer'); } - ); - - $('.sidebar-group-element').hover( - function() { - id = $(this).attr('id'); - $('#edit-' + id).addClass('icon'); - $('#edit-' + id).removeClass('iconspacer'); }, - - function() { - id = $(this).attr('id'); - $('#edit-' + id).removeClass('icon'); - $('#edit-' + id).addClass('iconspacer'); } - ); - - $('.savedsearchdrop').hover( - function() { - $(this).addClass('drop'); - $(this).addClass('icon'); - $(this).removeClass('iconspacer'); }, - - function() { - $(this).removeClass('drop'); - $(this).removeClass('icon'); - $(this).addClass('iconspacer'); } - ); - - $('.savedsearchterm').hover( - function() { - id = $(this).attr('id'); - $('#drop-' + id).addClass('icon'); - $('#drop-' + id).addClass('drophide'); - $('#drop-' + id).removeClass('iconspacer'); }, - - function() { - id = $(this).attr('id'); - $('#drop-' + id).removeClass('icon'); - $('#drop-' + id).removeClass('drophide'); - $('#drop-' + id).addClass('iconspacer'); } - ); - - // click outside notifications menu closes it - $('html').click(function() { - $('#nav-notifications-linkmenu').removeClass('selected'); - document.getElementById("nav-notifications-menu").style.display = "none"; - }); - - $('#nav-notifications-linkmenu').click(function(event) { - event.stopPropagation(); - }); - // click outside profiles menu closes it - $('html').click(function() { - $('#profiles-menu-trigger').removeClass('selected'); - document.getElementById("profiles-menu").style.display = "none"; - }); +function dispy_dark_init(&$a) { + + // aside on profile page + if (($a->argv[0] . $a->argv[1]) === ("profile" . $a->user['nickname'])) { + dispy_dark_community_info(); + } + + $a->page['htmlhead'] .= <<<EOT + <script type="text/javascript"> + $(document).ready(function() { + $('.group-edit-icon').hover( + function() { + $(this).addClass('icon'); + $(this).removeClass('iconspacer'); }, + + function() { + $(this).removeClass('icon'); + $(this).addClass('iconspacer'); } + ); + + $('.sidebar-group-element').hover( + function() { + id = $(this).attr('id'); + $('#edit-' + id).addClass('icon'); + $('#edit-' + id).removeClass('iconspacer'); }, + + function() { + id = $(this).attr('id'); + $('#edit-' + id).removeClass('icon'); + $('#edit-' + id).addClass('iconspacer'); } + ); + + $('.savedsearchdrop').hover( + function() { + $(this).addClass('drop'); + $(this).addClass('icon'); + $(this).removeClass('iconspacer'); }, + + function() { + $(this).removeClass('drop'); + $(this).removeClass('icon'); + $(this).addClass('iconspacer'); } + ); + + $('.savedsearchterm').hover( + function() { + id = $(this).attr('id'); + $('#drop-' + id).addClass('icon'); + $('#drop-' + id).addClass('drophide'); + $('#drop-' + id).removeClass('iconspacer'); }, + + function() { + id = $(this).attr('id'); + $('#drop-' + id).removeClass('icon'); + $('#drop-' + id).removeClass('drophide'); + $('#drop-' + id).addClass('iconspacer'); } + ); + + // click outside notifications menu closes it + $('html').click(function() { + $('#nav-notifications-linkmenu').removeClass('selected'); + $('#nav-notifications-menu').css({display: 'none'}); + }); + + $('#nav-notifications-linkmenu').click(function(event) { + event.stopPropagation(); + }); + // click outside profiles menu closes it + $('html').click(function() { + $('#profiles-menu-trigger').removeClass('selected'); + $('#profiles-menu').css({display: 'none'}); + }); + + $('#profiles-menu').click(function(event) { + event.stopPropagation(); + }); + + // main function in toolbar functioning + function toggleToolbar() { + if ( $('#nav-floater').is(':visible') ) { + $('#nav-floater').slideUp('fast'); + $('.floaterflip').css({ + backgroundPosition: '-210px -60px' + }); + $('.search-box').slideUp('fast'); + } else { + $('#nav-floater').slideDown('fast'); + $('.floaterflip').css({ + backgroundPosition: '-190px -60px' + }); + $('.search-box').slideDown('fast'); + } + }; + // our trigger for the toolbar button + $('.floaterflip').click(function() { + toggleToolbar(); + return false; + }); + + // (attempt to) change the text colour in a top post + $('#profile-jot-text').focusin(function() { + $(this).css({color: '#eec'}); + }); + + $('a[href=#top]').click(function() { + $('html, body').animate({scrollTop:0}, 'slow'); + return false; + }); - $('#profiles-menu').click(function(event) { - event.stopPropagation(); }); - - // main function in toolbar functioning - function toggleToolbar() { - if ( $('#nav-floater').is(':visible') ) { - $('#nav-floater').slideUp('fast'); - $('.floaterflip').css({ - backgroundPosition: '-210px -60px' - }); - $('.search-box').slideUp('fast'); - } else { - $('#nav-floater').slideDown('fast'); - $('.floaterflip').css({ - backgroundPosition: '-190px -60px' - }); - $('.search-box').slideDown('fast'); - } - }; - // our trigger for the toolbar button - $('.floaterflip').click(function() { - toggleToolbar(); - return false; - }); - - // (attempt) to change the text colour in a top post - $('#profile-jot-text').focusin(function() { - $(this).css({color: '#eec'}); + // shadowing effect for floating toolbars + $(document).scroll(function(e) { + var pageTop = $('html').scrollTop(); + if (pageTop) { + $('#nav-floater').css({boxShadow: '3px 3px 10px rgba(0, 0, 0, 0.7)'}); + $('.search-box').css({boxShadow: '3px 3px 10px rgba(0, 0, 0, 0.7)'}); + } else { + $('#nav-floater').css({boxShadow: '0 0 0 0'}); + $('.search-box').css({boxShadow: '0 0 0 0'}); + } }); - -}); -</script> + </script> EOT; -function dispydark_community_info() { - $a = get_app(); - - $aside['$lastusers_title'] = t('Last users'); - $aside['$lastusers_items'] = array(); - $publish = (get_config('system','publish_all') ? '' : " AND `publish` = 1 " ); - - $fostitJS = "javascript: (function() { - the_url = '".$a->get_baseurl($ssl_state)."/view/theme/dispy-dark/fpostit/fpostit.php?url=' + - encodeURIComponent(window.location.href) + '&title=' + encodeURIComponent(document.title) + '&text=' + - encodeURIComponent(''+(window.getSelection ? window.getSelection() : document.getSelection ? - document.getSelection() : document.selection.createRange().text)); - a_funct = function() { - if (!window.open(the_url, 'fpostit', 'location=yes,links=no,scrollbars=no,toolbar=no,width=600,height=300')) { - location.href = the_url; - } - if (/Firefox/.test(navigator.userAgent)) { - setTimeout(a_funct, 0) - } else { - a_funct(); - } - })();"; + js_in_foot(); +} - $aside['$fostitJS'] = $fostitJS; +function dispy_dark_community_info() { + $a = get_app(); $url = $a->get_baseurl($ssl_state); $aside['$url'] = $url; - $tpl = file_get_contents(dirname(__file__).'/communityhome.tpl'); - $a->page['aside_bottom'] = replace_macros($tpl, $aside); + $fpostitJS = "javascript:(function() {" + . "the_url = '" . $url . "/view/theme/".$a->theme_info['name']."/fpostit/fpostit.php?url=' + encodeURIComponent(window.location.href) + '&title=' + encodeURIComponent(document.title) + '&text=' + encodeURIComponent(''+(window.getSelection ? window.getSelection() : document.getSelection ? document.getSelection() : document.selection.createRange().text)); + a_funct = function() { + if (!window.open(the_url, 'fpostit', 'location=yes,links=no,scrollbars=no,toolbar=no,width=600,height=300')) location.href = the_url;}; + if (/Firefox/.test(navigator.userAgent)) {setTimeout(a_funct, 0);} + else {a_funct();}})()"; + + $aside['$fpostitJS'] = $fpostitJS; + $tpl = file_get_contents(dirname(__file__) . '/communityhome.tpl'); + return $a->page['aside_bottom'] = replace_macros($tpl, $aside); } -// aside on profile page -//if (($a->argv[0] . $a->argv[1]) === ("profile" . $a->user['nickname'])) { - dispydark_community_info(); -//} +function js_in_foot() { + /** @purpose insert stuff in bottom of page + */ + $a = get_app(); + $baseurl = $a->get_baseurl($ssl_state); + $bottom['$baseurl'] = $baseurl; + $tpl = file_get_contents(dirname(__file__) . '/bottom.tpl'); + return $a->page['bottom'] = replace_macros($tpl, $bottom); +} diff --git a/view/theme/dispy/bottom.tpl b/view/theme/dispy/bottom.tpl new file mode 100644 index 000000000..1b7dda8f8 --- /dev/null +++ b/view/theme/dispy/bottom.tpl @@ -0,0 +1 @@ +<script type="text/javascript" src="$baseurl/view/theme/dispy/js/jquery.autogrow.textarea.js"></script> diff --git a/view/theme/dispy/communityhome.tpl b/view/theme/dispy/communityhome.tpl index 340b7216c..df8bbad7c 100644 --- a/view/theme/dispy/communityhome.tpl +++ b/view/theme/dispy/communityhome.tpl @@ -37,10 +37,8 @@ </div> {{ endif }} -{{ if $lastusers_title }} -<h3 id="postit-header">PostIt to Friendica</h3> +<h3 id="postit-header">'PostIt' to Friendica</h3> <div id="postit"> -<a href="$fostitJS" title="PostIt">Post to Friendica</a> from anywhere by bookmarking this link. +<a href="$fpostitJS" title="PostIt">Post to Friendica</a> from anywhere by bookmarking this link. </div> -{{ endif }} diff --git a/view/theme/dispy/default.php b/view/theme/dispy/default.php index e74ec1a4f..729f9be2a 100644 --- a/view/theme/dispy/default.php +++ b/view/theme/dispy/default.php @@ -1,20 +1,37 @@ <!DOCTYPE html> <html> <head> - <title><?php if(x($page,'title')) echo $page['title'] ?></title> + <title><?php if(x($page,'title')) echo $page['title']; ?></title> <script>var baseurl="<?php echo $a->get_baseurl() ?>";</script> - <?php if(x($page,'htmlhead')) echo $page['htmlhead'] ?> + <?php if(x($page,'htmlhead')) echo $page['htmlhead']; ?> </head> <body> - <?php if(x($page,'nav')) echo $page['nav']; ?> - <aside> - <?php if(x($page,'aside')) echo $page['aside']; ?> - <?php if(x($page,'aside_bottom')) echo $page['aside_bottom']; ?> - </aside> - <section><?php if(x($page,'content')) echo $page['content']; ?> - <div id="page-footer"></div> - </section> - <footer><?php if(x($page,'footer')) echo $page['footer']; ?></footer> + <header> + <?php if(x($page, 'header')) echo $page['header']; ?> + </header> + <article id="articlemain"> + <?php if(x($page,'nav')) echo $page['nav']; ?> + <aside id="asideleft"> + <?php if(x($page,'aside_left')) echo $page['aside_left']; ?> + <?php if(x($page,'aside_left_bottom')) echo $page['aside_left_bottom']; ?> + </aside> + <section id="sectionmain"> + <?php if(x($page,'content')) echo $page['content']; ?> + <footer id="section-footer"></footer> + </section> + <aside id="asidemain"> + <?php if(x($page,'aside')) echo $page['aside']; ?> + <?php if(x($page,'aside_bottom')) echo $page['aside_bottom']; ?> + </aside> + <aside id="asideright"> + <?php if(x($page,'aside_right')) echo $page['aside_right']; ?> + <?php if(x($page,'aside_right_bottom')) echo $page['aside_right_bottom']; ?> + </aside> + </article> + <footer id="footer"> + <?php if(x($page, 'footer')) echo $page['footer']; ?> + </footer> + <?php if (x($page, 'bottom')) echo $page['bottom']; ?> </body> </html> diff --git a/view/theme/dispy/head.tpl b/view/theme/dispy/head.tpl index cd6f5ca97..d42b19aef 100644 --- a/view/theme/dispy/head.tpl +++ b/view/theme/dispy/head.tpl @@ -1,33 +1,29 @@ <meta http-equiv="Content-Type" content="text/html;charset=utf-8" /> +<meta charset="UTF-8" /> <base href="$baseurl/" /> <meta name="generator" content="$generator" /> +<link rel="shortcut icon" href="$baseurl/images/friendica-32.png" /> +<link rel="search" href="$baseurl/opensearch" + type="application/opensearchdescription+xml" title="Search in Friendica" /> <link rel="stylesheet" href="$baseurl/library/fancybox/jquery.fancybox-1.3.4.css" type="text/css" media="screen" /> <link rel="stylesheet" href="$baseurl/library/tiptip/tipTip.css" type="text/css" media="screen" /> <link rel="stylesheet" href="$baseurl/library/jgrowl/jquery.jgrowl.css" type="text/css" media="screen" /> - <link rel="stylesheet" type="text/css" href="$stylesheet" media="all" /> - -<link rel="shortcut icon" href="$baseurl/images/friendica-32.png" /> -<link rel="search" - href="$baseurl/opensearch" - type="application/opensearchdescription+xml" - title="Search in Friendica" /> - <!--[if IE]> <script type="text/javascript" src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script> <![endif]--> -<script type="text/javascript" src="$baseurl/js/jquery.js" ></script> -<script type="text/javascript" src="$baseurl/js/jquery.textinputs.js" ></script> -<script type="text/javascript" src="$baseurl/js/fk.autocomplete.js" ></script> +<script type="text/javascript" src="$baseurl/js/jquery.js"></script> +<script type="text/javascript" src="$baseurl/js/acl.js"></script> +<script type="text/javascript" src="$baseurl/js/main.js"></script> +<script type="text/javascript" src="$baseurl/js/jquery.textinputs.js"></script> +<script type="text/javascript" src="$baseurl/js/fk.autocomplete.js"></script> <script type="text/javascript" src="$baseurl/library/fancybox/jquery.fancybox-1.3.4.pack.js"></script> <script type="text/javascript" src="$baseurl/library/tiptip/jquery.tipTip.minified.js"></script> <script type="text/javascript" src="$baseurl/library/jgrowl/jquery.jgrowl_minimized.js"></script> -<script type="text/javascript" src="$baseurl/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js" ></script> -<script type="text/javascript" src="$baseurl/js/acl.js" ></script> -<script type="text/javascript" src="$baseurl/js/webtoolkit.base64.js" ></script> -<script type="text/javascript" src="$baseurl/js/main.js" ></script> +<script type="text/javascript" src="$baseurl/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js"></script> +<script type="text/javascript" src="$baseurl/js/webtoolkit.base64.js"></script> +<!-- in dispy-dark --> <script> - var updateInterval = $update_interval; function confirmDelete() { return confirm("$delitem"); } @@ -48,7 +44,6 @@ } } - function commentInsert(obj,id) { var tmpStr = $("#comment-edit-text-" + id).val(); if(tmpStr == '$comment') { @@ -91,8 +86,4 @@ $('#hide-comments-' + id).html('$showfewer'); } } - - </script> - - diff --git a/view/theme/dispy/header.tpl b/view/theme/dispy/header.tpl new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/view/theme/dispy/header.tpl diff --git a/view/theme/dispy/icons/scroll_top.png b/view/theme/dispy/icons/scroll_top.png Binary files differnew file mode 100644 index 000000000..fa6736086 --- /dev/null +++ b/view/theme/dispy/icons/scroll_top.png diff --git a/view/theme/dispy/js/jquery.autogrow.textarea.js b/view/theme/dispy/js/jquery.autogrow.textarea.js new file mode 100644 index 000000000..806e34f51 --- /dev/null +++ b/view/theme/dispy/js/jquery.autogrow.textarea.js @@ -0,0 +1,46 @@ +(function($) { + + /* + * Auto-growing textareas; technique ripped from Facebook + */ + $.fn.autogrow = function(options) { + + this.filter('textarea').each(function() { + + var $this = $(this), + minHeight = $this.height(), + lineHeight = $this.css('lineHeight'); + + var shadow = $('<div></div>').css({ + position: 'absolute', + top: -10000, + left: -10000, + width: $(this).width(), + fontSize: $this.css('fontSize'), + fontFamily: $this.css('fontFamily'), + lineHeight: $this.css('lineHeight'), + resize: 'none' + }).appendTo(document.body); + + var update = function() { + + var val = this.value.replace(/</g, '<') + .replace(/>/g, '>') + .replace(/&/g, '&') + .replace(/\n/g, '<br/>'); + + shadow.html(val); + $(this).css('height', Math.max(shadow.height() + 20, minHeight)); + } + + $(this).change(update).keyup(update).keydown(update); + + update.apply(this); + + }); + + return this; + + } + +})(jQuery);
\ No newline at end of file diff --git a/view/theme/dispy/lang_selector.tpl b/view/theme/dispy/lang_selector.tpl new file mode 100644 index 000000000..e777a0a86 --- /dev/null +++ b/view/theme/dispy/lang_selector.tpl @@ -0,0 +1,10 @@ +<div id="lang-select-icon" class="icon s22 language" title="$title" onclick="openClose('language-selector');" ></div> +<div id="language-selector" style="display: none;" > + <form action="#" method="post" > + <select name="system_language" onchange="this.form.submit();" > + {{ for $langs.0 as $v=>$l }} + <option value="$v" {{if $v==$langs.1}}selected="selected"{{endif}}>$l</option> + {{ endfor }} + </select> + </form> +</div> diff --git a/view/theme/dispy/nav.tpl b/view/theme/dispy/nav.tpl index e38b2bbe2..b58ae7e3a 100644 --- a/view/theme/dispy/nav.tpl +++ b/view/theme/dispy/nav.tpl @@ -4,7 +4,7 @@ <!-- yes, they're going the other way. seems that's how the template renderer works --> - +<a name="top" id="top"></a> <div id="nav-floater"> <div id="nav-buttons"> {{ if $nav.help }} @@ -56,7 +56,6 @@ works --> <a id="nav-register-link" class="nav-commlink $nav.register.2" href="$nav.register.0" title="$nav.register.1"></a> </li> {{ endif }} - {{ if $nav.contacts }} <li><a id="nav-contacts-link" class="nav-commlink $nav.contacts.2" href="$nav.contacts.0" title="$nav.contacts.1">$nav.contacts.1</a></li> {{ endif }} @@ -75,11 +74,9 @@ works --> {{ if $nav.admin }} <li><a id="nav-admin-link" class="nav-commlink $nav.admin.2" href="$nav.admin.0" title="$nav.admin.1">$nav.admin.1</a></li> {{ endif }} - {{ if $nav.login }} <li><a id="nav-login-link" class="nav-commlink $nav.login.2" href="$nav.login.0" title="$nav.login.1">$nav.login.1</a></li> {{ endif }} - {{ if $nav.logout }} <li><a id="nav-logout-link" class="nav-commlink $nav.logout.2" href="$nav.logout.0" title="$nav.logout.3" >$nav.logout.1</a></li> {{ endif }} @@ -119,6 +116,12 @@ works --> $langselector </div> +<div id="scrollup"> +<a href="#top"><img + src="view/theme/dispy/icons/scroll_top.png" + alt="back to top" title="Back to top" /></a> +</div> + <div class="search-box"> <form method="get" action="$nav.search.0"> <input id="search-text" class="nav-menu-search" type="search" placeholder="Search" value="" id="search" name="search" /> diff --git a/view/theme/dispy/style.css b/view/theme/dispy/style.css index 622cf5734..9d10d2409 100644 --- a/view/theme/dispy/style.css +++ b/view/theme/dispy/style.css @@ -1,7 +1,8 @@ /* * dispy * - * modernised, sort of, by simon <http://simon.kisikew.org/> + * maintainer: simon <http://simon.kisikew.org/> + * author: unknown * */ @@ -210,12 +211,17 @@ input[type=submit] { margin: 5px 0; list-style: none; } +#articlemain { + width: 100%; + height: 100%; + margin: 0 auto; +} /** * login */ -aside .field { +#asidemain .field { overflow: hidden; width: 200px; } @@ -247,7 +253,7 @@ aside .field { #login-submit-button { margin-left: 0px !important; } -aside #login_openid { +#asidemain #login_openid { position: relative !important; float: none !important; margin-left: 0px !important; @@ -268,13 +274,10 @@ aside #login_openid { */ nav { height: 60px; - display: block; background-color: #2e3436; color: #eeeeec; position: relative; padding: 20px 20px 10px 95px; - margin-left: auto; - margin-right: auto; } nav a { text-decoration: none; @@ -309,6 +312,7 @@ ul#user-menu-popup { -webkit-border-radius: 0 0 5px 5px; -moz-border-radius: 0 0 5px 5px; border-radius: 0 0 5px 5px; + box-shadow: 5px 10px 10px 0 #111; z-index: 10000; } ul#user-menu-popup li { @@ -541,7 +545,18 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link width: 10em; color: #eec; } +#scrollup { + position: fixed; + right: 5px; + bottom: 40px; + z-index: 100; +} +#scrollup a:hover { + text-decoration: none; + border: 0; +} #user-menu { + box-shadow: 5px 0 10px 0 #111; display: block; width: 75%; margin: 3px 0 0 0; @@ -707,12 +722,16 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link /** * aside **/ -aside { - position: absolute; - right: 15px; - width: 245px; - padding-top: 15px; +#asidemain { + float: left; font-size: smaller; + margin: 20px 0 20px 35px; + width: 25%; + display: inline; +} +/* for now, disappear these */ +#asideright, #asideleft { + display: none; } .vcard .fn { font-size: 1.7em; @@ -742,15 +761,15 @@ aside { .vcard #profile-photo-wrapper img { box-shadow: 3px 3px 10px 0 #000; } -aside h4 { +#asidemain h4 { font-size: 1.2em; } -aside #viewcontacts { +#asidemain #viewcontacts { text-align: right; } .aprofile dt { - color: #666666; background: transparent; + color: #666666; font-weight: bold; box-shadow: 1px 1px 5px 0 #000; margin: 15px 0 5px; @@ -874,12 +893,24 @@ aside #viewcontacts { line-height: 20px; padding: 2px 20px 5px 0; } +#profile-jot-text_parent { + /*border-radius: 10px;*/ + box-shadow: 5px 0 10px 0 #111; +} #profile-jot-text_tbl { margin-bottom: 10px; + /*border-radius: 10px;*/ + background: #888; } #profile-jot-text_ifr { width:99.900002% !important; } +#profile-jot-text_toolbargroup { + background: #888; +} +.mceCenter table tr { + background: #888; +} [id$="jot-text_ifr"] { width: 99.900002% !important; color: #2e2f2e; @@ -889,6 +920,15 @@ aside #viewcontacts { color: #2e2f2e; background: #eec; } +.mceFirst tr { + background: #888; +} +.mceFirst td { + /*border-radius: 10px 10px 0px 0px;*/ +} +.mceLast td { + /*border-radius: 0 0 10px 10px;*/ +} #profile-attach-wrapper, #profile-audio-wrapper, #profile-link-wrapper, @@ -1064,12 +1104,13 @@ aside #viewcontacts { /** * section */ -section { - margin: 20px 9% 0 4%; +#sectionmain { + margin: 20px; font-size: 0.8em; - padding-right: 230px; min-width: 475px; - width: 65%; + width: 67%; + float: left; + display: inline; } /** tabs **/ @@ -1114,6 +1155,7 @@ section { .wall-item-outside-wrapper { border: 1px solid #aaa; border-radius: 5px; + box-shadow: 5px 0 10px 0 #999; } .wall-item-outside-wrapper.comment { margin-top: 5px; @@ -1333,19 +1375,19 @@ section { width: 100%; } #connect-services-header { - + margin: 5px 0 0 0; } #connect-services { margin: 5px 0 0 0; } #extra-help-header { - + margin: 5px 0 0 0; } #extra-help { margin: 5px 0 0 0; } #postit-header { - + margin: 5px 0 0 0; } #postit { margin: 5px 0 0 0; @@ -1938,8 +1980,8 @@ div[id$="wrapper"] br { margin: 0 0 -18px; position: absolute; text-decoration: none; - top: 18px; - right: 226px; + top: 113px; + right: 260px; } #profile-edit-links ul { margin: 20px 0; @@ -2353,6 +2395,12 @@ div[id$="wrapper"] br { .admin.link { list-style-position: inside; } +#adminpage { + color: #111; + background: transparent; + margin: 5px; + padding: 10px; +} #adminpage dl { clear:left; margin-bottom: 2px; @@ -2374,7 +2422,6 @@ div[id$="wrapper"] br { #adminpage .submit { clear:left; } - #adminpage #pluginslist { margin: 0; padding: 0; @@ -2391,7 +2438,6 @@ div[id$="wrapper"] br { float:left; margin-right: 1em; } - #adminpage table { width: 100%; border-bottom: 1px solid #000; @@ -2417,6 +2463,10 @@ div[id$="wrapper"] br { /* color: #;*/ text-decoration: underline; } +#users .name { + color: #eec; +} + /** * Form fields @@ -2603,8 +2653,8 @@ div[id$="wrapper"] br { } .icon.drop, .icon.drophide, .icon.delete { - float: right; - margin: 5px; + float: left; + margin: 0 2px; } .icon.s22.delete { display: block; @@ -2735,8 +2785,8 @@ div[id$="wrapper"] br { } #pause { position: fixed; - bottom: 5px; - right: 5px; + bottom: 40px; + right: 30px; } .border, .border:hover { border: 1px solid #babdb6; @@ -2776,7 +2826,7 @@ div[id$="wrapper"] br { } footer { display: block; - margin: 50px 20%; + /*margin: 50px 20%;*/ clear: both; } #profile-jot-text { @@ -2805,6 +2855,7 @@ footer { background: #fff url("../../../images/search_18.png") no-repeat right center; padding-right: 20px; margin: 6px; + color: #111; } #acl-showall { float: left; diff --git a/view/theme/dispy/theme.php b/view/theme/dispy/theme.php index d0f6797cb..125910593 100644 --- a/view/theme/dispy/theme.php +++ b/view/theme/dispy/theme.php @@ -3,145 +3,169 @@ /* * Name: Dispy * Description: Dispy, Friendica theme - * Version: 1.0 + * Version: 1.1 * Author: unknown * Maintainer: Simon <http://simon.kisikew.org/> * Screenshot: <a href="screenshot.jpg">Screenshot</a> */ +$a = get_app(); $a->theme_info = array( - 'extends' => 'dispy', + 'name' => 'dispy', + 'version' => '1.1' ); -$a->page['htmlhead'] .= <<< EOT -<script> -$(document).ready(function() { - $('.group-edit-icon').hover( - function() { - $(this).addClass('icon'); - $(this).removeClass('iconspacer'); }, - - function() { - $(this).removeClass('icon'); - $(this).addClass('iconspacer'); } - ); - - $('.sidebar-group-element').hover( - function() { - id = $(this).attr('id'); - $('#edit-' + id).addClass('icon'); - $('#edit-' + id).removeClass('iconspacer'); }, - - function() { - id = $(this).attr('id'); - $('#edit-' + id).removeClass('icon'); - $('#edit-' + id).addClass('iconspacer'); } - ); - - $('.savedsearchdrop').hover( - function() { - $(this).addClass('drop'); - $(this).addClass('icon'); - $(this).removeClass('iconspacer'); }, - - function() { - $(this).removeClass('drop'); - $(this).removeClass('icon'); - $(this).addClass('iconspacer'); } - ); - - $('.savedsearchterm').hover( - function() { - id = $(this).attr('id'); - $('#drop-' + id).addClass('icon'); - $('#drop-' + id).addClass('drophide'); - $('#drop-' + id).removeClass('iconspacer'); }, - - function() { - id = $(this).attr('id'); - $('#drop-' + id).removeClass('icon'); - $('#drop-' + id).removeClass('drophide'); - $('#drop-' + id).addClass('iconspacer'); } - ); - - // click outside notifications menu closes it - $('html').click(function() { - $('#nav-notifications-linkmenu').removeClass('selected'); - document.getElementById("nav-notifications-menu").style.display = "none"; - }); - - $('#nav-notifications-linkmenu').click(function(event) { - event.stopPropagation(); - }); - // click outside profiles menu closes it - $('html').click(function() { - $('#profiles-menu-trigger').removeClass('selected'); - document.getElementById("profiles-menu").style.display = "none"; - }); +function dispy_init(&$a) { + + // aside on profile page + if (($a->argv[0] . $a->argv[1]) === ("profile" . $a->user['nickname'])) { + dispy_community_info(); + } + + $a->page['htmlhead'] .= <<<EOT + <script type="text/javascript"> + $(document).ready(function() { + $('.group-edit-icon').hover( + function() { + $(this).addClass('icon'); + $(this).removeClass('iconspacer'); }, + + function() { + $(this).removeClass('icon'); + $(this).addClass('iconspacer'); } + ); + + $('.sidebar-group-element').hover( + function() { + id = $(this).attr('id'); + $('#edit-' + id).addClass('icon'); + $('#edit-' + id).removeClass('iconspacer'); }, + + function() { + id = $(this).attr('id'); + $('#edit-' + id).removeClass('icon'); + $('#edit-' + id).addClass('iconspacer'); } + ); + + $('.savedsearchdrop').hover( + function() { + $(this).addClass('drop'); + $(this).addClass('icon'); + $(this).removeClass('iconspacer'); }, + + function() { + $(this).removeClass('drop'); + $(this).removeClass('icon'); + $(this).addClass('iconspacer'); } + ); + + $('.savedsearchterm').hover( + function() { + id = $(this).attr('id'); + $('#drop-' + id).addClass('icon'); + $('#drop-' + id).addClass('drophide'); + $('#drop-' + id).removeClass('iconspacer'); }, + + function() { + id = $(this).attr('id'); + $('#drop-' + id).removeClass('icon'); + $('#drop-' + id).removeClass('drophide'); + $('#drop-' + id).addClass('iconspacer'); } + ); + + // click outside notifications menu closes it + $('html').click(function() { + $('#nav-notifications-linkmenu').removeClass('selected'); + $('#nav-notifications-menu').css({display: 'none'}); + }); + + $('#nav-notifications-linkmenu').click(function(event) { + event.stopPropagation(); + }); + // click outside profiles menu closes it + $('html').click(function() { + $('#profiles-menu-trigger').removeClass('selected'); + $('#profiles-menu').css({display: 'none'}); + }); + + $('#profiles-menu').click(function(event) { + event.stopPropagation(); + }); + + // main function in toolbar functioning + function toggleToolbar() { + if ( $('#nav-floater').is(':visible') ) { + $('#nav-floater').slideUp('fast'); + $('.floaterflip').css({ + backgroundPosition: '-210px -60px' + }); + $('.search-box').slideUp('fast'); + } else { + $('#nav-floater').slideDown('fast'); + $('.floaterflip').css({ + backgroundPosition: '-190px -60px' + }); + $('.search-box').slideDown('fast'); + } + }; + // our trigger for the toolbar button + $('.floaterflip').click(function() { + toggleToolbar(); + return false; + }); + + // (attempt to) change the text colour in a top post + $('#profile-jot-text').focusin(function() { + $(this).css({color: '#eec'}); + }); + + $('a[href=#top]').click(function() { + $('html, body').animate({scrollTop:0}, 'slow'); + return false; + }); - $('#profiles-menu').click(function(event) { - event.stopPropagation(); }); - - // main function in toolbar functioning - function toggleToolbar() { - if ( $('#nav-floater').is(':visible') ) { - $('#nav-floater').slideUp('fast'); - $('.floaterflip').css({ - backgroundPosition: '-210px -60px' - }); - $('.search-box').slideUp('fast'); - } else { - $('#nav-floater').slideDown('fast'); - $('.floaterflip').css({ - backgroundPosition: '-190px -60px' - }); - $('.search-box').slideDown('fast'); - } - }; - // our trigger for the toolbar button - $('.floaterflip').click(function() { - toggleToolbar(); - return false; - }); - - // (attempt) to change the text colour in a top post - $('#profile-jot-text').focusin(function() { - $(this).css({color: '#eec'}); + // shadowing effect for floating toolbars + $(document).scroll(function(e) { + var pageTop = $('html').scrollTop(); + if (pageTop) { + $('#nav-floater').css({boxShadow: '3px 3px 10px rgba(0, 0, 0, 0.7)'}); + $('.search-box').css({boxShadow: '3px 3px 10px rgba(0, 0, 0, 0.7)'}); + } else { + $('#nav-floater').css({boxShadow: '0 0 0 0'}); + $('.search-box').css({boxShadow: '0 0 0 0'}); + } }); - -}); -</script> + </script> EOT; + js_in_foot(); +} + function dispy_community_info() { $a = get_app(); - - $fostitJS = "javascript: (function() { - the_url = '".$a->get_baseurl($ssl_state)."/view/theme/dispy-dark/fpostit/fpostit.php?url=' + - encodeURIComponent(window.location.href) + '&title=' + encodeURIComponent(document.title) + '&text=' + - encodeURIComponent(''+(window.getSelection ? window.getSelection() : document.getSelection ? - document.getSelection() : document.selection.createRange().text)); - a_funct = function() { - if (!window.open(the_url, 'fpostit', 'location=yes,links=no,scrollbars=no,toolbar=no,width=600,height=300')) { - location.href = the_url; - } - if (/Firefox/.test(navigator.userAgent)) { - setTimeout(a_funct, 0) - } else { - a_funct(); - } - })();"; - - $aside['$fostitJS'] = $fostitJS; $url = $a->get_baseurl($ssl_state); $aside['$url'] = $url; - $tpl = file_get_contents(dirname(__file__).'/communityhome.tpl'); - $a->page['aside_bottom'] = replace_macros($tpl, $aside); + $fpostitJS = "javascript:(function() {" + . "the_url = '" . $url . "/view/theme/".$a->theme_info['name']."/fpostit/fpostit.php?url=' + encodeURIComponent(window.location.href) + '&title=' + encodeURIComponent(document.title) + '&text=' + encodeURIComponent(''+(window.getSelection ? window.getSelection() : document.getSelection ? document.getSelection() : document.selection.createRange().text)); + a_funct = function() { + if (!window.open(the_url, 'fpostit', 'location=yes,links=no,scrollbars=no,toolbar=no,width=600,height=300')) location.href = the_url;}; + if (/Firefox/.test(navigator.userAgent)) {setTimeout(a_funct, 0);} + else {a_funct();}})()"; + + $aside['$fpostitJS'] = $fpostitJS; + $tpl = file_get_contents(dirname(__file__) . '/communityhome.tpl'); + return $a->page['aside_bottom'] = replace_macros($tpl, $aside); } -// aside on profile page -if (($a->argv[0] . $a->argv[1]) === ("profile" . $a->user['nickname'])) { - dispy_community_info(); +function js_in_foot() { + /** @purpose insert stuff in bottom of page + */ + $a = get_app(); + $baseurl = $a->get_baseurl($ssl_state); + $bottom['$baseurl'] = $baseurl; + $tpl = file_get_contents(dirname(__file__) . '/bottom.tpl'); + + return $a->page['bottom'] = replace_macros($tpl, $bottom); } diff --git a/view/theme/dispy/wall_item.tpl b/view/theme/dispy/wall_item.tpl index 8acaeaf02..52af07532 100644 --- a/view/theme/dispy/wall_item.tpl +++ b/view/theme/dispy/wall_item.tpl @@ -4,9 +4,7 @@ <div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-$item.id" onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')" onmouseout="t$item.id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$item.id\'); closeMenu(\'wall-item-photo-menu-$item.id\');',200)"> - <a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$item.id"> - <img src="$item.thumb" class="wall-item-photo$item.sparkle" id="wall-item-photo-$item.id" style="height: 80px; width: 80px;" alt="$item.name" /> - </a> + <a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$item.id"><img src="$item.thumb" class="wall-item-photo$item.sparkle" id="wall-item-photo-$item.id" style="height: 80px; width: 80px;" alt="$item.name" /></a> <span onclick="openClose('wall-item-photo-menu-$item.id');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-$item.id">menu</span> <div class="wall-item-photo-menu" id="wall-item-photo-menu-$item.id"> <ul> @@ -57,15 +55,16 @@ </ul> <div class="wall-item-delete-end"></div> </div> - <div class="wall-item-content" id="wall-item-content-$item.id" > + <div class="wall-item-content" id="wall-item-content-$item.id"> <div class="wall-item-title" id="wall-item-title-$item.id">$item.title</div> <div class="wall-item-title-end"></div> - <div class="wall-item-body" id="wall-item-body-$item.id" >$item.body - <div class="body-tag"> - {{ for $item.tags as $tag }} - <span class='tag'>$tag</span> - {{ endfor }} - </div> + <div class="wall-item-body" id="wall-item-body-$item.id"> + $item.body + <div class="body-tag"> + {{ for $item.tags as $tag }} + <span class='tag'>$tag</span> + {{ endfor }} + </div> </div> </div> <div class="wall-item-author"> diff --git a/view/theme/dispy/wallwall_item.tpl b/view/theme/dispy/wallwall_item.tpl index 421cddadf..e8cbc2cd4 100644 --- a/view/theme/dispy/wallwall_item.tpl +++ b/view/theme/dispy/wallwall_item.tpl @@ -2,15 +2,13 @@ <div class="wall-item-content-wrapper$item.indent" id="wall-item-content-wrapper-$item.id" > <div class="wall-item-info wallwall" id="wall-item-info-$item.id"> <div class="wall-item-photo-wrapper wwto" id="wall-item-ownerphoto-wrapper-$item.id" > - <a href="$item.owner_url" title="$item.olinktitle" class="wall-item-photo-link" id="wall-item-ownerphoto-link-$item.id"> - <img src="$item.owner_photo" class="wall-item-photo$item.osparkle" id="wall-item-ownerphoto-$item.id" style="height: 80px; width: 80px;" alt="$item.owner_name" /></a> + <a href="$item.owner_url" title="$item.olinktitle" class="wall-item-photo-link" id="wall-item-ownerphoto-link-$item.id"><img src="$item.owner_photo" class="wall-item-photo$item.osparkle" id="wall-item-ownerphoto-$item.id" style="height: 80px; width: 80px;" alt="$item.owner_name" /></a> </div> <div class="wall-item-arrowphoto-wrapper" ><img src="images/larrow.gif" alt="$item.wall" /></div> <div class="wall-item-photo-wrapper wwfrom" id="wall-item-photo-wrapper-$item.id" onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')" onmouseout="t$item.id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$item.id\'); closeMenu(\'wall-item-photo-menu-$item.id\');',200)"> - <a href="$item.profile_url" title="$item.linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$item.id"> - <img src="$item.thumb" class="wall-item-photo$item.sparkle" id="wall-item-photo-$item.id" style="height: 80px; width: 80px;" alt="$item.name" /></a> + <a href="$item.profile_url" title="$item.linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$item.id"><img src="$item.thumb" class="wall-item-photo$item.sparkle" id="wall-item-photo-$item.id" style="height: 80px; width: 80px;" alt="$item.name" /></a> <span onclick="openClose('wall-item-photo-menu-$item.id');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-$item.id">menu</span> <div class="wall-item-photo-menu" id="wall-item-photo-menu-$item.id"> <ul> @@ -63,15 +61,16 @@ class="icon recycle wall-item-share-buttons" title="$item.vote.share.0" onclick </ul> <div class="wall-item-delete-end"></div> </div> - <div class="wall-item-content" id="wall-item-content-$item.id" > + <div class="wall-item-content" id="wall-item-content-$item.id"> <div class="wall-item-title" id="wall-item-title-$item.id">$item.title</div> <div class="wall-item-title-end"></div> - <div class="wall-item-body" id="wall-item-body-$item.id" >$item.body - <div class="body-tag"> - {{ for $item.tags as $tag }} - <span class="tag">$tag</span> - {{ endfor }} - </div> + <div class="wall-item-body" id="wall-item-body-$item.id"> + $item.body + <div class="body-tag"> + {{ for $item.tags as $tag }} + <span class="tag">$tag</span> + {{ endfor }} + </div> </div> </div> <div class="wall-item-author"> diff --git a/view/theme/quattro/TODO b/view/theme/quattro/TODO new file mode 100644 index 000000000..12638551a --- /dev/null +++ b/view/theme/quattro/TODO @@ -0,0 +1,2 @@ +jot.tpl: <!-- TODO: waiting for a better placement +nav.tpl: <!-- TODO: better icons! --> diff --git a/view/theme/quattro/config.php b/view/theme/quattro/config.php index c9ab3a4a1..c261a78ec 100644 --- a/view/theme/quattro/config.php +++ b/view/theme/quattro/config.php @@ -11,6 +11,37 @@ function theme_content(&$a){ $align = get_pconfig(local_user(), 'quattro', 'align' ); $color = get_pconfig(local_user(), 'quattro', 'color' ); + + return quattro_form($a,$align, $color); +} + +function theme_post(&$a){ + if(! local_user()) + return; + + if (isset($_POST['quattro-settings-submit'])){ + set_pconfig(local_user(), 'quattro', 'align', $_POST['quattro_align']); + set_pconfig(local_user(), 'quattro', 'color', $_POST['quattro_color']); + } +} + + +function theme_admin(&$a){ + $align = get_config('quattro', 'align' ); + $color = get_config('quattro', 'color' ); + + return quattro_form($a,$align, $color); +} + +function theme_admin_post(&$a){ + if (isset($_POST['quattro-settings-submit'])){ + set_config('quattro', 'align', $_POST['quattro_align']); + set_config('quattro', 'color', $_POST['quattro_color']); + } +} + + +function quattro_form(&$a, $align, $color){ $colors = array( "dark"=>"Quattro", "green"=>"Green" @@ -26,14 +57,3 @@ function theme_content(&$a){ )); return $o; } - -function theme_post(&$a){ - if(! local_user()) - return; - - if (isset($_POST['quattro-settings-submit'])){ - set_pconfig(local_user(), 'quattro', 'align', $_POST['quattro_align']); - set_pconfig(local_user(), 'quattro', 'color', $_POST['quattro_color']); - } -} - diff --git a/view/theme/quattro/conversation.tpl b/view/theme/quattro/conversation.tpl index ff202bbe4..7bb7cd2fd 100644 --- a/view/theme/quattro/conversation.tpl +++ b/view/theme/quattro/conversation.tpl @@ -9,8 +9,11 @@ {{endif}} {{if $item.comment_lastcollapsed}}</div>{{endif}} - {{ inc $item.template }}{{ endinc }} - + {{ if $item.type == tag }} + {{ inc wall_item_tag.tpl }}{{ endinc }} + {{ else }} + {{ inc $item.template }}{{ endinc }} + {{ endif }} {{ endfor }} </div> diff --git a/view/theme/quattro/dark/colors.less b/view/theme/quattro/dark/colors.less index b6d487f92..42fdd34bb 100644 --- a/view/theme/quattro/dark/colors.less +++ b/view/theme/quattro/dark/colors.less @@ -38,7 +38,7 @@ @Link: @Blue3; @LinkHover: @Blue3; @LinkVisited: @Blue3; - +@LinkDimmed: @Blue2; @ButtonColor: @Grey1; @ButtonBackgroundColor: @Grey5; @@ -73,9 +73,13 @@ @FieldHelpColor: @Grey3; -@ThreadBackgroundColor: #f6f7f8; +@ThreadBackgroundColor: #eff0f1; +@ThreadBottomBorderColor: @Grey2; @ShinyBorderColor: @Yellow1; +@ItemColor: @Grey5; +@ItemColorDimmed: @Grey3; + @CommentBoxEmptyColor: @Grey3; @CommentBoxEmptyBorderColor: @Grey3; @CommentBoxFullColor: @Grey5; diff --git a/view/theme/quattro/dark/style.css b/view/theme/quattro/dark/style.css index 1d951aba8..1fa03b253 100644 --- a/view/theme/quattro/dark/style.css +++ b/view/theme/quattro/dark/style.css @@ -48,6 +48,9 @@ .icon.s10.unlock { background-image: url("../../../images/icons/10/unlock.png"); } +.icon.s10.plugin { + background-image: url("../../../images/icons/10/plugin.png"); +} .icon.s10.type-unkn { background-image: url("../../../images/icons/10/zip.png"); } @@ -63,6 +66,9 @@ .icon.s10.type-text { background-image: url("../../../images/icons/10/text.png"); } +.icon.s10.language { + background-image: url("icons/language.png"); +} .icon.s10.text { padding: 2px 0px 0px 15px; } @@ -100,6 +106,9 @@ .icon.s16.unlock { background-image: url("../../../images/icons/16/unlock.png"); } +.icon.s16.plugin { + background-image: url("../../../images/icons/16/plugin.png"); +} .icon.s16.type-unkn { background-image: url("../../../images/icons/16/zip.png"); } @@ -115,6 +124,9 @@ .icon.s16.type-text { background-image: url("../../../images/icons/16/text.png"); } +.icon.s16.language { + background-image: url("icons/language.png"); +} .icon.s16.text { padding: 4px 0px 0px 20px; } @@ -152,6 +164,9 @@ .icon.s22.unlock { background-image: url("../../../images/icons/22/unlock.png"); } +.icon.s22.plugin { + background-image: url("../../../images/icons/22/plugin.png"); +} .icon.s22.type-unkn { background-image: url("../../../images/icons/22/zip.png"); } @@ -167,6 +182,9 @@ .icon.s22.type-text { background-image: url("../../../images/icons/22/text.png"); } +.icon.s22.language { + background-image: url("icons/language.png"); +} .icon.s22.text { padding: 10px 0px 0px 25px; } @@ -204,6 +222,9 @@ .icon.s48.unlock { background-image: url("../../../images/icons/48/unlock.png"); } +.icon.s48.plugin { + background-image: url("../../../images/icons/48/plugin.png"); +} .icon.s48.type-unkn { background-image: url("../../../images/icons/48/zip.png"); } @@ -219,6 +240,9 @@ .icon.s48.type-text { background-image: url("../../../images/icons/48/text.png"); } +.icon.s48.language { + background-image: url("icons/language.png"); +} /* global */ body { font-family: Liberation Sans, helvetica, arial, clean, sans-serif; @@ -302,6 +326,10 @@ code { float: right; } /* popup notifications */ +#jGrowl.top-right { + top: 30px; + right: 15px; +} div.jGrowl div.notice { background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center; color: #ffffff; @@ -501,6 +529,17 @@ ul.menu-popup .empty { text-align: center; color: #9eabb0; } +ul.menu-popup .toolbar { + background-color: #9eabb0; + height: auto; + overflow: auto; +} +ul.menu-popup .toolbar a { + float: right; +} +ul.menu-popup .toolbar a:hover { + background-color: #ffffff; +} /* autocomplete popup */ .acpopup { max-height: 150px; @@ -542,7 +581,7 @@ ul.menu-popup .empty { color: #9eabb0; display: block; } -/* aside */ +/* aside 230px*/ aside { display: table-cell; vertical-align: top; @@ -749,20 +788,21 @@ aside #profiles-menu { width: 200px; top: 18px; } -/* section */ +/* section 800px */ section { display: table-cell; vertical-align: top; - width: 800px; + width: 770px; padding: 0px 20px 0px 10px; } /* wall item */ .tread-wrapper { - background-color: #f6f7f8; + background-color: #eff0f1; position: relative; padding: 10px; margin-bottom: 20px; - width: 780px; + width: 750px; + border-bottom: 1px solid #cccccc; } .wall-item-decor { position: absolute; @@ -775,7 +815,7 @@ section { } .wall-item-container { display: table; - width: 780px; + width: 750px; } .wall-item-container .wall-item-item, .wall-item-container .wall-item-bottom { @@ -867,26 +907,42 @@ section { .wall-item-container .wall-item-actions-tools input { float: right; } -.wall-item-container.comment { - /*margin-top: 50px;*/ - +.wall-item-container.comment .contact-photo-wrapper { + margin-left: 16px; } .wall-item-container.comment .contact-photo { width: 32px; height: 32px; - margin-left: 16px; - /*background: url(../../../images/icons/22/user.png) no-repeat center center;*/ - } .wall-item-container.comment .contact-photo-menu-button { top: 15px !important; - left: 15px !important; + left: 0px !important; } .wall-item-container.comment .wall-item-links { padding-left: 12px; } +/* 'tag' item type */ +.wall-item-container.item-tag .wall-item-content { + opacity: 0.5; + -webkit-transition: all 0.2s ease-in-out; + -moz-transition: all 0.2s ease-in-out; + -o-transition: all 0.2s ease-in-out; + -ms-transition: all 0.2s ease-in-out; + transition: all 0.2s ease-in-out; +} +.wall-item-container.item-tag .contact-photo-wrapper { + margin-left: 32px; +} +.wall-item-container.item-tag .contact-photo { + width: 16px; + height: 16px; +} +.wall-item-container.item-tag .contact-photo-menu-button { + top: 15px !important; + left: 15px !important; +} .wall-item-comment-wrapper { - margin: 30px 2em 2em 60px; + margin: 1em 2em 1em 60px; } .wall-item-comment-wrapper .comment-edit-photo { display: none; @@ -938,6 +994,9 @@ section { #jot-preview-content .tread-wrapper { background-color: #fce94f; } +.hide-comments-outer { + margin-bottom: 0.8em; +} .wall-item-tags { padding-top: 5px; } @@ -1064,7 +1123,7 @@ section { padding: 0px; height: 40px; overflow: none; - width: 800px; + width: 770px; background-color: #0e232e; border-bottom: 2px solid #9eabb0; } @@ -1139,7 +1198,7 @@ section { border: 0px; margin: 0px; height: 20px; - width: 700px; + width: 500px; font-weight: bold; border: 1px solid #ffffff; } @@ -1156,13 +1215,26 @@ section { border: 1px solid #999999; } #jot #character-counter { - width: 80px; + width: 40px; float: right; text-align: right; height: 20px; line-height: 20px; padding-right: 20px; } +#jot #jot-category { + border: 0px; + margin: 0px; + height: 20px; + width: 200px; + border: 1px solid #ffffff; +} +#jot #jot-category:hover { + border: 1px solid #999999; +} +#jot #jot-category:focus { + border: 1px solid #999999; +} /** buttons **/ /*input[type="submit"] { border: 0px; @@ -1569,44 +1641,19 @@ ul.tabs li .active { -ms-transition: all 0.2s ease-in-out; transition: all 0.2s ease-in-out; } -/* mail view */ -/* -.mail-conv-sender, -.mail-conv-detail { - float: left; -} -.mail-conv-detail { - margin-left: 20px; - width: 500px; -} - -.mail-conv-subject { - font-size: 1.4em; - margin: 10px 0; -} - -.mail-conv-outside-wrapper-end { - clear: both; -} - -.mail-conv-outside-wrapper { - margin-top: 30px; -} - -.mail-conv-delete-wrapper { - float: right; - margin-right: 30px; - margin-top: 15px; -} -.mail-conv-break { - clear: both; +/* theme screenshot */ +.screenshot, +#theme-preview { + position: absolute; + width: 202px; + left: 70%; + top: 50px; } - -.mail-conv-delete-icon { - border: none; +.screenshot img, +#theme-preview img { + width: 200px; + height: 150px; } - -*/ /* page footer */ footer { height: 100px; diff --git a/view/theme/quattro/generic_links_widget.tpl b/view/theme/quattro/generic_links_widget.tpl new file mode 100644 index 000000000..29580bbc7 --- /dev/null +++ b/view/theme/quattro/generic_links_widget.tpl @@ -0,0 +1,11 @@ +<div class="widget"> + {{if $title}}<h3>$title</h3>{{endif}} + {{if $desc}}<div class="desc">$desc</div>{{endif}} + + <ul> + {{ for $items as $item }} + <li class="tool {{ if $item.selected }}selected{{ endif }}"><a href="$item.url" class="link">$item.label</a></li> + {{ endfor }} + </ul> + +</div> diff --git a/view/theme/quattro/green/colors.less b/view/theme/quattro/green/colors.less index bc78c3fda..1f1df4c55 100644 --- a/view/theme/quattro/green/colors.less +++ b/view/theme/quattro/green/colors.less @@ -74,7 +74,8 @@ @FieldHelpColor: @Grey3; -@ThreadBackgroundColor: #f6f7f8; +@ThreadBackgroundColor: #eff0f1; +@ThreadBottomBorderColor: @Grey2; @ShinyBorderColor: @Green4; @CommentBoxEmptyColor: @Grey3; diff --git a/view/theme/quattro/green/style.css b/view/theme/quattro/green/style.css index e7cc549d0..317112f6f 100644 --- a/view/theme/quattro/green/style.css +++ b/view/theme/quattro/green/style.css @@ -48,6 +48,9 @@ .icon.s10.unlock { background-image: url("../../../images/icons/10/unlock.png"); } +.icon.s10.plugin { + background-image: url("../../../images/icons/10/plugin.png"); +} .icon.s10.type-unkn { background-image: url("../../../images/icons/10/zip.png"); } @@ -63,6 +66,9 @@ .icon.s10.type-text { background-image: url("../../../images/icons/10/text.png"); } +.icon.s10.language { + background-image: url("icons/language.png"); +} .icon.s10.text { padding: 2px 0px 0px 15px; } @@ -100,6 +106,9 @@ .icon.s16.unlock { background-image: url("../../../images/icons/16/unlock.png"); } +.icon.s16.plugin { + background-image: url("../../../images/icons/16/plugin.png"); +} .icon.s16.type-unkn { background-image: url("../../../images/icons/16/zip.png"); } @@ -115,6 +124,9 @@ .icon.s16.type-text { background-image: url("../../../images/icons/16/text.png"); } +.icon.s16.language { + background-image: url("icons/language.png"); +} .icon.s16.text { padding: 4px 0px 0px 20px; } @@ -152,6 +164,9 @@ .icon.s22.unlock { background-image: url("../../../images/icons/22/unlock.png"); } +.icon.s22.plugin { + background-image: url("../../../images/icons/22/plugin.png"); +} .icon.s22.type-unkn { background-image: url("../../../images/icons/22/zip.png"); } @@ -167,6 +182,9 @@ .icon.s22.type-text { background-image: url("../../../images/icons/22/text.png"); } +.icon.s22.language { + background-image: url("icons/language.png"); +} .icon.s22.text { padding: 10px 0px 0px 25px; } @@ -204,6 +222,9 @@ .icon.s48.unlock { background-image: url("../../../images/icons/48/unlock.png"); } +.icon.s48.plugin { + background-image: url("../../../images/icons/48/plugin.png"); +} .icon.s48.type-unkn { background-image: url("../../../images/icons/48/zip.png"); } @@ -219,6 +240,9 @@ .icon.s48.type-text { background-image: url("../../../images/icons/48/text.png"); } +.icon.s48.language { + background-image: url("icons/language.png"); +} /* global */ body { font-family: Liberation Sans, helvetica, arial, clean, sans-serif; @@ -302,6 +326,10 @@ code { float: right; } /* popup notifications */ +#jGrowl.top-right { + top: 30px; + right: 15px; +} div.jGrowl div.notice { background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center; color: #ffffff; @@ -501,6 +529,17 @@ ul.menu-popup .empty { text-align: center; color: #9eabb0; } +ul.menu-popup .toolbar { + background-color: #9eabb0; + height: auto; + overflow: auto; +} +ul.menu-popup .toolbar a { + float: right; +} +ul.menu-popup .toolbar a:hover { + background-color: #ffffff; +} /* autocomplete popup */ .acpopup { max-height: 150px; @@ -542,7 +581,7 @@ ul.menu-popup .empty { color: #9eabb0; display: block; } -/* aside */ +/* aside 230px*/ aside { display: table-cell; vertical-align: top; @@ -749,20 +788,21 @@ aside #profiles-menu { width: 200px; top: 18px; } -/* section */ +/* section 800px */ section { display: table-cell; vertical-align: top; - width: 800px; + width: 770px; padding: 0px 20px 0px 10px; } /* wall item */ .tread-wrapper { - background-color: #f6f7f8; + background-color: #eff0f1; position: relative; padding: 10px; margin-bottom: 20px; - width: 780px; + width: 750px; + border-bottom: 1px solid #cccccc; } .wall-item-decor { position: absolute; @@ -775,7 +815,7 @@ section { } .wall-item-container { display: table; - width: 780px; + width: 750px; } .wall-item-container .wall-item-item, .wall-item-container .wall-item-bottom { @@ -867,26 +907,42 @@ section { .wall-item-container .wall-item-actions-tools input { float: right; } -.wall-item-container.comment { - /*margin-top: 50px;*/ - +.wall-item-container.comment .contact-photo-wrapper { + margin-left: 16px; } .wall-item-container.comment .contact-photo { width: 32px; height: 32px; - margin-left: 16px; - /*background: url(../../../images/icons/22/user.png) no-repeat center center;*/ - } .wall-item-container.comment .contact-photo-menu-button { top: 15px !important; - left: 15px !important; + left: 0px !important; } .wall-item-container.comment .wall-item-links { padding-left: 12px; } +/* 'tag' item type */ +.wall-item-container.item-tag .wall-item-content { + opacity: 0.5; + -webkit-transition: all 0.2s ease-in-out; + -moz-transition: all 0.2s ease-in-out; + -o-transition: all 0.2s ease-in-out; + -ms-transition: all 0.2s ease-in-out; + transition: all 0.2s ease-in-out; +} +.wall-item-container.item-tag .contact-photo-wrapper { + margin-left: 32px; +} +.wall-item-container.item-tag .contact-photo { + width: 16px; + height: 16px; +} +.wall-item-container.item-tag .contact-photo-menu-button { + top: 15px !important; + left: 15px !important; +} .wall-item-comment-wrapper { - margin: 30px 2em 2em 60px; + margin: 1em 2em 1em 60px; } .wall-item-comment-wrapper .comment-edit-photo { display: none; @@ -938,6 +994,9 @@ section { #jot-preview-content .tread-wrapper { background-color: #ddffdd; } +.hide-comments-outer { + margin-bottom: 0.8em; +} .wall-item-tags { padding-top: 5px; } @@ -1064,7 +1123,7 @@ section { padding: 0px; height: 40px; overflow: none; - width: 800px; + width: 770px; background-color: #009100; border-bottom: 2px solid #9eabb0; } @@ -1139,7 +1198,7 @@ section { border: 0px; margin: 0px; height: 20px; - width: 700px; + width: 500px; font-weight: bold; border: 1px solid #ffffff; } @@ -1156,13 +1215,26 @@ section { border: 1px solid #999999; } #jot #character-counter { - width: 80px; + width: 40px; float: right; text-align: right; height: 20px; line-height: 20px; padding-right: 20px; } +#jot #jot-category { + border: 0px; + margin: 0px; + height: 20px; + width: 200px; + border: 1px solid #ffffff; +} +#jot #jot-category:hover { + border: 1px solid #999999; +} +#jot #jot-category:focus { + border: 1px solid #999999; +} /** buttons **/ /*input[type="submit"] { border: 0px; @@ -1569,44 +1641,19 @@ ul.tabs li .active { -ms-transition: all 0.2s ease-in-out; transition: all 0.2s ease-in-out; } -/* mail view */ -/* -.mail-conv-sender, -.mail-conv-detail { - float: left; -} -.mail-conv-detail { - margin-left: 20px; - width: 500px; -} - -.mail-conv-subject { - font-size: 1.4em; - margin: 10px 0; -} - -.mail-conv-outside-wrapper-end { - clear: both; -} - -.mail-conv-outside-wrapper { - margin-top: 30px; -} - -.mail-conv-delete-wrapper { - float: right; - margin-right: 30px; - margin-top: 15px; -} -.mail-conv-break { - clear: both; +/* theme screenshot */ +.screenshot, +#theme-preview { + position: absolute; + width: 202px; + left: 70%; + top: 50px; } - -.mail-conv-delete-icon { - border: none; +.screenshot img, +#theme-preview img { + width: 200px; + height: 150px; } - -*/ /* page footer */ footer { height: 100px; diff --git a/view/theme/quattro/icons.less b/view/theme/quattro/icons.less index e314fba1f..24e96b5aa 100644 --- a/view/theme/quattro/icons.less +++ b/view/theme/quattro/icons.less @@ -13,11 +13,15 @@ &.link { background-image: url("../../../images/icons/@{size}/link.png"); } &.lock { background-image: url("../../../images/icons/@{size}/lock.png"); } &.unlock { background-image: url("../../../images/icons/@{size}/unlock.png"); } + &.plugin { background-image: url("../../../images/icons/@{size}/plugin.png"); } &.type-unkn { background-image: url("../../../images/icons/@{size}/zip.png"); } &.type-audio{ background-image: url("../../../images/icons/@{size}/audio.png"); } &.type-video{ background-image: url("../../../images/icons/@{size}/video.png"); } &.type-image{ background-image: url("../../../images/icons/@{size}/image.png"); } &.type-text { background-image: url("../../../images/icons/@{size}/text.png"); } + + &.language { background-image: url("icons/language.png"); } + } diff --git a/view/theme/quattro/icons/language.png b/view/theme/quattro/icons/language.png Binary files differnew file mode 100644 index 000000000..8029c0155 --- /dev/null +++ b/view/theme/quattro/icons/language.png diff --git a/view/theme/quattro/jot.tpl b/view/theme/quattro/jot.tpl index 2f89d4372..95c0ff6b1 100644 --- a/view/theme/quattro/jot.tpl +++ b/view/theme/quattro/jot.tpl @@ -1,8 +1,10 @@ <form id="profile-jot-form" action="$action" method="post"> <div id="jot"> <div id="profile-jot-desc" class="jothidden"> </div> - <input name="title" id="jot-title" type="text" placeholder="$placeholdertitle" value="$title" class="jothidden" style="display:none" /> + <input name="title" id="jot-title" type="text" placeholder="$placeholdertitle" title="$placeholdertitle" value="$title" class="jothidden" style="display:none" /><input name="category" id="jot-category" type="text" placeholder="$placeholdercategory" title="$placeholdercategory" value="$category" class="jothidden" style="display:none" /> <div id="character-counter" class="grey jothidden"></div> + + <input type="hidden" name="type" value="$ptyp" /> <input type="hidden" name="profile_uid" value="$profile_uid" /> @@ -20,8 +22,10 @@ <li><a id="profile-link" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;" title="$weblink">$shortweblink</a></li> <li><a id="profile-video" onclick="jotVideoURL();return false;" title="$gvideo">$shortvideo</a></li> <li><a id="profile-audio" onclick="jotAudioURL();return false;" title="$audio">$shortaudio</a></li> + <!-- TODO: waiting for a better placement <li><a id="profile-location" onclick="jotGetLocation();return false;" title="$setloc">$shortsetloc</a></li> <li><a id="profile-nolocation" onclick="jotClearLocation();return false;" title="$noloc">$shortnoloc</a></li> + --> <li><a id="jot-preview-link" onclick="preview_post(); return false;" title="$preview">$preview</a></li> $jotplugins diff --git a/view/theme/quattro/nav.tpl b/view/theme/quattro/nav.tpl index 8c872864c..af1fc9414 100644 --- a/view/theme/quattro/nav.tpl +++ b/view/theme/quattro/nav.tpl @@ -43,8 +43,8 @@ <li id="nav-notifications-linkmenu" class="nav-menu-icon"><a href="$nav.notifications.0" rel="#nav-notifications-menu" title="$nav.notifications.1"><span class="icon s22 notify">$nav.notifications.1</span></a> <span id="notify-update" class="nav-notify"></span> <ul id="nav-notifications-menu" class="menu-popup"> - <li id="nav-notifications-mark-all"><a href="#" onclick="notifyMarkAll(); return false;">$nav.notifications.mark.1</a></li> - <li id="nav-notifications-see-all"><a href="$nav.notifications.all.0">$nav.notifications.all.1</a></li> + <!-- TODO: better icons! --> + <li id="nav-notifications-mark-all" class="toolbar"><a href="#" onclick="notifyMarkAll(); return false;" title="$nav.notifications.mark.1"><span class="icon s10 edit"></span></a></a><a href="$nav.notifications.all.0" title="$nav.notifications.all.1"><span class="icon s10 plugin"></span></a></li> <li class="empty">$emptynotifications</li> </ul> </li> @@ -92,40 +92,4 @@ <li><a href="{0}"><img src="{1}">{2} <span class="notif-when">{3}</span></a></li> </ul> -{# - -{{ if $nav.logout }}<a id="nav-logout-link" class="nav-link $nav.logout.2" href="$nav.logout.0" title="$nav.logout.3" >$nav.logout.1</a> {{ endif }} -{{ if $nav.login }}<a id="nav-login-link" class="nav-login-link $nav.login.2" href="$nav.login.0" title="$nav.login.3" >$nav.login.1</a> {{ endif }} - -<span id="nav-link-wrapper" > - -{{ if $nav.register }}<a id="nav-register-link" class="nav-commlink $nav.register.2" href="$nav.register.0" title="$nav.register.3" >$nav.register.1</a>{{ endif }} - -<a id="nav-help-link" class="nav-link $nav.help.2" target="friendika-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a> - -{{ if $nav.apps }}<a id="nav-apps-link" class="nav-link $nav.apps.2" href="$nav.apps.0" title="$nav.apps.3" >$nav.apps.1</a>{{ endif }} - -<a id="nav-search-link" class="nav-link $nav.search.2" href="$nav.search.0" title="$nav.search.3" >$nav.search.1</a> -<a id="nav-directory-link" class="nav-link $nav.directory.2" href="$nav.directory.0" title="$nav.directory.3" >$nav.directory.1</a> - -{{ if $nav.admin }}<a id="nav-admin-link" class="nav-link $nav.admin.2" href="$nav.admin.0" title="$nav.admin.3" >$nav.admin.1</a>{{ endif }} - -{{ if $nav.notifications }} -<a id="nav-notify-link" class="nav-commlink $nav.notifications.2" href="$nav.notifications.0" title="$nav.notifications.3" >$nav.notifications.1</a> -<span id="notify-update" class="nav-ajax-left"></span> -{{ endif }} -{{ if $nav.messages }} -<a id="nav-messages-link" class="nav-commlink $nav.messages.2" href="$nav.messages.0" title="$nav.messages.3" >$nav.messages.1</a> -<span id="mail-update" class="nav-ajax-left"></span> -{{ endif }} - -{{ if $nav.manage }}<a id="nav-manage-link" class="nav-commlink $nav.manage.2" href="$nav.manage.0" title="$nav.manage.3">$nav.manage.1</a>{{ endif }} - -{{ if $nav.settings }}<a id="nav-settings-link" class="nav-link $nav.settings.2" href="$nav.settings.0" title="$nav.settings.3">$nav.settings.1</a>{{ endif }} -{{ if $nav.profiles }}<a id="nav-profiles-link" class="nav-link $nav.profiles.2" href="$nav.profiles.0" title="$nav.profiles.3" >$nav.profiles.1</a>{{ endif }} - - -</span> -<span id="nav-end"></span> -<span id="banner">$banner</span> -#} +<div style="position: fixed; top: 3px; left: 5px; z-index:9999">$langselector</div> diff --git a/view/theme/quattro/quattro.less b/view/theme/quattro/quattro.less index c6352cfe9..4c3279943 100644 --- a/view/theme/quattro/quattro.less +++ b/view/theme/quattro/quattro.less @@ -87,6 +87,10 @@ code { /* popup notifications */ +#jGrowl.top-right { + top: 30px; + right: 15px; +} div.jGrowl div.notice { background: @NoticeBackgroundColor url("../../../images/icons/48/notice.png") no-repeat 5px center; color: @NoticeColor; @@ -227,6 +231,12 @@ ul.menu-popup { text-align: center; color: @MenuEmpty; } + .toolbar { + background-color: @MenuEmpty; + height: auto; overflow: auto; + a { float: right; } + a:hover { background-color: @MenuBg; } + } } @@ -264,7 +274,7 @@ ul.menu-popup { -/* aside */ +/* aside 230px*/ aside { display: table-cell; vertical-align: top; @@ -397,11 +407,11 @@ aside { } -/* section */ +/* section 800px */ section { display: table-cell; vertical-align: top; - width: 800px; + width: 770px; padding:0px 20px 0px 10px; } @@ -411,14 +421,15 @@ section { position: relative; padding: 10px; margin-bottom: 20px; - width: 780px; + width: 750px; + border-bottom: 1px solid @ThreadBottomBorderColor; } .wall-item-decor { position: absolute; left: 97%; top: -10px; width: 16px;} .unstarred { display: none; } .wall-item-container { display: table; - width: 780px; + width: 750px; .wall-item-item, .wall-item-bottom { display: table-row; } @@ -472,19 +483,35 @@ section { .wall-item-container.comment { - /*margin-top: 50px;*/ - .contact-photo { width: 32px; height: 32px; margin-left: 16px; - /*background: url(../../../images/icons/22/user.png) no-repeat center center;*/ + .contact-photo-wrapper { margin-left: 16px; } + .contact-photo { + width: 32px; height: 32px; } .contact-photo-menu-button { top: 15px !important; - left: 15px !important; + left: 0px !important; } .wall-item-links { padding-left: 12px; } } +/* 'tag' item type */ +.wall-item-container.item-tag { + .wall-item-content { + .opaque(0.5); + } + .contact-photo-wrapper { margin-left: 32px; } + .contact-photo { + width: 16px; height: 16px; + } + .contact-photo-menu-button { + top: 15px !important; + left: 15px !important; + } +} + + .wall-item-comment-wrapper { - margin: 30px 2em 2em 60px; + margin: 1em 2em 1em 60px; .comment-edit-photo { display: none; } textarea { height: 1em; width: 100%; font-size: 10px; @@ -516,13 +543,12 @@ section { .wall-item-container { width: 700px; } .tread-wrapper { width: 700px; padding: 0; margin: 10px 0;} - - } .shiny { border-right:10px solid @ShinyBorderColor; } #jot-preview-content .tread-wrapper { background-color: @JotPreviewBackgroundColor; } +.hide-comments-outer {margin-bottom: 0.8em; } .wall-item-tags { padding-top: 5px; } .tag { @@ -632,7 +658,7 @@ section { #jot-tools { margin: 0px; padding: 0px; height: 40px; overflow: none; - width: 800px; + width: 770px; background-color: @JotToolsBackgroundColor; border-bottom: 2px solid @JotToolsBorderColor; li { @@ -704,7 +730,7 @@ section { border: 0px; margin: 0px; height: 20px; - width: 700px; + width: 500px; font-weight: bold; border: 1px solid @BodyBackground; @@ -721,14 +747,23 @@ section { } #character-counter { - width: 80px; + width: 40px; float: right; text-align: right; height: 20px; line-height: 20px; padding-right: 20px; } - + + #jot-category { + border: 0px; + margin: 0px; + height: 20px; + width: 200px; + border: 1px solid @BodyBackground; + &:hover { border: 1px solid @CommentBoxEmptyBorderColor } + &:focus { border: 1px solid @CommentBoxEmptyBorderColor } + } } @@ -1100,46 +1135,15 @@ ul.tabs { } -/* mail view */ -/* -.mail-conv-sender, -.mail-conv-detail { - float: left; -} -.mail-conv-detail { - margin-left: 20px; - width: 500px; -} - -.mail-conv-subject { - font-size: 1.4em; - margin: 10px 0; -} - -.mail-conv-outside-wrapper-end { - clear: both; -} - -.mail-conv-outside-wrapper { - margin-top: 30px; -} - -.mail-conv-delete-wrapper { - float: right; - margin-right: 30px; - margin-top: 15px; -} -.mail-conv-break { - clear: both; -} - -.mail-conv-delete-icon { - border: none; +/* theme screenshot */ +.screenshot, #theme-preview { + position: absolute; + width:202px; + left: 70%; + top: 50px; + img { width: 200px; height: 150px; } } -*/ - - /* page footer */ footer { height: 100px; display: table-row; } diff --git a/view/theme/quattro/style.php b/view/theme/quattro/style.php index 889ec1530..fa02a04b6 100644 --- a/view/theme/quattro/style.php +++ b/view/theme/quattro/style.php @@ -1,9 +1,30 @@ <?php - $color = get_pconfig(local_user(), "quattro","color"); + $color=false; + $quattro_align=false; + $site_color = get_config("quattro","color"); + $site_quattro_align = get_config("quattro", "align" ); + if (local_user()) { + $color = get_pconfig(local_user(), "quattro","color"); + $quattro_align = get_pconfig(local_user(), 'quattro', 'align' ); + } + + if ($color===false) $color=$site_color; if ($color===false) $color="dark"; + if ($quattro_align===false) $quattro_align=$site_quattro_align; + if (file_exists("$THEMEPATH/$color/style.css")){ echo file_get_contents("$THEMEPATH/$color/style.css"); } + + if($quattro_align=="center"){ + echo " + html { width: 100%; margin:0px; padding:0px; } + body { + margin: 50px auto; + width: 900px; + } + "; + } diff --git a/view/theme/quattro/theme.php b/view/theme/quattro/theme.php index be47a401c..0a13c2035 100644 --- a/view/theme/quattro/theme.php +++ b/view/theme/quattro/theme.php @@ -1,20 +1,12 @@ <?php +/** + * Name: Quattro + * Version: 0.5 + * Author: Fabio <http://kirgroup.com/profile/fabrixxm> + * Maintainer: Fabio <http://kirgroup.com/profile/fabrixxm> + * Maintainer: Tobias <https://diekershoff.homeunix.net/friendika/profile/tobias> + */ + + $a->theme_info = array(); + - - - -$quattro_align = get_pconfig(local_user(), 'quattro', 'align' ); - -if(local_user() && $quattro_align=="center"){ - - $a->page['htmlhead'].=" - <style> - html { width: 100%; margin:0px; padding:0px; } - body { - margin: 50px auto; - width: 900px; - } - </style> - "; - -} diff --git a/view/theme/quattro/wall_item_tag.tpl b/view/theme/quattro/wall_item_tag.tpl new file mode 100644 index 000000000..926fc929d --- /dev/null +++ b/view/theme/quattro/wall_item_tag.tpl @@ -0,0 +1,23 @@ +<div class="wall-item-container item-tag $item.indent"> + <div class="wall-item-item"> + <div class="wall-item-info"> + <div class="contact-photo-wrapper"> + <a href="$item.profile_url" target="redir" title="$item.linktitle" class="contact-photo-link" id="wall-item-photo-link-$item.id"> + <img src="$item.thumb" class="contact-photo$item.sparkle" id="wall-item-photo-$item.id" alt="$item.name" /> + </a> + <ul class="contact-menu menu-popup" id="wall-item-photo-menu-$item.id"> + $item.item_photo_menu + </ul> + + </div> + <div class="wall-item-location">$item.location</div> + </div> + <div class="wall-item-content"> + $item.body + </div> + </div> +</div> + +<div class="wall-item-comment-wrapper" > + $item.comment +</div> diff --git a/view/update_fail_eml.tpl b/view/update_fail_eml.tpl new file mode 100644 index 000000000..f68a3dece --- /dev/null +++ b/view/update_fail_eml.tpl @@ -0,0 +1,11 @@ +Hey,
+I'm $sitename.
+The friendica developers released update $update recently,
+but when I tried to install it, something went terribly wrong.
+This needs to be fixed soon and I can't do it alone. Please contact a
+friendica developer if you can not help me on your own. My database might be invalid.
+
+The error message is '$error'.
+
+I'm sorry,
+your friendica server at $siteurl
\ No newline at end of file |
