diff options
author | Mario Vavti <mario@mariovavti.com> | 2018-11-05 09:55:23 +0100 |
---|---|---|
committer | Mario Vavti <mario@mariovavti.com> | 2018-11-05 09:55:23 +0100 |
commit | 4830a1559d5ad9f59d809bf3d693592d3f7c8ab2 (patch) | |
tree | db87b400af1f3de1ca01bccef58b0bf4e55b1241 /view | |
parent | c8dd516d6c743d0371dc2ccb476eb70bcc17fa0a (diff) | |
parent | 92ea3ef72036c39601b69565f3e03fa44ad9aef7 (diff) | |
download | volse-hubzilla-4830a1559d5ad9f59d809bf3d693592d3f7c8ab2.tar.gz volse-hubzilla-4830a1559d5ad9f59d809bf3d693592d3f7c8ab2.tar.bz2 volse-hubzilla-4830a1559d5ad9f59d809bf3d693592d3f7c8ab2.zip |
Merge branch 'dev'
Diffstat (limited to 'view')
-rw-r--r-- | view/es-es/hstrings.php | 2 | ||||
-rw-r--r-- | view/it/hmessages.po | 6 | ||||
-rw-r--r-- | view/it/hstrings.php | 2 | ||||
-rw-r--r-- | view/pdl/mod_wiki.pdl | 1 | ||||
-rw-r--r-- | view/theme/redbasic/css/style.css | 17 | ||||
-rw-r--r-- | view/tpl/cloud.tpl | 6 | ||||
-rwxr-xr-x | view/tpl/jot-header.tpl | 6 | ||||
-rwxr-xr-x | view/tpl/msg-header.tpl | 6 |
8 files changed, 28 insertions, 18 deletions
diff --git a/view/es-es/hstrings.php b/view/es-es/hstrings.php index 6daac9592..2024504a1 100644 --- a/view/es-es/hstrings.php +++ b/view/es-es/hstrings.php @@ -5,7 +5,7 @@ function string_plural_select_es_es($n){ return ($n != 1);; }} App::$rtl = 0; -App::$strings["plural_function_code"] = "(n != 1);"; +App::$strings["plural_function_code"] = "(n != 1)"; App::$strings["Can view my channel stream and posts"] = "Pueden verse la actividad y publicaciones de mi canal"; App::$strings["Can send me their channel stream and posts"] = "Se me pueden enviar entradas y contenido de un canal"; App::$strings["Can view my default channel profile"] = "Puede verse mi perfil de canal predeterminado."; diff --git a/view/it/hmessages.po b/view/it/hmessages.po index fc4772846..94911bc20 100644 --- a/view/it/hmessages.po +++ b/view/it/hmessages.po @@ -5849,7 +5849,7 @@ msgstr "Impossibile creare il menù." #: ../../Zotlabs/Module/Menu.php:98 ../../Zotlabs/Module/Menu.php:110 msgid "Menu Name" -msgstr "Nome del menu" +msgstr "Nome del menù" #: ../../Zotlabs/Module/Menu.php:98 msgid "Unique name (not visible on webpage) - required" @@ -6543,7 +6543,7 @@ msgstr "Homepage del progetto" #: ../../Zotlabs/Module/Siteinfo.php:32 msgid "Developer homepage" -msgstr "Homepege dello sviluppatore" +msgstr "Homepage dello sviluppatore" #: ../../Zotlabs/Module/Ratings.php:70 msgid "No ratings" @@ -6623,7 +6623,7 @@ msgstr "Importazione completata." msgid "" "Channel name changes are not allowed within 48 hours of changing the account" " password." -msgstr "Non è possibile cambiare il nome del canale entro le 48 dal cambio della password dell'account." +msgstr "Non è possibile cambiare il nome del canale entro le 48 ore dal cambio della password dell'account." #: ../../Zotlabs/Module/Changeaddr.php:46 ../../include/channel.php:214 #: ../../include/channel.php:599 diff --git a/view/it/hstrings.php b/view/it/hstrings.php index 42fc58347..1f5527946 100644 --- a/view/it/hstrings.php +++ b/view/it/hstrings.php @@ -1393,7 +1393,7 @@ App::$strings["This site is powered by \$Projectname"] = "Questo sito è costrui App::$strings["Federated and decentralised networking and identity services provided by Zot"] = ""; App::$strings["Version %s"] = "Versione %s"; App::$strings["Project homepage"] = "Homepage del progetto"; -App::$strings["Developer homepage"] = "Homepege dello sviluppatore"; +App::$strings["Developer homepage"] = "Homepage dello sviluppatore"; App::$strings["No ratings"] = "Nessuna valutazione"; App::$strings["Ratings"] = "Valutazioni"; App::$strings["Rating: "] = "Valutazione:"; diff --git a/view/pdl/mod_wiki.pdl b/view/pdl/mod_wiki.pdl index 2e99ea36b..be86be7e3 100644 --- a/view/pdl/mod_wiki.pdl +++ b/view/pdl/mod_wiki.pdl @@ -1,6 +1,5 @@ [region=aside] [widget=vcard][/widget] -[widget=wiki_list][/widget] [widget=wiki_pages][/widget] [/region] [region=right_aside] diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 489d71735..ddf3d1295 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -856,15 +856,26 @@ div.jGrowl div.jGrowl-notification { .contact-block-content { margin-top: 10px; } -.contact-block-img.archived, .app-deleted, .dim { +.contact-block-img.archived, +.app-deleted, +.dim { opacity: 0.3; filter:alpha(opacity=30); } -.profile-match-connect { margin-top: 5px; } +.profile-match-connect { + margin-top: 5px; +} + +.reshared-content { + margin-left: 20px; +} + +.reshared-content img { + width: 100%; +} -.reshared-content { margin-left: 20px; } .shared_header img { border-radius: $radius; margin-right: 10px; diff --git a/view/tpl/cloud.tpl b/view/tpl/cloud.tpl index e7237c7e6..9df95c8cc 100644 --- a/view/tpl/cloud.tpl +++ b/view/tpl/cloud.tpl @@ -1,6 +1,6 @@ -<script src="library/blueimp_upload/js/vendor/jquery.ui.widget.js"></script> -<script src="library/blueimp_upload/js/jquery.iframe-transport.js"></script> -<script src="library/blueimp_upload/js/jquery.fileupload.js"></script> +<script src="vendor/blueimp/jquery-file-upload/js/vendor/jquery.ui.widget.js"></script> +<script src="vendor/blueimp/jquery-file-upload/js/jquery.iframe-transport.js"></script> +<script src="vendor/blueimp/jquery-file-upload/js/jquery.fileupload.js"></script> <div class="generic-content-wrapper"> {{include file="cloud_header.tpl"}} diff --git a/view/tpl/jot-header.tpl b/view/tpl/jot-header.tpl index be09fbebf..2670ba9e7 100755 --- a/view/tpl/jot-header.tpl +++ b/view/tpl/jot-header.tpl @@ -42,9 +42,9 @@ function enableOnUser(){ } </script> -<script src="library/blueimp_upload/js/vendor/jquery.ui.widget.js"></script> -<script src="library/blueimp_upload/js/jquery.iframe-transport.js"></script> -<script src="library/blueimp_upload/js/jquery.fileupload.js"></script> +<script src="vendor/blueimp/jquery-file-upload/js/vendor/jquery.ui.widget.js"></script> +<script src="vendor/blueimp/jquery-file-upload/js/jquery.iframe-transport.js"></script> +<script src="vendor/blueimp/jquery-file-upload/js/jquery.fileupload.js"></script> <script> var activeCommentID = 0; diff --git a/view/tpl/msg-header.tpl b/view/tpl/msg-header.tpl index b6856f139..e8542b087 100755 --- a/view/tpl/msg-header.tpl +++ b/view/tpl/msg-header.tpl @@ -1,6 +1,6 @@ -<script src="library/blueimp_upload/js/vendor/jquery.ui.widget.js"></script> -<script src="library/blueimp_upload/js/jquery.iframe-transport.js"></script> -<script src="library/blueimp_upload/js/jquery.fileupload.js"></script> +<script src="vendor/blueimp/jquery-file-upload/js/vendor/jquery.ui.widget.js"></script> +<script src="vendor/blueimp/jquery-file-upload/js/jquery.iframe-transport.js"></script> +<script src="vendor/blueimp/jquery-file-upload/js/jquery.fileupload.js"></script> <script> $(document).ready(function() { |