diff options
Diffstat (limited to 'view')
| -rw-r--r-- | view/css/mod_pubstream.css | 3 | ||||
| -rw-r--r-- | view/es-es/hmessages.po | 10 | ||||
| -rw-r--r-- | view/es-es/hstrings.php | 8 | ||||
| -rw-r--r-- | view/js/mod_pubstream.js | 5 | ||||
| -rw-r--r-- | view/pdl/mod_search.pdl | 1 | ||||
| -rw-r--r-- | view/pdl/mod_sources.pdl | 6 | ||||
| -rw-r--r-- | view/theme/redbasic/css/style.css | 23 | ||||
| -rwxr-xr-x | view/tpl/admin_site.tpl | 1 | ||||
| -rwxr-xr-x | view/tpl/build_query.tpl | 2 | ||||
| -rw-r--r-- | view/tpl/cloud_directory.tpl | 35 | ||||
| -rw-r--r-- | view/tpl/cloud_header.tpl | 1 | ||||
| -rw-r--r-- | view/tpl/pdledit.tpl | 3 | ||||
| -rwxr-xr-x | view/tpl/settings_display.tpl | 1 |
13 files changed, 89 insertions, 10 deletions
diff --git a/view/css/mod_pubstream.css b/view/css/mod_pubstream.css new file mode 100644 index 000000000..dde242d4e --- /dev/null +++ b/view/css/mod_pubstream.css @@ -0,0 +1,3 @@ +#jot-popup { + display: none; +} diff --git a/view/es-es/hmessages.po b/view/es-es/hmessages.po index 99cc86107..67be6a829 100644 --- a/view/es-es/hmessages.po +++ b/view/es-es/hmessages.po @@ -14,7 +14,7 @@ msgstr "" "Project-Id-Version: Redmatrix\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-10-19 12:01+0200\n" -"PO-Revision-Date: 2017-10-20 10:42+0000\n" +"PO-Revision-Date: 2017-10-28 10:20+0000\n" "Last-Translator: Manuel Jiménez Friaza <mjfriaza@openmailbox.org>\n" "Language-Team: Spanish (Spain) (http://www.transifex.com/Friendica/red-matrix/language/es_ES/)\n" "MIME-Version: 1.0\n" @@ -3476,7 +3476,7 @@ msgstr "Podría reducir la actividad de spam" #: ../../Zotlabs/Module/Settings/Channel.php:512 msgid "Default Privacy Group" -msgstr "Grupo de canales por defecto" +msgstr "Grupo de canales predeterminado" #: ../../Zotlabs/Module/Settings/Channel.php:514 msgid "Use my default audience setting for the type of object published" @@ -4803,7 +4803,7 @@ msgstr "Tipo" #: ../../Zotlabs/Module/Wiki.php:211 msgid "Any type" -msgstr "Cualquier tipo" +msgstr "Cualquier tipo" #: ../../Zotlabs/Module/Wiki.php:218 msgid "Lock content type" @@ -7294,7 +7294,7 @@ msgstr "0. Principiante/Básico" #: ../../Zotlabs/Lib/Techlevels.php:11 msgid "1. Novice - not skilled but willing to learn" -msgstr "1. Novicio - no está preparado pero está dispuestos a aprender" +msgstr "1. Novato: no cualificado, pero dispuesto a aprender" #: ../../Zotlabs/Lib/Techlevels.php:12 msgid "2. Intermediate - somewhat comfortable" @@ -7310,7 +7310,7 @@ msgstr "4. Experto - Puedo escribir código informático" #: ../../Zotlabs/Lib/Techlevels.php:15 msgid "5. Wizard - I probably know more than you do" -msgstr "5. Asistente - probablemente sé más que tú" +msgstr "5. Colaborador - probablemente sé más que tú" #: ../../Zotlabs/Lib/Apps.php:225 msgid "Site Admin" diff --git a/view/es-es/hstrings.php b/view/es-es/hstrings.php index 0e2a03bb5..f5cfecb5a 100644 --- a/view/es-es/hstrings.php +++ b/view/es-es/hstrings.php @@ -697,7 +697,7 @@ App::$strings["This website does not expire imported content."] = "Este sitio we App::$strings["The website limit takes precedence if lower than your limit."] = "El límite del sitio web tiene prioridad si es inferior a su propio límite."; App::$strings["Maximum Friend Requests/Day:"] = "Máximo de solicitudes de amistad por día:"; App::$strings["May reduce spam activity"] = "Podría reducir la actividad de spam"; -App::$strings["Default Privacy Group"] = "Grupo de canales por defecto"; +App::$strings["Default Privacy Group"] = "Grupo de canales predeterminado"; App::$strings["Use my default audience setting for the type of object published"] = "Usar los ajustes de mi audiencia predeterminada para el tipo de publicación"; App::$strings["Channel permissions category:"] = "Categoría de los permisos del canal:"; App::$strings["Default Permissions Group"] = "Grupo de permisos predeterminados"; @@ -1002,7 +1002,7 @@ App::$strings["Markdown"] = "Markdown"; App::$strings["BBcode"] = "BBcode"; App::$strings["Text"] = "Texto"; App::$strings["Type"] = "Tipo"; -App::$strings["Any type"] = "Cualquier tipo"; +App::$strings["Any type"] = "Cualquier tipo"; App::$strings["Lock content type"] = "Tipo de contenido bloqueado"; App::$strings["Create a status post for this wiki"] = "Crear un mensaje de estado para este wiki"; App::$strings["Edit Wiki Name"] = "Editar el nombre del wiki"; @@ -1585,11 +1585,11 @@ App::$strings["Enter your email address and submit to have your password reset. App::$strings["Email Address"] = "Dirección de correo electrónico"; App::$strings["Mark all seen"] = "Marcar todo como visto"; App::$strings["0. Beginner/Basic"] = "0. Principiante/Básico"; -App::$strings["1. Novice - not skilled but willing to learn"] = "1. Novicio - no está preparado pero está dispuestos a aprender"; +App::$strings["1. Novice - not skilled but willing to learn"] = "1. Novato: no cualificado, pero dispuesto a aprender"; App::$strings["2. Intermediate - somewhat comfortable"] = "2. Intermedio - algo cómodo"; App::$strings["3. Advanced - very comfortable"] = "3. Avanzado - muy cómodo"; App::$strings["4. Expert - I can write computer code"] = "4. Experto - Puedo escribir código informático"; -App::$strings["5. Wizard - I probably know more than you do"] = "5. Asistente - probablemente sé más que tú"; +App::$strings["5. Wizard - I probably know more than you do"] = "5. Colaborador - probablemente sé más que tú"; App::$strings["Site Admin"] = "Administrador del sitio"; App::$strings["Report Bug"] = "Informe de errores"; App::$strings["View Bookmarks"] = "Ver los marcadores"; diff --git a/view/js/mod_pubstream.js b/view/js/mod_pubstream.js new file mode 100644 index 000000000..7e24a7f86 --- /dev/null +++ b/view/js/mod_pubstream.js @@ -0,0 +1,5 @@ +$(document).ready(function() { + $(".comment-edit-wrapper textarea").editor_autocomplete(baseurl+"/acl?f=&n=1"); + // make auto-complete work in more places + $(".wall-item-comment-wrapper textarea").editor_autocomplete(baseurl+"/acl?f=&n=1"); +}); diff --git a/view/pdl/mod_search.pdl b/view/pdl/mod_search.pdl index 8353b4571..e69657dac 100644 --- a/view/pdl/mod_search.pdl +++ b/view/pdl/mod_search.pdl @@ -1,5 +1,4 @@ [region=aside] -[comment][widget=sitesearch][/widget][/comment] [/region] [region=right_aside] [widget=notifications][/widget] diff --git a/view/pdl/mod_sources.pdl b/view/pdl/mod_sources.pdl new file mode 100644 index 000000000..53a3ac9e5 --- /dev/null +++ b/view/pdl/mod_sources.pdl @@ -0,0 +1,6 @@ +[region=aside] +[widget=settings_menu][/widget] +[/region] +[region=right_aside] +[widget=notifications][/widget] +[/region] diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index aea75df65..9f9ece7c3 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1695,3 +1695,26 @@ dl.bb-dl > dd > li { #permcat-index { margin: 10px; } + +.cloud-container { + float: left; + width: 80px; + height: 80px; + margin: 5px; +} + +.cloud-icon i { + font-size: 48px; +} + +.cloud-icon img { + width: 48px; + height: 48px; +} + +.cloud-title { + width: 78px; + height: 36px; + overflow: hidden; +} + diff --git a/view/tpl/admin_site.tpl b/view/tpl/admin_site.tpl index d6ff34f93..6b39e844a 100755 --- a/view/tpl/admin_site.tpl +++ b/view/tpl/admin_site.tpl @@ -88,6 +88,7 @@ {{include file="field_input.tpl" field=$timeout}} {{include file="field_input.tpl" field=$delivery_interval}} {{include file="field_input.tpl" field=$delivery_batch_count}} + {{include file="field_input.tpl" field=$force_queue}} {{include file="field_input.tpl" field=$poll_interval}} {{include file="field_input.tpl" field=$maxloadavg}} {{include file="field_input.tpl" field=$abandon_days}} diff --git a/view/tpl/build_query.tpl b/view/tpl/build_query.tpl index a76d4e549..bfe5c8a08 100755 --- a/view/tpl/build_query.tpl +++ b/view/tpl/build_query.tpl @@ -29,6 +29,7 @@ var bParam_dbegin = "{{$dbegin}}"; var bParam_mid = "{{$mid}}"; var bParam_verb = "{{$verb}}"; + var bParam_net = "{{$net}}"; function buildCmd() { var udargs = ((page_load) ? "/load" : ""); @@ -57,6 +58,7 @@ if(bParam_dbegin != "") bCmd = bCmd + "&dbegin=" + bParam_dbegin; if(bParam_mid != "") bCmd = bCmd + "&mid=" + bParam_mid; if(bParam_verb != "") bCmd = bCmd + "&verb=" + bParam_verb; + if(bParam_net != "") bCmd = bCmd + "&net=" + bParam_net; if(bParam_page != 1) bCmd = bCmd + "&page=" + bParam_page; return(bCmd); } diff --git a/view/tpl/cloud_directory.tpl b/view/tpl/cloud_directory.tpl index e8ae6a590..40278661f 100644 --- a/view/tpl/cloud_directory.tpl +++ b/view/tpl/cloud_directory.tpl @@ -1,4 +1,38 @@ <div id="cloud-drag-area" class="section-content-wrapper-np"> + {{if $tiles}} + + {{if $parentpath}} + <div class="cloud-container" > + <div class="cloud-icon"><a href="{{$parentpath.path}}"> + <i class="fa fa-fw fa-level-up" ></i> + </a> + </div> + <div class="cloud-title"><a href="{{$parentpath.path}}">..</a> + </div> + </div> + {{/if}} + + {{foreach $entries as $item}} + <div class="cloud-container"> + <div class="cloud-icon"><a href="{{$item.fullPath}}"> + {{if $item.photo_icon}} + <img src="photo/{{$item.photo_icon}}" title="{{$item.type}}" > + {{else}} + <i class="fa fa-fw {{$item.iconFromType}}" title="{{$item.type}}"></i> + {{/if}} + </a> + </div> + <div class="cloud-title"><a href="{{$item.fullPath}}"> + {{$item.displayName}} + </a> + </div> + {{if $item.is_owner}} + + {{/if}} + </div> + {{/foreach}} + <div class="clear"></div> + {{else}} <table id="cloud-index"> <tr> <th width="1%"></th> @@ -42,4 +76,5 @@ {{/foreach}} </table> + {{/if}} </div> diff --git a/view/tpl/cloud_header.tpl b/view/tpl/cloud_header.tpl index c1e589341..468f2febc 100644 --- a/view/tpl/cloud_header.tpl +++ b/view/tpl/cloud_header.tpl @@ -1,6 +1,7 @@ <div class="section-title-wrapper"> {{if $actionspanel}} <div class="pull-right"> + <a href="cloud_tiles/{{$cpath}}" class="btn btn-sm btn-outline-secondary"><i class="fa fa-fw {{if $tiles}}fa-list-ul{{else}}fa-table{{/if}}"></i></a> {{if $is_owner}} <a href="/sharedwithme" class="btn btn-sm btn-outline-secondary"><i class="fa fa-cloud-download"></i> {{$shared}}</a> {{/if}} diff --git a/view/tpl/pdledit.tpl b/view/tpl/pdledit.tpl index 2ea89b6c1..66b8209c9 100644 --- a/view/tpl/pdledit.tpl +++ b/view/tpl/pdledit.tpl @@ -11,7 +11,10 @@ <br /> <br /> +<div class="descriptive-text">{{$original}}</div> +<pre><code>{{$src}}</code></pre> +<br /> <form action="pdledit" method="post" > <input type="hidden" name="module" value="{{$module}}" /> diff --git a/view/tpl/settings_display.tpl b/view/tpl/settings_display.tpl index d8c1ac7aa..d1e6e0609 100755 --- a/view/tpl/settings_display.tpl +++ b/view/tpl/settings_display.tpl @@ -64,6 +64,7 @@ {{include file="field_input.tpl" field=$channel_divmore_height}} {{include file="field_input.tpl" field=$network_divmore_height}} {{include file="field_checkbox.tpl" field=$nosmile}} + {{include file="field_checkbox.tpl" field=$channel_menu}} {{include file="field_checkbox.tpl" field=$title_tosource}} {{include file="field_checkbox.tpl" field=$channel_list_mode}} {{include file="field_checkbox.tpl" field=$network_list_mode}} |