diff options
Diffstat (limited to 'view')
| -rw-r--r-- | view/de/strings.php | 46 | ||||
| -rw-r--r-- | view/theme/redbasic/css/dark.css | 4 | ||||
| -rw-r--r-- | view/theme/redbasic/css/fancy.css | 3 | ||||
| -rw-r--r-- | view/theme/redbasic/css/style.css | 14 | ||||
| -rw-r--r-- | view/theme/redbasic/php/config.php | 1 | ||||
| -rw-r--r-- | view/theme/redbasic/php/style.php | 44 |
6 files changed, 66 insertions, 46 deletions
diff --git a/view/de/strings.php b/view/de/strings.php index 564c36a2f..19d0331f6 100644 --- a/view/de/strings.php +++ b/view/de/strings.php @@ -163,35 +163,35 @@ $a->strings["Post Composition Features"] = "Nachbearbeitungsfunktionen"; $a->strings["Richtext Editor"] = "Formatierungseditor"; $a->strings["Enable richtext editor"] = "Aktiviere Formatierungseditor"; $a->strings["Post Preview"] = "Voransicht"; -$a->strings["Allow previewing posts and comments before publishing them"] = "Erlaube Voransicht von Posts und Kommentaren vor Veröffentlichung"; +$a->strings["Allow previewing posts and comments before publishing them"] = "Erlaube Voransicht von Beiträgen und Kommentaren vor Veröffentlichung"; $a->strings["Network and Stream Filtering"] = "Netzwerk- und Stream-Filter"; $a->strings["Search by Date"] = "Suche nach Datum"; -$a->strings["Ability to select posts by date ranges"] = "Möglichkeit, Posts nach Zeiträumen auszuwählen"; +$a->strings["Ability to select posts by date ranges"] = "Möglichkeit, Beiträge nach Zeiträumen auszuwählen"; $a->strings["Collections Filter"] = "Filter für Sammlung"; -$a->strings["Enable widget to display Network posts only from selected collections"] = "Aktiviere nur Netzwerk-Posts von ausgewählten Sammlungen"; +$a->strings["Enable widget to display Network posts only from selected collections"] = "Aktiviere nur Netzwerk-Beiträge von ausgewählten Sammlungen"; $a->strings["Saved Searches"] = "Gesicherte Suchanfragen"; $a->strings["Save search terms for re-use"] = "Gesicherte Suchbegriffe zur Wiederverwendung"; $a->strings["Network Personal Tab"] = "Persönlicher Netzwerkreiter"; -$a->strings["Enable tab to display only Network posts that you've interacted on"] = "Aktiviere Reiter für nur die Netzwerk-Post, mit denen Du interagiert hast"; +$a->strings["Enable tab to display only Network posts that you've interacted on"] = "Aktiviere Reiter für nur die Netzwerk-Beiträge, mit denen Du interagiert hast"; $a->strings["Network New Tab"] = "Netzwerkreiter Neu"; $a->strings["Enable tab to display all new Network activity"] = "Aktiviere Reiter, um alle neuen Netzwerkaktivitäten zu zeigen"; $a->strings["Affinity Tool"] = "Beziehungs-Tool"; $a->strings["Filter stream activity by depth of relationships"] = "Filter Aktivitätenstream nach Tiefe der Beziehung"; -$a->strings["Post/Comment Tools"] = "Post-/Kommentar-Tools"; +$a->strings["Post/Comment Tools"] = "Beitrag-/Kommentar-Tools"; $a->strings["Multiple Deletion"] = "Mehrfachlöschung"; -$a->strings["Select and delete multiple posts/comments at once"] = "Mehrfachlöschung und -auswahl von Posts/Kommentaren in einem Rutsch"; +$a->strings["Select and delete multiple posts/comments at once"] = "Mehrfachlöschung und -auswahl von Beiträgen/Kommentaren in einem Rutsch"; $a->strings["Edit Sent Posts"] = "Bearbeite gesendete Posts"; -$a->strings["Edit and correct posts and comments after sending"] = "Bearbeite und korrigiere Posts und Kommentare nach dem Senden"; +$a->strings["Edit and correct posts and comments after sending"] = "Bearbeite und korrigiere Beiträge und Kommentare nach dem Senden"; $a->strings["Tagging"] = "Verschlagworten"; -$a->strings["Ability to tag existing posts"] = "Möglichkeit, um existierende Posts zu verschlagworten"; -$a->strings["Post Categories"] = "Post-Kategorien"; -$a->strings["Add categories to your posts"] = "Kategorien für Posts"; +$a->strings["Ability to tag existing posts"] = "Möglichkeit, um existierende Beiträge zu verschlagworten"; +$a->strings["Post Categories"] = "Beitrags-Kategorien"; +$a->strings["Add categories to your posts"] = "Kategorien für Beiträge"; $a->strings["Saved Folders"] = "Gesicherter Ordner"; -$a->strings["Ability to file posts under folders"] = "Möglichkeit, Post in Verzeichnissen zu sammeln"; -$a->strings["Dislike Posts"] = "Gefällt-mir-nicht Posts"; -$a->strings["Ability to dislike posts/comments"] = "Möglichkeit für Gefällt-mir-nicht für Posts/Kommentare"; -$a->strings["Star Posts"] = "Posts mit Sternchen versehen"; -$a->strings["Ability to mark special posts with a star indicator"] = "Möglichkeit, spezielle Posts mit Sternchen-Symbol zu markieren"; +$a->strings["Ability to file posts under folders"] = "Möglichkeit, Beiträge in Verzeichnissen zu sammeln"; +$a->strings["Dislike Posts"] = "Gefällt-mir-nicht Beiträge"; +$a->strings["Ability to dislike posts/comments"] = "Möglichkeit für Gefällt-mir-nicht für Beiträge/Kommentare"; +$a->strings["Star Posts"] = "Beiträge mit Sternchen versehen"; +$a->strings["Ability to mark special posts with a star indicator"] = "Möglichkeit, spezielle Beiträge mit Sternchen-Symbol zu markieren"; $a->strings["Tag Cloud"] = "Tag Wolke"; $a->strings["Provide a personal tag cloud on your channel page"] = "Persönliche Schlagwort-Wolke für deine Kanal-Seite anlegen"; $a->strings["A deleted group with this name was revived. Existing item permissions <strong>may</strong> apply to this group and any future members. If this is not what you intended, please create another group with a different name."] = "Ein gelöschte Gruppe mit diesem Namen wurde gefunden. Existierende Zugangsregeln für Elemente <strong>könnten</strong> für diese Gruppe angewendet werden, sowie für alle zukünftigen Elemente."; @@ -227,7 +227,7 @@ $a->strings["timeago.numbers"] = "timeago.numbers"; $a->strings["No recipient provided."] = "Kein Empfänger angegeben"; $a->strings["[no subject]"] = "[no subject]"; $a->strings["Unable to determine sender."] = "Kann Absender nicht bestimmen."; -$a->strings["Stored post could not be verified."] = "Gespeicherter Post konnten nicht überprüft werden."; +$a->strings["Stored post could not be verified."] = "Gespeicherter Beitrag konnten nicht überprüft werden."; $a->strings["view full size"] = "In Vollbildansicht anschauen"; $a->strings["Profile Photos"] = "Profilfotos"; $a->strings["Profile"] = "Profil"; @@ -267,11 +267,11 @@ $a->strings["Default Profile"] = "Standard-Profil"; $a->strings["Friends"] = "Freunde"; $a->strings["Image/photo"] = "Bild/Foto"; $a->strings["%1\$s wrote the following %2\$s %3\$s"] = "%1\$s schrieb den folgenden %2\$s %3\$s"; -$a->strings["post"] = "posten"; +$a->strings["post"] = "Beitrag"; $a->strings["$1 wrote:"] = "$1 schrieb:"; $a->strings["Encrypted content"] = "Verschlüsselter Inhalt"; -$a->strings["created a new post"] = "Neuer Post wurde erzeugt"; -$a->strings["commented on %s's post"] = "hat %s's Post kommentiert"; +$a->strings["created a new post"] = "Neuer Beitrag wurde erzeugt"; +$a->strings["commented on %s's post"] = "hat %s's Beitrag kommentiert"; $a->strings["Embedded content"] = "Eingebetteter Inhalt"; $a->strings["Embedding disabled"] = "Einbetten ausgeschaltet"; $a->strings["Permission denied."] = "Zugang verweigert"; @@ -350,7 +350,7 @@ $a->strings["Path not available."] = "Pfad nicht verfügbar."; $a->strings["Logout"] = "Abmelden"; $a->strings["End this session"] = "Beende diese Sitzung"; $a->strings["Home"] = "Home"; -$a->strings["Your posts and conversations"] = "Deine Posts und Unterhaltungen"; +$a->strings["Your posts and conversations"] = "Deine Beiträge und Unterhaltungen"; $a->strings["Your profile page"] = "Deine Profilseite"; $a->strings["Edit Profiles"] = "Bearbeite Profile"; $a->strings["Manage/Edit Profiles"] = "Verwalte/Bearbeite Profile"; @@ -1468,8 +1468,8 @@ $a->strings["Fan/Admirer"] = "Fan/Verehrer"; $a->strings["Friend/Connect Request"] = "Kontakt-/Freundschaftsanfrage"; $a->strings["New Follower"] = "Neuer Bewunderer"; $a->strings["No introductions."] = "Keine wartenden Vorstellungen."; -$a->strings["%s liked %s's post"] = "%s gefällt %s's Post"; -$a->strings["%s disliked %s's post"] = "%s gefällt %s's Post nicht"; +$a->strings["%s liked %s's post"] = "%s gefällt %s's Beitrag"; +$a->strings["%s disliked %s's post"] = "%s gefällt %s's Beitrag nicht"; $a->strings["%s is now friends with %s"] = "%s ist nun mit %s befreundet"; $a->strings["%s created a new post"] = "%s hat einen neuen Beitrag verfasst"; $a->strings["%s commented on %s's post"] = "%s kommentierte %s Beitrag"; @@ -1483,7 +1483,7 @@ $a->strings["No more home notifications."] = "Keine Pinwand-Benachrichtigungen m $a->strings["Home Notifications"] = "Pinwand-Benachrichtigungen"; $a->strings["Post successful."] = "Veröffentlichung erfolgreich."; $a->strings["Item is not editable"] = "Element kann nicht bearbeitet werden."; -$a->strings["Edit post"] = "Bearbeite Post"; +$a->strings["Edit post"] = "Bearbeite Beitrag"; $a->strings["Access to this profile has been restricted."] = "Der Zugang zu diesem Profil ist begrenzt."; $a->strings["Poke/Prod"] = "Anstupsen/Kuffen"; $a->strings["poke, prod or do other things to somebody"] = "Stupse Leute an oder mache anderes mit ihnen"; diff --git a/view/theme/redbasic/css/dark.css b/view/theme/redbasic/css/dark.css index 43912be69..3bcf15bc9 100644 --- a/view/theme/redbasic/css/dark.css +++ b/view/theme/redbasic/css/dark.css @@ -1,3 +1,7 @@ +/* This file is deprecated. We'll keep it here as reference until somebody +defines a dark colour scheme */ + + body { font-family: sans-serif; font-size: 12px; background-color: #101010; diff --git a/view/theme/redbasic/css/fancy.css b/view/theme/redbasic/css/fancy.css index 2da9d68d1..9b8899d2f 100644 --- a/view/theme/redbasic/css/fancy.css +++ b/view/theme/redbasic/css/fancy.css @@ -1,4 +1,5 @@ -/* There's probably some stuff in here we don't need, and maybe some missing stuff we do need. We can clean it up incrementaly, just get the heavy lifting done for now */ +/*This file is deprecated. We'll keep it for reference until we provide window decorations */ + aside { border-radius: $radiuspx;} diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index bc8014978..868da0a03 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -117,17 +117,17 @@ blockquote { filter:alpha(opacity=100); } -nav {background-image: linear-gradient(bottom, #$nav_bg_1 26%, #$nav_bg_2 82%) !important; - background-image: -o-linear-gradient(bottom, $nav_bg_1 26%, $nav_bg_2 82%) !important; - background-image: -moz-linear-gradient(bottom,$nav_bg_1 26%, $nav_bg_2 82%) !important; - background-image: -webkit-linear-gradient(bottom, $nav_bg_1 26%, $nav_bg_2 82%) !important; - background-image: -ms-linear-gradient(bottom, $nav_bg_1 26%, $nav_bg_2 82%) !important; +nav {background-image: linear-gradient(bottom, #$nav_bg_1 26%, #$nav_bg_2 82%); + background-image: -o-linear-gradient(bottom, $nav_bg_1 26%, $nav_bg_2 82%); + background-image: -moz-linear-gradient(bottom,$nav_bg_1 26%, $nav_bg_2 82%); + background-image: -webkit-linear-gradient(bottom, $nav_bg_1 26%, $nav_bg_2 82%); + background-image: -ms-linear-gradient(bottom, $nav_bg_1 26%, $nav_bg_2 82%); } nav:hover {background-image: linear-gradient(bottom, $nav_bg_3 26%, $nav_bg_4 82%); background-image: -o-linear-gradient(bottom, $nav_bg_3 26%, $nav_bg_4 82%); - background-image: -moz-linear-gradient(bottom, $nav_bg_3 26%, $nav_bg_4 82%) !important; + background-image: -moz-linear-gradient(bottom, $nav_bg_3 26%, $nav_bg_4 82%); background-image: -webkit-linear-gradient(bottom, $nav_bg_3 26%, $nav_bg_4 82%); background-image: -ms-linear-gradient(bottom, $nav_bg_3 26%, $nav_bg_4 82%); } @@ -1405,7 +1405,7 @@ tr.mceLast { .wall-item-photo, .photo, .contact-block-img, .my-comment-photo { border-radius: $radiuspx; -moz-border-radius: $radiuspx; - box-shadow: 4px 4px 3px 0 #444444; + /*box-shadow: 4px 4px 3px 0 #444444; */ } diff --git a/view/theme/redbasic/php/config.php b/view/theme/redbasic/php/config.php index 2502bb675..7470c399a 100644 --- a/view/theme/redbasic/php/config.php +++ b/view/theme/redbasic/php/config.php @@ -36,6 +36,7 @@ function redbasic_form(&$a, $nav_colour, $background_colour, $background_image, $nav_colours = array ( 'red' => 'red', 'black' => 'black', + 'silver' => 'silver', ); $t = get_markup_template('theme_settings.tpl'); diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php index e9ee57268..88bf2ceb0 100644 --- a/view/theme/redbasic/php/style.php +++ b/view/theme/redbasic/php/style.php @@ -1,20 +1,5 @@ <?php -//Set some defaults - - $nav_colour = "red"; - $nav_bg_1 = "#f88"; - $nav_bg_2 = "#b00"; - $nav_bg_3 = "#f00"; - $nav_bg_4 = "#b00"; - $background_colour = "fff"; - $background_image =''; - $item_colour = "fff"; - $item_opacity = "1"; - $font_size = "12"; - $font_colour = "000"; - $radius = "5"; - // Get the UID of the channel owner $uid = get_theme_uid(); @@ -37,6 +22,9 @@ $nav_bg_1 = $nav_bg_3 = "#000"; $nav_bg_2 = $nav_bg_4 = "#222"; } + if ($nav_colour == "silver") { + $nav_bg_1 = $nav_bg_2 = $nav_bg_3 = $nav_bg_4 = "silver"; + } $background_colour = get_pconfig($uid, "redbasic", "background_colour"); $background_image = get_pconfig($uid, "redbasic", "background_image"); @@ -46,6 +34,32 @@ $font_colour = get_pconfig($uid, "redbasic", "font_colour"); $radius = get_pconfig($uid, "redbasic", "radius"); +//Set some defaults - we have to do this after pulling owner settings, and we have to check for each setting +//individually. If we don't, we'll have problems if a user has set one, but not all options. + + if (! $nav_colour) { + $nav_colour = "red"; + $nav_bg_1 = "#f88"; + $nav_bg_2 = "#b00"; + $nav_bg_3 = "#f00"; + $nav_bg_4 = "#b00"; + } + if (! $background_colour) + $background_colour = "fff"; + if (! $background_image) + $background_image =''; + if (! $item_colour) + $item_colour = "fff"; + if (! $item_opacity) + $item_opacity = "1"; + if (! $font_size) + $font_size = "12"; + if (! $font_colour) + $font_colour = "000"; + if (! $radius) + $radius = "5"; + + // Apply the settings if(file_exists('view/theme/' . current_theme() . '/css/style.css')) { |