aboutsummaryrefslogtreecommitdiffstats
path: root/view
diff options
context:
space:
mode:
Diffstat (limited to 'view')
-rw-r--r--view/css/choklet.css1
-rw-r--r--view/css/choklet_bannertwo.css1
-rw-r--r--view/css/choklet_edgesthree.css1
-rw-r--r--view/css/choklet_edgestwo.css1
-rw-r--r--view/css/choklet_full.css2
-rw-r--r--view/css/choklet_three.css1
-rw-r--r--view/css/conversation.css11
-rw-r--r--view/css/default.css1
-rw-r--r--view/css/full.css1
-rw-r--r--view/es/messages.po6
-rw-r--r--view/es/strings.php4
-rw-r--r--view/js/main.js2
-rwxr-xr-xview/tpl/photo_view.tpl2
13 files changed, 22 insertions, 12 deletions
diff --git a/view/css/choklet.css b/view/css/choklet.css
index 5c895f15e..42a7fa6c4 100644
--- a/view/css/choklet.css
+++ b/view/css/choklet.css
@@ -1,5 +1,6 @@
header #banner {
position: fixed;
+ top: 0px;
width: 33%;
margin-left: 33%;
margin-right: 33%;
diff --git a/view/css/choklet_bannertwo.css b/view/css/choklet_bannertwo.css
index 9eb3505bc..7ae012224 100644
--- a/view/css/choklet_bannertwo.css
+++ b/view/css/choklet_bannertwo.css
@@ -1,5 +1,6 @@
header #banner {
position: fixed;
+ top: 0px;
width: 33%;
margin-left: 33%;
margin-right: 33%;
diff --git a/view/css/choklet_edgesthree.css b/view/css/choklet_edgesthree.css
index d1b2e4bbd..e267a4891 100644
--- a/view/css/choklet_edgesthree.css
+++ b/view/css/choklet_edgesthree.css
@@ -1,5 +1,6 @@
header #banner {
position: fixed;
+ top: 0px;
width: 33%;
margin-left: 33%;
margin-right: 33%;
diff --git a/view/css/choklet_edgestwo.css b/view/css/choklet_edgestwo.css
index 999b602d3..6bf2bf8be 100644
--- a/view/css/choklet_edgestwo.css
+++ b/view/css/choklet_edgestwo.css
@@ -1,5 +1,6 @@
header #banner {
position: fixed;
+ top: 0px;
width: 33%;
margin-left: 33%;
margin-right: 33%;
diff --git a/view/css/choklet_full.css b/view/css/choklet_full.css
index d00178016..f1e9b10e0 100644
--- a/view/css/choklet_full.css
+++ b/view/css/choklet_full.css
@@ -52,4 +52,4 @@ section {
#blog-margin {
margin-right: 5%;
margin-left: 5%;
-} \ No newline at end of file
+}
diff --git a/view/css/choklet_three.css b/view/css/choklet_three.css
index 107834a82..17965084a 100644
--- a/view/css/choklet_three.css
+++ b/view/css/choklet_three.css
@@ -1,5 +1,6 @@
header #banner {
position: fixed;
+ top: 0px;
width: 33%;
margin-left: 33%;
margin-right: 33%;
diff --git a/view/css/conversation.css b/view/css/conversation.css
index 7d4930aac..e409cf4cf 100644
--- a/view/css/conversation.css
+++ b/view/css/conversation.css
@@ -122,12 +122,15 @@ a.wall-item-name-link {
overflow: auto;
}
-.wall-item-content h1, .wall-item-content h2 {
- font-size: 1.319em;
+.wall-item-content h1,
+.wall-item-content h2 {
+ font-size: 1.319em;
}
-.wall-item-title h3, .wall-item-content h3, .wall-item-content h4 {
- font-size: 1.112em;
+.wall-item-title h3,
+.wall-item-content h3,
+.wall-item-content h4 {
+ font-size: 1.112em;
}
.wall-item-content img {
diff --git a/view/css/default.css b/view/css/default.css
index e84561baf..bffecbb81 100644
--- a/view/css/default.css
+++ b/view/css/default.css
@@ -1,5 +1,6 @@
header #banner {
position: fixed;
+ top: 0px;
width: 33%;
margin-left: 33%;
margin-right: 33%;
diff --git a/view/css/full.css b/view/css/full.css
index acedad0e0..3f9a01d24 100644
--- a/view/css/full.css
+++ b/view/css/full.css
@@ -1,5 +1,6 @@
header #banner {
position: fixed;
+ top: 0px;
width: 33%;
margin-left: 33%;
margin-right: 33%;
diff --git a/view/es/messages.po b/view/es/messages.po
index 0272811eb..bb0ba9839 100644
--- a/view/es/messages.po
+++ b/view/es/messages.po
@@ -14,7 +14,7 @@ msgstr ""
"Project-Id-Version: Redmatrix\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2015-09-11 00:05-0700\n"
-"PO-Revision-Date: 2015-09-14 11:47+0000\n"
+"PO-Revision-Date: 2015-09-14 18:21+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"
@@ -2507,7 +2507,7 @@ msgstr "Privado"
#: ../../include/permissions.php:894
msgid "Community Forum"
-msgstr "Foro de la comunidad"
+msgstr "Foro de discusión"
#: ../../include/permissions.php:895
msgid "Feed Republish"
@@ -8604,7 +8604,7 @@ msgstr "O <a href=\"import\">importar un canal existente</a> de otro lugar"
msgid ""
"Please choose a channel type (such as social networking or community forum) "
"and privacy requirements so we can select the best permissions for you"
-msgstr "Elija el tipo de canal (como red social o foro de comunidad) y la privacidad que requiera, así podremos seleccionar el mejor conjunto de permisos para usted"
+msgstr "Elija el tipo de canal (como red social o foro de discusión) y la privacidad que requiera, así podremos seleccionar el mejor conjunto de permisos para usted"
#: ../../mod/new_channel.php:119
msgid "Channel Type"
diff --git a/view/es/strings.php b/view/es/strings.php
index 749562004..1d91ed820 100644
--- a/view/es/strings.php
+++ b/view/es/strings.php
@@ -579,7 +579,7 @@ $a->strings["Social Networking"] = "Redes sociales";
$a->strings["Mostly Public"] = "Público en su mayor parte";
$a->strings["Restricted"] = "Restringido";
$a->strings["Private"] = "Privado";
-$a->strings["Community Forum"] = "Foro de la comunidad";
+$a->strings["Community Forum"] = "Foro de discusión";
$a->strings["Feed Republish"] = "Republicar un \"feed\"";
$a->strings["Special Purpose"] = "Propósito especial";
$a->strings["Celebrity/Soapbox"] = "Página para fans";
@@ -2031,7 +2031,7 @@ $a->strings["Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"A
$a->strings["Choose a short nickname"] = "Elija un alias corto";
$a->strings["Your nickname will be used to create an easily remembered channel address (like an email address) which you can share with others."] = "Su alias podrá usarse para crear una dirección de canal fácilmente memorizable (como una dirección de correo electrónico) que puede ser compartido con otros.";
$a->strings["Or <a href=\"import\">import an existing channel</a> from another location"] = "O <a href=\"import\">importar un canal existente</a> de otro lugar";
-$a->strings["Please choose a channel type (such as social networking or community forum) and privacy requirements so we can select the best permissions for you"] = "Elija el tipo de canal (como red social o foro de comunidad) y la privacidad que requiera, así podremos seleccionar el mejor conjunto de permisos para usted";
+$a->strings["Please choose a channel type (such as social networking or community forum) and privacy requirements so we can select the best permissions for you"] = "Elija el tipo de canal (como red social o foro de discusión) y la privacidad que requiera, así podremos seleccionar el mejor conjunto de permisos para usted";
$a->strings["Channel Type"] = "Tipo de canal";
$a->strings["Read more about roles"] = "Leer más sobre los roles";
$a->strings["App installed."] = "Aplicación instalada.";
diff --git a/view/js/main.js b/view/js/main.js
index 77184465d..d3c7175d0 100644
--- a/view/js/main.js
+++ b/view/js/main.js
@@ -615,7 +615,7 @@ function updateConvItems(mode,data) {
function collapseHeight() {
- $(".wall-item-body, .directory-collapse").each(function() {
+ $(".wall-item-content, .directory-collapse").each(function() {
var orgHeight = $(this).height();
if(orgHeight > divmore_height + 10) {
if(! $(this).hasClass('divmore')) {
diff --git a/view/tpl/photo_view.tpl b/view/tpl/photo_view.tpl
index f5ff23700..225b4f6b0 100755
--- a/view/tpl/photo_view.tpl
+++ b/view/tpl/photo_view.tpl
@@ -15,7 +15,7 @@
<i class="icon-pencil btn btn-default btn-xs" title="{{$edit.edit}}" onclick="openClose('photo-edit');"></i>
{{/if}}
{{if $lock}}
- <i id="lockview" class="icon-lock btn btn-default btn-xs dropdown-toggle" data-toggle="dropdown" title="{{$lock}}" onclick="lockview('item',{{$id}});" ></i><ul id="panel-{{$id}}" class="lockview-panel dropdown-menu"></ul>
+ <i id="lockview" class="icon-lock btn btn-default btn-xs dropdown-toggle" data-toggle="dropdown" title="{{$lock}}" onclick="lockview('photo',{{$id}});" ></i><ul id="panel-{{$id}}" class="lockview-panel dropdown-menu"></ul>
{{/if}}
</div>
<div class="btn-group btn-group">
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-08 03:16:56 +0000