diff options
Diffstat (limited to 'view')
96 files changed, 1097 insertions, 457 deletions
diff --git a/view/admin_site.tpl b/view/admin_site.tpl index 01fe893c6..ec144fbba 100644 --- a/view/admin_site.tpl +++ b/view/admin_site.tpl @@ -17,7 +17,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/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 1036e7b75..87994b980 100644 --- a/view/de/messages.po +++ b/view/de/messages.po @@ -16,9 +16,9 @@ msgid "" msgstr "" "Project-Id-Version: friendica\n" "Report-Msgid-Bugs-To: http://bugs.friendica.com/\n" -"POT-Creation-Date: 2012-04-05 10:00-0700\n" -"PO-Revision-Date: 2012-04-06 10:40+0000\n" -"Last-Translator: bavatar <tobias.diekershoff@gmx.net>\n" +"POT-Creation-Date: 2012-04-06 10:00-0700\n" +"PO-Revision-Date: 2012-04-08 23:57+0000\n" +"Last-Translator: zottel <transifex@zottel.net>\n" "Language-Team: German (http://www.transifex.net/projects/p/friendica/language/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -216,7 +216,7 @@ msgstr "l, F j" msgid "Edit event" msgstr "Veranstaltung bearbeiten" -#: ../../mod/events.php:272 ../../include/text.php:1050 +#: ../../mod/events.php:272 ../../include/text.php:1053 msgid "link to source" msgstr "Link zum Originalbeitrag" @@ -410,7 +410,7 @@ msgstr "wurde getaggt in einem" #: ../../view/theme/diabook-red/theme.php:82 #: ../../view/theme/diabook-blue/theme.php:82 #: ../../view/theme/diabook/theme.php:86 -#: ../../view/theme/diabook-aerith/theme.php:82 ../../include/text.php:1294 +#: ../../view/theme/diabook-aerith/theme.php:82 ../../include/text.php:1297 #: ../../include/diaspora.php:1654 ../../include/conversation.php:53 #: ../../include/conversation.php:126 msgid "photo" @@ -2234,7 +2234,7 @@ msgstr "Markierte" msgid "Shared Links" msgstr "Geteilte Links" -#: ../../mod/network.php:270 +#: ../../mod/network.php:274 #, php-format msgid "Warning: This group contains %s member from an insecure network." msgid_plural "" @@ -2242,31 +2242,31 @@ msgid_plural "" msgstr[0] "Warnung: Diese Gruppe beinhaltet %s Person aus einem unsicheren Netzwerk." msgstr[1] "Warnung: Diese Gruppe beinhaltet %s Personen aus unsicheren Netzwerken." -#: ../../mod/network.php:273 +#: ../../mod/network.php:277 msgid "Private messages to this group are at risk of public disclosure." msgstr "Private Nachrichten an diese Gruppe könnten an die Öffentlichkeit geraten." -#: ../../mod/network.php:318 +#: ../../mod/network.php:322 msgid "No such group" msgstr "Es gibt keine solche Gruppe" -#: ../../mod/network.php:329 +#: ../../mod/network.php:333 msgid "Group is empty" msgstr "Gruppe ist leer" -#: ../../mod/network.php:333 +#: ../../mod/network.php:337 msgid "Group: " msgstr "Gruppe: " -#: ../../mod/network.php:343 +#: ../../mod/network.php:347 msgid "Contact: " msgstr "Kontakt: " -#: ../../mod/network.php:345 +#: ../../mod/network.php:349 msgid "Private messages to this person are at risk of public disclosure." msgstr "Private Nachrichten an diese Person könnten an die Öffentlichkeit gelangen." -#: ../../mod/network.php:350 +#: ../../mod/network.php:354 msgid "Invalid contact." msgstr "Ungültiger Kontakt." @@ -2275,7 +2275,7 @@ msgid "Personal Notes" msgstr "Persönliche Notizen" #: ../../mod/notes.php:63 ../../mod/filer.php:30 -#: ../../addon/facebook/facebook.php:673 ../../include/text.php:649 +#: ../../addon/facebook/facebook.php:673 ../../include/text.php:652 msgid "Save" msgstr "Speichern" @@ -2538,7 +2538,7 @@ msgstr "Alle Kontakte (mit gesichertem Profilzugriff)" msgid "No contacts." msgstr "Keine Kontakte." -#: ../../mod/viewcontacts.php:76 ../../include/text.php:586 +#: ../../mod/viewcontacts.php:76 ../../include/text.php:589 msgid "View Contacts" msgstr "Kontakte anzeigen" @@ -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 "" @@ -4397,7 +4397,7 @@ msgstr "Neueste Favoriten" #: ../../view/theme/diabook-red/theme.php:74 #: ../../view/theme/diabook-blue/theme.php:74 #: ../../view/theme/diabook/theme.php:78 -#: ../../view/theme/diabook-aerith/theme.php:74 ../../include/text.php:1292 +#: ../../view/theme/diabook-aerith/theme.php:74 ../../include/text.php:1295 #: ../../include/conversation.php:45 ../../include/conversation.php:118 msgid "event" msgstr "Veranstaltung" @@ -5223,21 +5223,21 @@ msgstr "Verbinde Dienste" #: ../../view/theme/diabook/theme.php:212 #: ../../view/theme/diabook-aerith/theme.php:207 msgid "PostIt to Friendica" -msgstr "PostIt nach Friendica" +msgstr "Bei Friendica posten" #: ../../view/theme/diabook-red/theme.php:207 #: ../../view/theme/diabook-blue/theme.php:207 #: ../../view/theme/diabook/theme.php:212 #: ../../view/theme/diabook-aerith/theme.php:207 msgid "Post to Friendica" -msgstr "Bei Friendica veröffentlichen" +msgstr "Wenn du diesen Link" #: ../../view/theme/diabook-red/theme.php:208 #: ../../view/theme/diabook-blue/theme.php:208 #: ../../view/theme/diabook/theme.php:213 #: ../../view/theme/diabook-aerith/theme.php:208 msgid " from anywhere by bookmarking this Link." -msgstr " von überall her indem du diesen Link zu deinen Lesezeichen hinzufügst." +msgstr "zu deinen Lesezeichen hinzufügst, kannst du von überallher Links bei Friendica veröffentlichen." #: ../../view/theme/diabook-red/theme.php:236 #: ../../view/theme/diabook-blue/theme.php:236 @@ -5695,158 +5695,158 @@ msgstr "(kein Betreff)" msgid "noreply" msgstr "noreply" -#: ../../include/text.php:240 +#: ../../include/text.php:243 msgid "prev" msgstr "vorige" -#: ../../include/text.php:242 +#: ../../include/text.php:245 msgid "first" msgstr "erste" -#: ../../include/text.php:271 +#: ../../include/text.php:274 msgid "last" msgstr "letzte" -#: ../../include/text.php:274 +#: ../../include/text.php:277 msgid "next" msgstr "nächste" -#: ../../include/text.php:565 +#: ../../include/text.php:568 msgid "No contacts" msgstr "Keine Kontakte" -#: ../../include/text.php:574 +#: ../../include/text.php:577 #, php-format msgid "%d Contact" msgid_plural "%d Contacts" msgstr[0] "%d Kontakt" msgstr[1] "%d Kontakte" -#: ../../include/text.php:647 ../../include/nav.php:91 +#: ../../include/text.php:650 ../../include/nav.php:91 msgid "Search" msgstr "Suche" -#: ../../include/text.php:828 +#: ../../include/text.php:831 msgid "Monday" msgstr "Montag" -#: ../../include/text.php:828 +#: ../../include/text.php:831 msgid "Tuesday" msgstr "Dienstag" -#: ../../include/text.php:828 +#: ../../include/text.php:831 msgid "Wednesday" msgstr "Mittwoch" -#: ../../include/text.php:828 +#: ../../include/text.php:831 msgid "Thursday" msgstr "Donnerstag" -#: ../../include/text.php:828 +#: ../../include/text.php:831 msgid "Friday" msgstr "Freitag" -#: ../../include/text.php:828 +#: ../../include/text.php:831 msgid "Saturday" msgstr "Samstag" -#: ../../include/text.php:828 +#: ../../include/text.php:831 msgid "Sunday" msgstr "Sonntag" -#: ../../include/text.php:832 +#: ../../include/text.php:835 msgid "January" msgstr "Januar" -#: ../../include/text.php:832 +#: ../../include/text.php:835 msgid "February" msgstr "Februar" -#: ../../include/text.php:832 +#: ../../include/text.php:835 msgid "March" msgstr "März" -#: ../../include/text.php:832 +#: ../../include/text.php:835 msgid "April" msgstr "April" -#: ../../include/text.php:832 +#: ../../include/text.php:835 msgid "May" msgstr "Mai" -#: ../../include/text.php:832 +#: ../../include/text.php:835 msgid "June" msgstr "Juni" -#: ../../include/text.php:832 +#: ../../include/text.php:835 msgid "July" msgstr "Juli" -#: ../../include/text.php:832 +#: ../../include/text.php:835 msgid "August" msgstr "August" -#: ../../include/text.php:832 +#: ../../include/text.php:835 msgid "September" msgstr "September" -#: ../../include/text.php:832 +#: ../../include/text.php:835 msgid "October" msgstr "Oktober" -#: ../../include/text.php:832 +#: ../../include/text.php:835 msgid "November" msgstr "November" -#: ../../include/text.php:832 +#: ../../include/text.php:835 msgid "December" msgstr "Dezember" -#: ../../include/text.php:916 +#: ../../include/text.php:919 msgid "bytes" msgstr "Byte" -#: ../../include/text.php:933 +#: ../../include/text.php:936 msgid "Categories:" msgstr "Kategorien:" -#: ../../include/text.php:945 +#: ../../include/text.php:948 msgid "remove" msgstr "löschen" -#: ../../include/text.php:945 +#: ../../include/text.php:948 msgid "[remove]" msgstr "[löschen]" -#: ../../include/text.php:948 +#: ../../include/text.php:951 msgid "Filed under:" msgstr "Abgelegt unter:" -#: ../../include/text.php:964 ../../include/text.php:976 +#: ../../include/text.php:967 ../../include/text.php:979 msgid "Click to open/close" msgstr "Zum öffnen/schließen klicken" -#: ../../include/text.php:1068 +#: ../../include/text.php:1071 msgid "Select an alternate language" msgstr "Alternative Sprache auswählen" -#: ../../include/text.php:1080 +#: ../../include/text.php:1083 msgid "default" msgstr "standard" -#: ../../include/text.php:1296 +#: ../../include/text.php:1299 msgid "activity" msgstr "Aktivität" -#: ../../include/text.php:1298 +#: ../../include/text.php:1301 msgid "comment" msgstr "Kommentar" -#: ../../include/text.php:1299 +#: ../../include/text.php:1302 msgid "post" msgstr "Beitrag" -#: ../../include/text.php:1454 +#: ../../include/text.php:1457 msgid "Item filed" msgstr "Beitrag abgelegt" @@ -6220,7 +6220,7 @@ msgstr "%s hat dir eine neue private Nachricht auf %s geschrieben." #: ../../include/enotify.php:42 #, php-format msgid "%s sent you %s." -msgstr "%s hat Dir geschickt %s" +msgstr "%s hat Dir %s geschickt" #: ../../include/enotify.php:42 msgid "a private message" @@ -6316,7 +6316,7 @@ msgstr "%s markierte %s" #: ../../include/enotify.php:121 msgid "your post" -msgstr "Dein Beitrag" +msgstr "Deinen Beitrag" #: ../../include/enotify.php:130 msgid "[Friendica:Notify] Introduction received" diff --git a/view/de/strings.php b/view/de/strings.php index 28567396b..a68a77a75 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"; @@ -1159,9 +1159,9 @@ $a->strings["Invite Friends"] = "Freunde einladen"; $a->strings["Community Pages"] = "Foren"; $a->strings["Help or @NewHere ?"] = "Hilfe oder @NewHere"; $a->strings["Connect Services"] = "Verbinde Dienste"; -$a->strings["PostIt to Friendica"] = "PostIt nach Friendica"; -$a->strings["Post to Friendica"] = "Bei Friendica veröffentlichen"; -$a->strings[" from anywhere by bookmarking this Link."] = " von überall her indem du diesen Link zu deinen Lesezeichen hinzufügst."; +$a->strings["PostIt to Friendica"] = "Bei Friendica posten"; +$a->strings["Post to Friendica"] = "Wenn du diesen Link"; +$a->strings[" from anywhere by bookmarking this Link."] = "zu deinen Lesezeichen hinzufügst, kannst du von überallher Links bei Friendica veröffentlichen."; $a->strings["Your posts and conversations"] = "Deine Beiträge und Unterhaltungen"; $a->strings["Your profile page"] = "Deine Profilseite"; $a->strings["Your contacts"] = "Deine Kontakte"; @@ -1401,7 +1401,7 @@ $a->strings["%s Administrator"] = "der Administrator von %s"; $a->strings["%s <!item_type!>"] = "%s <!item_type!>"; $a->strings["[Friendica:Notify] New mail received at %s"] = "[Friendica Meldung] Neue Nachricht erhalten von %s"; $a->strings["%s sent you a new private message at %s."] = "%s hat dir eine neue private Nachricht auf %s geschrieben."; -$a->strings["%s sent you %s."] = "%s hat Dir geschickt %s"; +$a->strings["%s sent you %s."] = "%s hat Dir %s geschickt"; $a->strings["a private message"] = "eine private Nachricht"; $a->strings["Please visit %s to view and/or reply to your private messages."] = "Bitte besuche %s, um deine privaten Nachrichten anzusehen und/oder zu beantworten."; $a->strings["%s's"] = "%s's"; @@ -1421,7 +1421,7 @@ $a->strings["tagged you"] = "erwähnte Dich"; $a->strings["[Friendica:Notify] %s tagged your post"] = "[Friendica Meldung] %s markierte Deinen Beitrag"; $a->strings["%s tagged your post at %s"] = "%s hat deinen Beitrag auf %s getaggt"; $a->strings["%s tagged %s"] = "%s markierte %s"; -$a->strings["your post"] = "Dein Beitrag"; +$a->strings["your post"] = "Deinen Beitrag"; $a->strings["[Friendica:Notify] Introduction received"] = "[Friendica Meldung] Kontaktanfrage erhalten"; $a->strings["You've received an introduction from '%s' at %s"] = "Du hast eine Kontaktanfrage von '%s' auf %s erhalten"; $a->strings["You've received %s from %s."] = "Du hast %s von %s erhalten."; @@ -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/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/theme/darkzero-NS/theme.php b/view/theme/darkzero-NS/theme.php index 2d3e4fd56..6c1aa7f12 100644 --- a/view/theme/darkzero-NS/theme.php +++ b/view/theme/darkzero-NS/theme.php @@ -11,6 +11,7 @@ $a->theme_info = array( 'extends' => 'duepuntozero', ); +function darkzero_NS_init(&$a) { $a->page['htmlhead'] .= <<< EOT <script> $(document).ready(function() { @@ -57,3 +58,4 @@ $('.savedsearchterm').hover( </script> EOT; +}
\ No newline at end of file diff --git a/view/theme/darkzero/theme.php b/view/theme/darkzero/theme.php index 8c4d3e9ac..bbba3ef74 100644 --- a/view/theme/darkzero/theme.php +++ b/view/theme/darkzero/theme.php @@ -12,6 +12,7 @@ $a->theme_info = array( 'extends' => 'duepuntozero', ); +function darkzero_init(&$a) { $a->page['htmlhead'] .= <<< EOT <script> $(document).ready(function() { @@ -58,3 +59,4 @@ $('.savedsearchterm').hover( </script> EOT; +}
\ No newline at end of file diff --git a/view/theme/diabook-aerith/comment_item.tpl b/view/theme/diabook-aerith/comment_item.tpl new file mode 100644 index 000000000..6e455b726 --- /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);" onBlur="commentClose(this,$id);" >$comment</textarea> + <a class="icon bb-video" onclick="insertFormatting('video',$id);">video</a> + <a class="icon bb-image" onclick="insertFormatting('img',$id);">img</a> + <a class="icon bb-url" onclick="insertFormatting('url',$id);">url</a> + <a class="icon quote" onclick="insertFormatting('quote',$id);">quote</a> + <a class="icon italic" onclick="insertFormatting('i',$id);">i</a> + <a class="icon underline" onclick="insertFormatting('u',$id);">u</a> + <a class="icon bold" onclick="insertFormatting('b',$id);">b</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/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/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/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/messages.png b/view/theme/diabook-aerith/icons/messages.png Binary files differindex e2bf7d24d..c83ba186a 100755 --- a/view/theme/diabook-aerith/icons/messages.png +++ b/view/theme/diabook-aerith/icons/messages.png diff --git a/view/theme/diabook-aerith/icons/messages3.png b/view/theme/diabook-aerith/icons/messages3.png Binary files differnew file mode 100755 index 000000000..e2bf7d24d --- /dev/null +++ b/view/theme/diabook-aerith/icons/messages3.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 --- 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 100755 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 --- a/view/theme/diabook-aerith/icons/notify.png +++ b/view/theme/diabook-aerith/icons/notify.png diff --git a/view/theme/diabook-aerith/icons/notify3.png b/view/theme/diabook-aerith/icons/notify3.png Binary files differnew file mode 100755 index 000000000..9765bfd53 --- /dev/null +++ b/view/theme/diabook-aerith/icons/notify3.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/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/oembed_video.tpl b/view/theme/diabook-aerith/oembed_video.tpl new file mode 100644 index 000000000..d6d29f724 --- /dev/null +++ b/view/theme/diabook-aerith/oembed_video.tpl @@ -0,0 +1,4 @@ +<a class="embed_yt" href='$embedurl' onclick='this.innerHTML=Base64.decode("$escapedhtml"); yt_iframe(); return false;' style='float:left; margin: 1em; position: relative;'> + <img width='$tw' height='$th' src='$turl' > + <div style='position: absolute; top: 0px; left: 0px; width: $twpx; height: $thpx; background: url(images/icons/48/play.png) no-repeat center center;'></div> +</a> diff --git a/view/theme/diabook-aerith/style-network.css b/view/theme/diabook-aerith/style-network.css index 3b461e6db..385b58ac4 100644 --- a/view/theme/diabook-aerith/style-network.css +++ b/view/theme/diabook-aerith/style-network.css @@ -1298,6 +1298,7 @@ transition: all 0.2s ease-in-out; padding: 5px; margin-bottom: 0px; width: 575px; + padding-top: 10px; } .tread-wrapper a{ color: #3465A4; @@ -1447,7 +1448,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; } @@ -2173,7 +2174,7 @@ blockquote { color: #777; } .oembed { - font-size: large; + font-weight: bold; } .aprofile dt{ diff --git a/view/theme/diabook-aerith/style-profile.css b/view/theme/diabook-aerith/style-profile.css index 73f46e9ee..078b6d01f 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; @@ -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; @@ -2162,7 +2163,7 @@ blockquote { color: #777; } .oembed { - font-size: large; + font-weight: bold; } .aprofile dt{ diff --git a/view/theme/diabook-aerith/style.css b/view/theme/diabook-aerith/style.css index f82652154..d1611d326 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 { @@ -1276,7 +1305,7 @@ body .pageheader{ font-size: 20px; margin-bottom: 20px; margin-top: 0px; - max-width: 575px; + max-width: 775px; } .qcomment{ max-width: 122px; @@ -1331,6 +1360,7 @@ body .pageheader{ padding: 5px; margin-bottom: 0px; width: 775px; + padding-top: 10px; } .tread-wrapper a{ color: #3465A4; @@ -1592,7 +1622,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; @@ -2324,7 +2354,7 @@ blockquote { color: #777; } .oembed { - font-size: large; + font-weight: bold; } .aprofile dt{ diff --git a/view/theme/diabook-aerith/theme.php b/view/theme/diabook-aerith/theme.php index a1ea51e82..c0537b010 100755 --- 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.014) + * Version: (Version: 1.016) * Author: */ //print diabook-version for debugging -$diabook_version = "Diabook-aerith (Version: 1.014)"; +$diabook_version = "Diabook-aerith (Version: 1.016)"; $a->page['htmlhead'] .= sprintf('<script "%s" ></script>', $diabook_version); @@ -366,6 +366,35 @@ $a->page['htmlhead'] .= ' </script>'; +$a->page['htmlhead'] .= ' + <script> + +$(document).ready(function() { + $("iframe").each(function(){ + var ifr_source = $(this).attr("src"); + var wmode = "wmode=transparent"; + if(ifr_source.indexOf("?") != -1) { + var getQString = ifr_source.split("?"); + var oldString = getQString[1]; + var newString = getQString[0]; + $(this).attr("src",newString+"?"+wmode+"&"+oldString); + } + else $(this).attr("src",ifr_source+"?"+wmode); + }); + + +}); + +function yt_iframe() { + + $("iframe").load(function() { + var ifr_src = $(this).contents().find("body iframe").attr("src"); + $("iframe").contents().find("body iframe").attr("src", ifr_src+"&wmode=transparent"); + }); + + }; + + </script>'; if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname'] or $a->argv[0] === "network" && local_user()){ $a->page['htmlhead'] .= ' @@ -374,7 +403,12 @@ $a->page['htmlhead'] .= ' $(function() { $(".oembed.photo img").aeImageResize({height: 400, width: 400}); }); +</script>'; + + if($ccCookie != "8") { +$a->page['htmlhead'] .= ' +<script> $("right_aside").ready(function(){ if($.cookie("close_pages") == "1") @@ -458,9 +492,10 @@ function close_lastlikes(){ document.getElementById( "close_lastlikes" ).style.display = "none"; $.cookie("close_lastlikes","1", { expires: 365, path: "/" }); }; - - +</script>';} +$a->page['htmlhead'] .= ' +<script> function restore_boxes(){ $.cookie("close_pages","2", { expires: 365, path: "/" }); $.cookie("close_helpers","2", { expires: 365, path: "/" }); @@ -471,5 +506,38 @@ function restore_boxes(){ $.cookie("close_lastphotos","2", { expires: 365, path: "/" }); $.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(BBcode,id) { + + var tmpStr = $("#comment-edit-text-" + id).val(); + if(tmpStr == "Kommentar") { + 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-blue/comment_item.tpl b/view/theme/diabook-blue/comment_item.tpl new file mode 100644 index 000000000..6e455b726 --- /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);" onBlur="commentClose(this,$id);" >$comment</textarea> + <a class="icon bb-video" onclick="insertFormatting('video',$id);">video</a> + <a class="icon bb-image" onclick="insertFormatting('img',$id);">img</a> + <a class="icon bb-url" onclick="insertFormatting('url',$id);">url</a> + <a class="icon quote" onclick="insertFormatting('quote',$id);">quote</a> + <a class="icon italic" onclick="insertFormatting('i',$id);">i</a> + <a class="icon underline" onclick="insertFormatting('u',$id);">u</a> + <a class="icon bold" onclick="insertFormatting('b',$id);">b</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/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/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/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/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/oembed_video.tpl b/view/theme/diabook-blue/oembed_video.tpl new file mode 100644 index 000000000..d6d29f724 --- /dev/null +++ b/view/theme/diabook-blue/oembed_video.tpl @@ -0,0 +1,4 @@ +<a class="embed_yt" href='$embedurl' onclick='this.innerHTML=Base64.decode("$escapedhtml"); yt_iframe(); return false;' style='float:left; margin: 1em; position: relative;'> + <img width='$tw' height='$th' src='$turl' > + <div style='position: absolute; top: 0px; left: 0px; width: $twpx; height: $thpx; background: url(images/icons/48/play.png) no-repeat center center;'></div> +</a> diff --git a/view/theme/diabook-blue/style-network.css b/view/theme/diabook-blue/style-network.css index bd1cb249c..b37d82968 100644 --- a/view/theme/diabook-blue/style-network.css +++ b/view/theme/diabook-blue/style-network.css @@ -1260,6 +1260,7 @@ transition: all 0.2s ease-in-out; padding: 5px; margin-bottom: 0px; width: 575px; + padding-top: 10px; } .tread-wrapper a{ color: #1872A2; @@ -1409,7 +1410,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; } @@ -2134,7 +2135,7 @@ blockquote { color: #777; } .oembed { - font-size: large; + font-weight: bold; } .aprofile dt{ diff --git a/view/theme/diabook-blue/style-profile.css b/view/theme/diabook-blue/style-profile.css index da826d74c..ae7fa8d14 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; @@ -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; @@ -2129,7 +2130,7 @@ blockquote { color: #777; } .oembed { - font-size: large; + font-weight: bold; } .aprofile dt{ diff --git a/view/theme/diabook-blue/style.css b/view/theme/diabook-blue/style.css index ebf684708..f4eebe072 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 { @@ -1236,7 +1264,7 @@ body .pageheader{ font-size: 20px; margin-bottom: 20px; margin-top: 0px; - max-width: 575px; + max-width: 775px; } .qcomment{ max-width: 122px; @@ -1287,6 +1315,7 @@ body .pageheader{ padding: 5px; margin-bottom: 0px; width: 775px; + padding-top: 10px; } .tread-wrapper a{ color: #1872A2; @@ -1550,7 +1579,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; @@ -2281,7 +2310,7 @@ blockquote { color: #777; } .oembed { - font-size: large; + font-weight: bold; } .aprofile dt{ diff --git a/view/theme/diabook-blue/theme.php b/view/theme/diabook-blue/theme.php index a8b4fcd6c..435ecaf92 100755 --- 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.014) + * Version: (Version: 1.016) * Author: */ //print diabook-version for debugging -$diabook_version = "Diabook-blue (Version: 1.014)"; +$diabook_version = "Diabook-blue (Version: 1.016)"; $a->page['htmlhead'] .= sprintf('<script "%s" ></script>', $diabook_version); //change css on network and profilepages @@ -366,15 +366,50 @@ $a->page['htmlhead'] .= ' </script>'; +$a->page['htmlhead'] .= ' + <script> + +$(document).ready(function() { + $("iframe").each(function(){ + var ifr_source = $(this).attr("src"); + var wmode = "wmode=transparent"; + if(ifr_source.indexOf("?") != -1) { + var getQString = ifr_source.split("?"); + var oldString = getQString[1]; + var newString = getQString[0]; + $(this).attr("src",newString+"?"+wmode+"&"+oldString); + } + else $(this).attr("src",ifr_source+"?"+wmode); + }); + + +}); + +function yt_iframe() { + + $("iframe").load(function() { + var ifr_src = $(this).contents().find("body iframe").attr("src"); + $("iframe").contents().find("body iframe").attr("src", ifr_src+"&wmode=transparent"); + }); + + }; + + </script>'; + if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname'] or $a->argv[0] === "network" && local_user()){ $a->page['htmlhead'] .= ' <script> -$(function() { + $(function() { $(".oembed.photo img").aeImageResize({height: 400, width: 400}); }); +</script>'; + + if($ccCookie != "8") { +$a->page['htmlhead'] .= ' +<script> $("right_aside").ready(function(){ if($.cookie("close_pages") == "1") @@ -458,9 +493,10 @@ function close_lastlikes(){ document.getElementById( "close_lastlikes" ).style.display = "none"; $.cookie("close_lastlikes","1", { expires: 365, path: "/" }); }; - - +</script>';} +$a->page['htmlhead'] .= ' +<script> function restore_boxes(){ $.cookie("close_pages","2", { expires: 365, path: "/" }); $.cookie("close_helpers","2", { expires: 365, path: "/" }); @@ -471,5 +507,38 @@ function restore_boxes(){ $.cookie("close_lastphotos","2", { expires: 365, path: "/" }); $.cookie("close_lastlikes","2", { expires: 365, path: "/" }); alert("Right-hand column was restored. Please refresh your browser"); - }; + } </script>';} + +$a->page['htmlhead'] .= ' + +<script type="text/javascript"> +function insertFormatting(BBcode,id) { + + var tmpStr = $("#comment-edit-text-" + id).val(); + if(tmpStr == "Kommentar") { + 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-red/comment_item.tpl b/view/theme/diabook-red/comment_item.tpl new file mode 100644 index 000000000..64e4fb802 --- /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);" onBlur="commentClose(this,$id);" >$comment</textarea> + <a class="icon bb-video" onclick="insertFormatting('video',$id);">video</a> + <a class="icon bb-image" onclick="insertFormatting('img',$id);">img</a> + <a class="icon bb-url" onclick="insertFormatting('url',$id);">url</a> + <a class="icon quote" onclick="insertFormatting('quote',$id);">quote</a> + <a class="icon italic" onclick="insertFormatting('i',$id);">i</a> + <a class="icon underline" onclick="insertFormatting('u',$id);">u</a> + <a class="icon bold" onclick="insertFormatting('b',$id);">b</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/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/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/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/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/oembed_video.tpl b/view/theme/diabook-red/oembed_video.tpl new file mode 100644 index 000000000..d6d29f724 --- /dev/null +++ b/view/theme/diabook-red/oembed_video.tpl @@ -0,0 +1,4 @@ +<a class="embed_yt" href='$embedurl' onclick='this.innerHTML=Base64.decode("$escapedhtml"); yt_iframe(); return false;' style='float:left; margin: 1em; position: relative;'> + <img width='$tw' height='$th' src='$turl' > + <div style='position: absolute; top: 0px; left: 0px; width: $twpx; height: $thpx; background: url(images/icons/48/play.png) no-repeat center center;'></div> +</a> diff --git a/view/theme/diabook-red/style-network.css b/view/theme/diabook-red/style-network.css index efbec090a..8be39e374 100644 --- a/view/theme/diabook-red/style-network.css +++ b/view/theme/diabook-red/style-network.css @@ -1295,6 +1295,7 @@ transition: all 0.2s ease-in-out; padding: 5px; margin-bottom: 0px; width: 575px; + padding-top: 10px; } .tread-wrapper a{ color: red; @@ -1444,7 +1445,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; } @@ -2171,7 +2172,7 @@ blockquote { color: #777; } .oembed { - font-size: large; + font-weight: bold; } .aprofile dt{ diff --git a/view/theme/diabook-red/style-profile.css b/view/theme/diabook-red/style-profile.css index ef6fd8601..242c08c68 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; @@ -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; @@ -2143,7 +2144,7 @@ blockquote { color: #777; } .oembed { - font-size: large; + font-weight: bold; } .aprofile dt{ diff --git a/view/theme/diabook-red/style.css b/view/theme/diabook-red/style.css index ef06ef5ca..0acc12dd3 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 { @@ -1266,7 +1294,7 @@ body .pageheader{ font-size: 20px; margin-bottom: 20px; margin-top: 0px; - max-width: 575px; + max-width: 775px; } .qcomment{ max-width: 122px; @@ -1317,6 +1345,7 @@ body .pageheader{ padding: 5px; margin-bottom: 0px; width: 775px; + padding-top: 10px; } .tread-wrapper a{ color: red; @@ -1579,7 +1608,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; @@ -2310,7 +2339,7 @@ blockquote { color: #777; } .oembed { - font-size: large; + font-weight: bold; } .aprofile dt{ diff --git a/view/theme/diabook-red/theme.php b/view/theme/diabook-red/theme.php index fae26ae70..d1b932f1c 100755 --- 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.014) + * Version: (Version: 1.016) * Author: */ //print diabook-version for debugging -$diabook_version = "Diabook-red (Version: 1.014)"; +$diabook_version = "Diabook-red (Version: 1.016)"; $a->page['htmlhead'] .= sprintf('<script "%s" ></script>', $diabook_version); //change css on network and profilepages @@ -367,15 +367,50 @@ $a->page['htmlhead'] .= ' </script>'; +$a->page['htmlhead'] .= ' + <script> + +$(document).ready(function() { + $("iframe").each(function(){ + var ifr_source = $(this).attr("src"); + var wmode = "wmode=transparent"; + if(ifr_source.indexOf("?") != -1) { + var getQString = ifr_source.split("?"); + var oldString = getQString[1]; + var newString = getQString[0]; + $(this).attr("src",newString+"?"+wmode+"&"+oldString); + } + else $(this).attr("src",ifr_source+"?"+wmode); + }); + + +}); + +function yt_iframe() { + + $("iframe").load(function() { + var ifr_src = $(this).contents().find("body iframe").attr("src"); + $("iframe").contents().find("body iframe").attr("src", ifr_src+"&wmode=transparent"); + }); + + }; + + </script>'; + if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname'] or $a->argv[0] === "network" && local_user()){ $a->page['htmlhead'] .= ' <script> -$(function() { + $(function() { $(".oembed.photo img").aeImageResize({height: 400, width: 400}); }); +</script>'; + + if($ccCookie != "8") { +$a->page['htmlhead'] .= ' +<script> $("right_aside").ready(function(){ if($.cookie("close_pages") == "1") @@ -459,9 +494,10 @@ function close_lastlikes(){ document.getElementById( "close_lastlikes" ).style.display = "none"; $.cookie("close_lastlikes","1", { expires: 365, path: "/" }); }; - - +</script>';} +$a->page['htmlhead'] .= ' +<script> function restore_boxes(){ $.cookie("close_pages","2", { expires: 365, path: "/" }); $.cookie("close_helpers","2", { expires: 365, path: "/" }); @@ -472,5 +508,38 @@ function restore_boxes(){ $.cookie("close_lastphotos","2", { expires: 365, path: "/" }); $.cookie("close_lastlikes","2", { expires: 365, path: "/" }); alert("Right-hand column was restored. Please refresh your browser"); - }; + } </script>';} + +$a->page['htmlhead'] .= ' + +<script type="text/javascript"> +function insertFormatting(BBcode,id) { + + var tmpStr = $("#comment-edit-text-" + id).val(); + if(tmpStr == "Kommentar") { + 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/comment_item.tpl b/view/theme/diabook/comment_item.tpl new file mode 100644 index 000000000..535134256 --- /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);" onBlur="commentClose(this,$id);" >$comment</textarea> + <a class="icon bb-video" onclick="insertFormatting('video',$id);">video</a> + <a class="icon bb-image" onclick="insertFormatting('img',$id);">img</a> + <a class="icon bb-url" onclick="insertFormatting('url',$id);">url</a> + <a class="icon quote" onclick="insertFormatting('quote',$id);">quote</a> + <a class="icon italic" onclick="insertFormatting('i',$id);">i</a> + <a class="icon underline" onclick="insertFormatting('u',$id);">u</a> + <a class="icon bold" onclick="insertFormatting('b',$id);">b</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/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/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/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/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/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/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/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/oembed_video.tpl b/view/theme/diabook/oembed_video.tpl index 026007271..d6d29f724 100644 --- a/view/theme/diabook/oembed_video.tpl +++ b/view/theme/diabook/oembed_video.tpl @@ -1,4 +1,4 @@ -<a class="embed_yt" href='$embedurl' onclick='this.innerHTML=Base64.decode("$escapedhtml"); return false;' style='float:left; margin: 1em; position: relative;'> +<a class="embed_yt" href='$embedurl' onclick='this.innerHTML=Base64.decode("$escapedhtml"); yt_iframe(); return false;' style='float:left; margin: 1em; position: relative;'> <img width='$tw' height='$th' src='$turl' > <div style='position: absolute; top: 0px; left: 0px; width: $twpx; height: $thpx; background: url(images/icons/48/play.png) no-repeat center center;'></div> </a> diff --git a/view/theme/diabook/style-network.css b/view/theme/diabook/style-network.css index af6e4027a..ed7c76cbe 100644 --- a/view/theme/diabook/style-network.css +++ b/view/theme/diabook/style-network.css @@ -1241,6 +1241,7 @@ transition: all 0.2s ease-in-out; padding: 5px; margin-bottom: 0px; width: 575px; + padding-top: 10px; } .wall-item-decor { position: absolute; @@ -1385,7 +1386,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; @@ -2103,7 +2104,6 @@ blockquote { color: #777; } .oembed { - font-size: large; font-weight: bold; } .aprofile dt{ @@ -2549,4 +2549,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-profile.css b/view/theme/diabook/style-profile.css index 6b05903d3..51eb61253 100644 --- a/view/theme/diabook/style-profile.css +++ b/view/theme/diabook/style-profile.css @@ -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; @@ -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; @@ -2100,7 +2101,6 @@ blockquote { color: #777; } .oembed { - font-size: large; font-weight: bold; } .aprofile dt{ @@ -2546,4 +2546,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-settings.css b/view/theme/diabook/style-settings.css index 60e2f336b..fdb4f24c7 100644 --- a/view/theme/diabook/style-settings.css +++ b/view/theme/diabook/style-settings.css @@ -2526,4 +2526,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 e99aa5644..7105ad0e3 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 { @@ -1219,7 +1248,7 @@ body .pageheader{ font-size: 20px; margin-bottom: 20px; margin-top: 0px; - max-width: 575px; + max-width: 775px; } .qcomment{ max-width: 122px; @@ -1269,6 +1298,7 @@ body .pageheader{ padding: 5px; margin-bottom: 0px; width: 775px; + padding-top: 10px; } .wall-item-decor { @@ -1516,7 +1546,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; @@ -2246,7 +2276,6 @@ blockquote { color: #777; } .oembed { - font-size: large; font-weight: bold; } .aprofile dt{ @@ -2687,4 +2716,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/theme.php b/view/theme/diabook/theme.php index fbe42a304..4acb058e5 100755 --- a/view/theme/diabook/theme.php +++ b/view/theme/diabook/theme.php @@ -3,13 +3,13 @@ /* * 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.014) + * Version: (Version: 1.016) * Author: */ //print diabook-version for debugging -$diabook_version = "Diabook (Version: 1.014)"; +$diabook_version = "Diabook (Version: 1.016)"; $a->page['htmlhead'] .= sprintf('<script "%s" ></script>', $diabook_version); //change css on network and profilepages @@ -376,11 +376,12 @@ $a->page['htmlhead'] .= ' </script>'; + $a->page['htmlhead'] .= ' <script> $(document).ready(function() { - $(".embed_yt iframe").each(function(){ + $("iframe").each(function(){ var ifr_source = $(this).attr("src"); var wmode = "wmode=transparent"; if(ifr_source.indexOf("?") != -1) { @@ -391,7 +392,18 @@ $(document).ready(function() { } else $(this).attr("src",ifr_source+"?"+wmode); }); + + }); + +function yt_iframe() { + + $("iframe").load(function() { + var ifr_src = $(this).contents().find("body iframe").attr("src"); + $("iframe").contents().find("body iframe").attr("src", ifr_src+"&wmode=transparent"); + }); + + }; </script>'; @@ -403,7 +415,12 @@ $a->page['htmlhead'] .= ' $(function() { $(".oembed.photo img").aeImageResize({height: 400, width: 400}); }); +</script>'; + + if($ccCookie != "8") { +$a->page['htmlhead'] .= ' +<script> $("right_aside").ready(function(){ if($.cookie("close_pages") == "1") @@ -487,9 +504,10 @@ function close_lastlikes(){ document.getElementById( "close_lastlikes" ).style.display = "none"; $.cookie("close_lastlikes","1", { expires: 365, path: "/" }); }; - - +</script>';} +$a->page['htmlhead'] .= ' +<script> function restore_boxes(){ $.cookie("close_pages","2", { expires: 365, path: "/" }); $.cookie("close_helpers","2", { expires: 365, path: "/" }); @@ -500,5 +518,38 @@ function restore_boxes(){ $.cookie("close_lastphotos","2", { expires: 365, path: "/" }); $.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(BBcode,id) { + + var tmpStr = $("#comment-edit-text-" + id).val(); + if(tmpStr == "Kommentar") { + 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/dispy-dark/communityhome.tpl b/view/theme/dispy-dark/communityhome.tpl index 340b7216c..edabab611 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. </div> -{{ endif }} diff --git a/view/theme/dispy-dark/default.php b/view/theme/dispy-dark/default.php index e74ec1a4f..32393f08d 100644 --- a/view/theme/dispy-dark/default.php +++ b/view/theme/dispy-dark/default.php @@ -6,15 +6,31 @@ <?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> + <!-- header stuff will go here --> + </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="page-footer"> + <?php if(x($page,'footer')) echo $page['footer']; ?> + </footer> </body> </html> diff --git a/view/theme/dispy-dark/style.css b/view/theme/dispy-dark/style.css index a3248c13c..1f776eed7 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; @@ -707,12 +709,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 +748,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 { @@ -1064,12 +1070,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 **/ @@ -1333,19 +1340,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; @@ -2603,8 +2610,8 @@ div[id$="wrapper"] br { } .icon.drop, .icon.drophide, .icon.delete { - float: right; - margin: 5px; + float: left; + /*margin: 5px;*/ } .icon.s22.delete { display: block; @@ -2776,7 +2783,7 @@ div[id$="wrapper"] br { } footer { display: block; - margin: 50px 20%; + /*margin: 50px 20%;*/ clear: both; } #profile-jot-text { diff --git a/view/theme/dispy-dark/theme.php b/view/theme/dispy-dark/theme.php index e1dc8ba0c..c9028b9a9 100644 --- a/view/theme/dispy-dark/theme.php +++ b/view/theme/dispy-dark/theme.php @@ -3,126 +3,135 @@ /* * 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"; - }); - - $('#profiles-menu').click(function(event) { - event.stopPropagation(); - }); +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'); + 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"; + }); + + $('#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'}); + }); - // 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'}); }); - -}); -</script> + </script> EOT; +} -function dispydark_community_info() { +function dispy_dark_community_info() { $a = get_app(); + $url = $a->get_baseurl($ssl_state); + $aside['$url'] = $url; - $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=' + + $fpostitJS = <<<FPI + 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)); @@ -135,18 +144,11 @@ function dispydark_community_info() { } else { a_funct(); } - })();"; + })(); +FPI; - $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); + $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(); -//} - diff --git a/view/theme/dispy/communityhome.tpl b/view/theme/dispy/communityhome.tpl index 340b7216c..edabab611 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. </div> -{{ endif }} diff --git a/view/theme/dispy/default.php b/view/theme/dispy/default.php index e74ec1a4f..32393f08d 100644 --- a/view/theme/dispy/default.php +++ b/view/theme/dispy/default.php @@ -6,15 +6,31 @@ <?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> + <!-- header stuff will go here --> + </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="page-footer"> + <?php if(x($page,'footer')) echo $page['footer']; ?> + </footer> </body> </html> diff --git a/view/theme/dispy/nav.tpl b/view/theme/dispy/nav.tpl index e38b2bbe2..34aba50de 100644 --- a/view/theme/dispy/nav.tpl +++ b/view/theme/dispy/nav.tpl @@ -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 }} diff --git a/view/theme/dispy/style.css b/view/theme/dispy/style.css index 622cf5734..70d722e81 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; @@ -707,12 +710,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 +749,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; @@ -1064,12 +1071,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 **/ @@ -1333,19 +1341,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; @@ -2603,8 +2611,8 @@ div[id$="wrapper"] br { } .icon.drop, .icon.drophide, .icon.delete { - float: right; - margin: 5px; + float: left; + /*margin: 5px;*/ } .icon.s22.delete { display: block; @@ -2776,7 +2784,7 @@ div[id$="wrapper"] br { } footer { display: block; - margin: 50px 20%; + /*margin: 50px 20%;*/ clear: both; } #profile-jot-text { diff --git a/view/theme/dispy/theme.php b/view/theme/dispy/theme.php index d0f6797cb..5df193aa6 100644 --- a/view/theme/dispy/theme.php +++ b/view/theme/dispy/theme.php @@ -3,122 +3,135 @@ /* * 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"; - }); - - $('#profiles-menu').click(function(event) { - event.stopPropagation(); - }); +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'); + 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"; + }); + + $('#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'}); + }); - // 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'}); }); - -}); -</script> + </script> EOT; +} function dispy_community_info() { $a = get_app(); + $url = $a->get_baseurl($ssl_state); + $aside['$url'] = $url; - $fostitJS = "javascript: (function() { - the_url = '".$a->get_baseurl($ssl_state)."/view/theme/dispy-dark/fpostit/fpostit.php?url=' + + $fpostitJS = <<<FPI + 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)); @@ -131,17 +144,11 @@ function dispy_community_info() { } else { a_funct(); } - })();"; + })(); +FPI; - $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); + $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(); -} 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/duepuntozero/theme.php b/view/theme/duepuntozero/theme.php index 701fb1349..7b42088e1 100644 --- a/view/theme/duepuntozero/theme.php +++ b/view/theme/duepuntozero/theme.php @@ -1,6 +1,7 @@ <?php $a->theme_info = array(); +function duepuntozero_init(&$a) { $a->page['htmlhead'] .= <<< EOT <script> $(document).ready(function() { @@ -47,3 +48,4 @@ $('.savedsearchterm').hover( </script> EOT; +} diff --git a/view/theme/greenzero/theme.php b/view/theme/greenzero/theme.php index ceec4dd97..c80202475 100644 --- a/view/theme/greenzero/theme.php +++ b/view/theme/greenzero/theme.php @@ -3,6 +3,7 @@ $a->theme_info = array( 'extends' => 'duepuntozero', ); +function greenzero_init(&$a) { $a->page['htmlhead'] .= <<< EOT <script> $(document).ready(function() { @@ -49,3 +50,4 @@ $('.savedsearchterm').hover( </script> EOT; +}
\ No newline at end of file diff --git a/view/theme/purplezero/theme.php b/view/theme/purplezero/theme.php index ceec4dd97..b9613027c 100644 --- a/view/theme/purplezero/theme.php +++ b/view/theme/purplezero/theme.php @@ -3,6 +3,7 @@ $a->theme_info = array( 'extends' => 'duepuntozero', ); +function purplezero_init(&$a) { $a->page['htmlhead'] .= <<< EOT <script> $(document).ready(function() { @@ -49,3 +50,4 @@ $('.savedsearchterm').hover( </script> EOT; +}
\ No newline at end of file diff --git a/view/theme/slack-NS/theme.php b/view/theme/slack-NS/theme.php index ceec4dd97..a8934d03b 100644 --- a/view/theme/slack-NS/theme.php +++ b/view/theme/slack-NS/theme.php @@ -3,6 +3,7 @@ $a->theme_info = array( 'extends' => 'duepuntozero', ); +function slack_NS_init(&$a) { $a->page['htmlhead'] .= <<< EOT <script> $(document).ready(function() { @@ -49,3 +50,4 @@ $('.savedsearchterm').hover( </script> EOT; +}
\ No newline at end of file diff --git a/view/theme/slackr/theme.php b/view/theme/slackr/theme.php index ceec4dd97..78f5d40f0 100644 --- a/view/theme/slackr/theme.php +++ b/view/theme/slackr/theme.php @@ -3,6 +3,7 @@ $a->theme_info = array( 'extends' => 'duepuntozero', ); +function slackr_init(&$a) { $a->page['htmlhead'] .= <<< EOT <script> $(document).ready(function() { @@ -49,3 +50,4 @@ $('.savedsearchterm').hover( </script> EOT; +}
\ No newline at end of file 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 |
