aboutsummaryrefslogtreecommitdiffstats
path: root/view
diff options
context:
space:
mode:
Diffstat (limited to 'view')
-rw-r--r--view/es/messages.po8
-rw-r--r--view/es/strings.php1
-rw-r--r--view/js/main.js12
-rw-r--r--view/nl/hmessages.po8
-rw-r--r--view/nl/hstrings.php6
-rw-r--r--view/nl/messages.po8
-rw-r--r--view/nl/strings.php1
-rw-r--r--view/theme/redbasic/schema/dark.css40
-rwxr-xr-xview/tpl/admin_site.tpl4
9 files changed, 61 insertions, 27 deletions
diff --git a/view/es/messages.po b/view/es/messages.po
index 6c2093830..4ed1d6c44 100644
--- a/view/es/messages.po
+++ b/view/es/messages.po
@@ -13,8 +13,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Redmatrix\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-10-17 16:47-0700\n"
-"PO-Revision-Date: 2015-10-18 15:17+0000\n"
+"POT-Creation-Date: 2015-10-23 00:04-0700\n"
+"PO-Revision-Date: 2015-10-31 19:26+0000\n"
"Last-Translator: Manuel Jiménez Friaza <mjfriaza@openmailbox.org>\n"
"Language-Team: Spanish (http://www.transifex.com/Friendica/red-matrix/language/es/)\n"
"MIME-Version: 1.0\n"
@@ -4531,6 +4531,10 @@ msgid "Location"
msgstr "Localización"
#: ../../mod/pubsites.php:26
+msgid "Project"
+msgstr "Proyecto"
+
+#: ../../mod/pubsites.php:26
msgid "View hub ratings"
msgstr "Ver las valoraciones del sitio"
diff --git a/view/es/strings.php b/view/es/strings.php
index 8b0b1758a..be750b0ff 100644
--- a/view/es/strings.php
+++ b/view/es/strings.php
@@ -1067,6 +1067,7 @@ $a->strings["Site URL"] = "Dirección del sitio";
$a->strings["Access Type"] = "Tipo de Acceso";
$a->strings["Registration Policy"] = "Normas de Registro";
$a->strings["Location"] = "Localización";
+$a->strings["Project"] = "Proyecto";
$a->strings["View hub ratings"] = "Ver las valoraciones del sitio";
$a->strings["Rate"] = "Valorar";
$a->strings["View ratings"] = "Ver valoraciones";
diff --git a/view/js/main.js b/view/js/main.js
index fd03802c5..8bd4357cc 100644
--- a/view/js/main.js
+++ b/view/js/main.js
@@ -836,10 +836,20 @@ function dropItem(url, object) {
function dosubthread(ident) {
unpause();
$('#like-rotator-' + ident.toString()).spin('tiny');
- $.get('subthread/' + ident.toString(), NavUpdate );
+ $.get('subthread/sub/' + ident.toString(), NavUpdate );
liking = 1;
}
+
+function dounsubthread(ident) {
+ unpause();
+ $('#like-rotator-' + ident.toString()).spin('tiny');
+ $.get('subthread/unsub/' + ident.toString(), NavUpdate );
+ liking = 1;
+}
+
+
+
function dostar(ident) {
ident = ident.toString();
$('#like-rotator-' + ident).spin('tiny');
diff --git a/view/nl/hmessages.po b/view/nl/hmessages.po
index 89a0670ec..3c6739909 100644
--- a/view/nl/hmessages.po
+++ b/view/nl/hmessages.po
@@ -9,7 +9,7 @@ msgstr ""
"Project-Id-Version: Redmatrix\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2015-10-30 00:03-0700\n"
-"PO-Revision-Date: 2015-10-31 20:03+0000\n"
+"PO-Revision-Date: 2015-11-03 20:14+0000\n"
"Last-Translator: jeroenpraat <jeroenpraat@xs4all.nl>\n"
"Language-Team: Dutch (http://www.transifex.com/Friendica/red-matrix/language/nl/)\n"
"MIME-Version: 1.0\n"
@@ -569,11 +569,11 @@ msgstr "Sta toe dat inhoud extra end-to-end wordt versleuteld met een gedeelde g
#: ../../include/features.php:61
msgid "Enable Voting Tools"
-msgstr "Stemmen inschakelen"
+msgstr "Peilingen inschakelen"
#: ../../include/features.php:61
msgid "Provide a class of post which others can vote on"
-msgstr "Creëert een berichtenoptie zodat anderen op jouw vraag kunnen stemmen."
+msgstr "Maakt het mogelijk om een bericht op te stellen, waar mensen op kunnen stemmen."
#: ../../include/features.php:62
msgid "Delayed Posting"
@@ -3476,7 +3476,7 @@ msgstr "locatie instellen"
#: ../../include/conversation.php:1207 ../../mod/editpost.php:126
msgid "Toggle voting"
-msgstr "Stemmen in- of uitschakelen"
+msgstr "Peiling in- of uitschakelen"
#: ../../include/conversation.php:1210 ../../mod/editblock.php:149
#: ../../mod/editpost.php:125 ../../mod/editlayout.php:147
diff --git a/view/nl/hstrings.php b/view/nl/hstrings.php
index f48043c76..366167657 100644
--- a/view/nl/hstrings.php
+++ b/view/nl/hstrings.php
@@ -121,8 +121,8 @@ $a->strings["Channel Sources"] = "Kanaalbronnen";
$a->strings["Automatically import channel content from other channels or feeds"] = "Automatisch inhoud uit andere kanalen of feeds importeren.";
$a->strings["Even More Encryption"] = "Extra encryptie";
$a->strings["Allow optional encryption of content end-to-end with a shared secret key"] = "Sta toe dat inhoud extra end-to-end wordt versleuteld met een gedeelde geheime sleutel.";
-$a->strings["Enable Voting Tools"] = "Stemmen inschakelen";
-$a->strings["Provide a class of post which others can vote on"] = "Creëert een berichtenoptie zodat anderen op jouw vraag kunnen stemmen.";
+$a->strings["Enable Voting Tools"] = "Peilingen inschakelen";
+$a->strings["Provide a class of post which others can vote on"] = "Maakt het mogelijk om een bericht op te stellen, waar mensen op kunnen stemmen.";
$a->strings["Delayed Posting"] = "Berichten uitstellen";
$a->strings["Allow posts to be published at a later date"] = "Maakt het mogelijk dat berichten op een toekomstig moment gepubliceerd kunnen worden.";
$a->strings["Network and Stream Filtering"] = "Netwerk- en streamfilter";
@@ -807,7 +807,7 @@ $a->strings["Insert audio link"] = "Audiolink invoegen";
$a->strings["audio link"] = "audiolink";
$a->strings["Set your location"] = "Locatie instellen";
$a->strings["set location"] = "locatie instellen";
-$a->strings["Toggle voting"] = "Stemmen in- of uitschakelen";
+$a->strings["Toggle voting"] = "Peiling in- of uitschakelen";
$a->strings["Clear browser location"] = "Locatie van webbrowser wissen";
$a->strings["clear location"] = "locatie wissen";
$a->strings["Title (optional)"] = "Titel (optioneel)";
diff --git a/view/nl/messages.po b/view/nl/messages.po
index 0b3d7e3fd..6f55daf17 100644
--- a/view/nl/messages.po
+++ b/view/nl/messages.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Redmatrix\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-10-17 16:47-0700\n"
-"PO-Revision-Date: 2015-10-18 13:28+0000\n"
+"POT-Creation-Date: 2015-10-23 00:04-0700\n"
+"PO-Revision-Date: 2015-10-26 15:27+0000\n"
"Last-Translator: jeroenpraat <jeroenpraat@xs4all.nl>\n"
"Language-Team: Dutch (http://www.transifex.com/Friendica/red-matrix/language/nl/)\n"
"MIME-Version: 1.0\n"
@@ -4527,6 +4527,10 @@ msgid "Location"
msgstr "Locatie"
#: ../../mod/pubsites.php:26
+msgid "Project"
+msgstr "Project"
+
+#: ../../mod/pubsites.php:26
msgid "View hub ratings"
msgstr "Bekijk hubbeoordelingen"
diff --git a/view/nl/strings.php b/view/nl/strings.php
index 865de908e..295164d17 100644
--- a/view/nl/strings.php
+++ b/view/nl/strings.php
@@ -1067,6 +1067,7 @@ $a->strings["Site URL"] = "URL hub";
$a->strings["Access Type"] = "Toegangstype";
$a->strings["Registration Policy"] = "Registratiebeleid";
$a->strings["Location"] = "Locatie";
+$a->strings["Project"] = "Project";
$a->strings["View hub ratings"] = "Bekijk hubbeoordelingen";
$a->strings["Rate"] = "Beoordeel";
$a->strings["View ratings"] = "Bekijk beoordelingen";
diff --git a/view/theme/redbasic/schema/dark.css b/view/theme/redbasic/schema/dark.css
index 7020309fc..9574df182 100644
--- a/view/theme/redbasic/schema/dark.css
+++ b/view/theme/redbasic/schema/dark.css
@@ -119,26 +119,38 @@
}
.btn-success {
- color: #FFF;
- background-color: #5CB85C;
- border-color: #4CAE4C;
+ color: #FFF !important;
+ background-color: #5CB85C !important;
+ border-color: #4CAE4C !important;
}
.btn-success:hover, .btn-success:focus {
- color: #FFF;
- background-color: #449D44;
- border-color: #398439;
+ color: #FFF !important;
+ background-color: #449D44 !important;
+ border-color: #398439 !important;
+}
+
+.btn-warning {
+ color: #FFF !important;
+ background-color: #F0AD4E !important;
+ border-color: #EEA236 !important;
+}
+
+.btn-warning:hover, .btn-warning:focus {
+ color: #FFF !important;
+ background-color: #EC971F !important;
+ border-color: #D58512 !important;
}
-.btn-danger {
- background-color: #D9534F;
- border-color: #D43F3A;
- color: #FFF;
+.btn-danger, form#chat-destroy > input {
+ background-color: #D9534F !important;
+ border-color: #D43F3A !important;
+ color: #FFF !important;
}
-.btn-danger:hover, .btn-danger:focus {
- color: #FFF;
- background-color: #C9302C;
- border-color: #AC2925;
+.btn-danger:hover, .btn-danger:focus, form#chat-destroy > input:hover, form#chat-destroy > input:focus {
+ color: #FFF !important;
+ background-color: #C9302C !important;
+ border-color: #AC2925 !important;
}
.pager_first,
diff --git a/view/tpl/admin_site.tpl b/view/tpl/admin_site.tpl
index 26434b20a..4add59a0d 100755
--- a/view/tpl/admin_site.tpl
+++ b/view/tpl/admin_site.tpl
@@ -49,7 +49,9 @@
{{include file="field_input.tpl" field=$frontpage}}
{{include file="field_checkbox.tpl" field=$mirror_frontpage}}
{{include file="field_checkbox.tpl" field=$login_on_homepage}}
-
+ {{if $directory_server}}
+ {{include file="field_select.tpl" field=$directory_server}}
+ {{/if}}
<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-13 09:19:49 +0000