diff options
Diffstat (limited to 'view')
27 files changed, 77 insertions, 47 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/php/default.php b/view/php/default.php index 4c8311ef0..6a9cc5517 100644 --- a/view/php/default.php +++ b/view/php/default.php @@ -14,7 +14,7 @@ <div id="page-footer"></div> <div id="pause"></div> </section> - <aside id="region_3" class="hidden-sm hidden-xs"><?php if(x($page,'right_aside')) echo $page['right_aside']; ?></aside> + <aside id="region_3" class="hidden-sm hidden-xs hidden-md"><?php if(x($page,'right_aside')) echo $page['right_aside']; ?></aside> </main> <footer><?php if(x($page,'footer')) echo $page['footer']; ?></footer> </body> diff --git a/view/theme/redbasic/php/config.php b/view/theme/redbasic/php/config.php index 6ab8acde6..6bea5bddb 100644 --- a/view/theme/redbasic/php/config.php +++ b/view/theme/redbasic/php/config.php @@ -79,7 +79,7 @@ function theme_post(&$a) { function redbasic_form(&$a, $arr) { $scheme_choices = array(); - $scheme_choices["---"] = t("Light (Hubzilla default)"); + $scheme_choices["---"] = t("Focus (Hubzilla default)"); $files = glob('view/theme/redbasic/schema/*.php'); if($files) { foreach($files as $file) { diff --git a/view/theme/redbasic/schema/dark.php b/view/theme/redbasic/schema/dark.php index 92e703325..af4b122f1 100644 --- a/view/theme/redbasic/schema/dark.php +++ b/view/theme/redbasic/schema/dark.php @@ -34,5 +34,8 @@ $toolicon_activecolour = '#fff'; if (! $font_colour) $font_colour = "#ccc"; + if (! $converse_width) + $converse_width = "1024"; + diff --git a/view/theme/redbasic/schema/simple_black_on_white.php b/view/theme/redbasic/schema/simple_black_on_white.php index 6853a0ed5..554e832f0 100644 --- a/view/theme/redbasic/schema/simple_black_on_white.php +++ b/view/theme/redbasic/schema/simple_black_on_white.php @@ -34,6 +34,9 @@ $comment_border_colour = "rgba(255,255,255,0.8)"; if (! $font_colour) $font_colour = "#000"; + if (! $converse_width) + $converse_width = "1024"; + diff --git a/view/theme/redbasic/schema/simple_green_on_black.php b/view/theme/redbasic/schema/simple_green_on_black.php index 2660624d6..8192180db 100644 --- a/view/theme/redbasic/schema/simple_green_on_black.php +++ b/view/theme/redbasic/schema/simple_green_on_black.php @@ -34,3 +34,5 @@ $comment_border_colour = "rgba(0,0,0,0.8)"; if (! $font_colour) $font_colour = "#46D43F"; + if (! $converse_width) + $converse_width = "1024"; diff --git a/view/theme/redbasic/schema/simple_white_on_black.php b/view/theme/redbasic/schema/simple_white_on_black.php index a76709ac9..b64f60bbe 100644 --- a/view/theme/redbasic/schema/simple_white_on_black.php +++ b/view/theme/redbasic/schema/simple_white_on_black.php @@ -34,3 +34,5 @@ $comment_border_colour = "rgba(0,0,0,0.8)"; if (! $font_colour) $font_colour = "#fff"; + if (! $converse_width) + $converse_width = "1024"; diff --git a/view/theme/redbasic/tpl/theme_settings.tpl b/view/theme/redbasic/tpl/theme_settings.tpl index bfb489abd..4f5b69beb 100644 --- a/view/theme/redbasic/tpl/theme_settings.tpl +++ b/view/theme/redbasic/tpl/theme_settings.tpl @@ -1,4 +1,7 @@ {{include file="field_select.tpl" field=$schema}} +{{include file="field_checkbox.tpl" field=$align_left}} +{{include file="field_checkbox.tpl" field=$narrow_navbar}} +{{include file="field_input.tpl" field=$converse_width}} {{if $expert}} {{include file="field_colorinput.tpl" field=$nav_bg}} {{include file="field_colorinput.tpl" field=$nav_gradient_top}} @@ -26,11 +29,7 @@ {{include file="field_input.tpl" field=$shadow}} {{include file="field_input.tpl" field=$top_photo}} {{include file="field_input.tpl" field=$reply_photo}} -{{/if}} -{{include file="field_input.tpl" field=$converse_width}} -{{include file="field_checkbox.tpl" field=$align_left}} -{{include file="field_checkbox.tpl" field=$narrow_navbar}} -{{if $expert}} + <script> $(function(){ $('#id_redbasic_nav_bg,#id_redbasic_nav_gradient_top,#id_redbasic_nav_gradient_bottom,#id_redbasic_nav_active_gradient_top,#id_redbasic_nav_active_gradient_bottom').colorpicker({format: 'rgba'}); diff --git a/view/tpl/bookmarkedchats.tpl b/view/tpl/bookmarkedchats.tpl index 7635bb826..ab4372c25 100644 --- a/view/tpl/bookmarkedchats.tpl +++ b/view/tpl/bookmarkedchats.tpl @@ -1,7 +1,7 @@ {{if $rooms}} <div class="widget"> <h3>{{$header}}</h3> -<ul class="bookmarkchat"> +<ul class="bookmarkchat nav nav-pills nav-stacked"> {{foreach $rooms as $room}} <li><a href="{{$room.xchat_url}}">{{$room.xchat_desc}}</a></li> {{/foreach}} diff --git a/view/tpl/chatroom_new.tpl b/view/tpl/chatroom_new.tpl index a559dba54..c02e55c25 100644 --- a/view/tpl/chatroom_new.tpl +++ b/view/tpl/chatroom_new.tpl @@ -2,7 +2,7 @@ <form action="chat" method="post" > {{include file="field_input.tpl" field=$name}} -<button id="dbtn-acl" class="btn btn-default btn-xs" data-toggle="modal" data-target="#aclModal" onclick="return false;" >{{$permissions}}</button> +<button id="dbtn-acl" class="btn btn-default" data-toggle="modal" data-target="#aclModal" onclick="return false;" >{{$permissions}}</button> {{$acl}} <div class="clear"></div> <br /> diff --git a/view/tpl/chatrooms.tpl b/view/tpl/chatrooms.tpl index c3dae6627..836923231 100644 --- a/view/tpl/chatrooms.tpl +++ b/view/tpl/chatrooms.tpl @@ -2,7 +2,7 @@ {{if $is_owner}} <p> -<a href="{{$baseurl}}/chat/{{$nickname}}/new">{{$newroom}}</a> +<span class="btn btn-default"><a href="{{$baseurl}}/chat/{{$nickname}}/new">{{$newroom}}</a></span> </p> {{/if}} diff --git a/view/tpl/mail_display.tpl b/view/tpl/mail_display.tpl index 523a9160a..062710f1d 100755 --- a/view/tpl/mail_display.tpl +++ b/view/tpl/mail_display.tpl @@ -1,12 +1,16 @@ -<h3>{{$prvmsg_header}}</h3> <div class="generic-content-wrapper"> -{{foreach $mails as $mail}} - {{include file="mail_conv.tpl"}} -{{/foreach}} + <div class="section-title-wrapper"> + <h2>{{$prvmsg_header}}</h2> + </div> + <div class="section-content-wrapper"> + {{foreach $mails as $mail}} + {{include file="mail_conv.tpl"}} + {{/foreach}} -{{if $canreply}} -{{include file="prv_message.tpl"}} -{{else}} -{{$unknown_text}} -{{/if}} + {{if $canreply}} + {{include file="prv_message.tpl"}} + {{else}} + {{$unknown_text}} + {{/if}} + </div> </div> diff --git a/view/tpl/mail_head.tpl b/view/tpl/mail_head.tpl index 1cd7145e7..7bc854fff 100755 --- a/view/tpl/mail_head.tpl +++ b/view/tpl/mail_head.tpl @@ -1,3 +1,10 @@ -<h3>{{$messages}}</h3> - -{{$tab_content}} +<div class="generic-content-wrapper"> + <div class="section-title-wrapper"> + <h2>{{$header}}</h2> + </div> + <div class="section-content-wrapper"> + {{foreach $messages as $message}} + {{include file="mail_list.tpl"}} + {{/foreach}} + </div> +</div> diff --git a/view/tpl/mail_list.tpl b/view/tpl/mail_list.tpl index 1d499e12f..e3f8ef75c 100755 --- a/view/tpl/mail_list.tpl +++ b/view/tpl/mail_list.tpl @@ -1,8 +1,6 @@ -<div class="generic-content-wrapper" id="mail-list-wrapper"> - <a href="{{$from_url}}" class ="mail-list" ><img class="mail-list-sender-photo" src="{{$from_photo}}" alt="{{$from_name}}" /></a> - <span class="mail-list">{{$from_name}}</span> - <span class="mail-list {{if $seen}}seen{{else}}unseen{{/if}}"><a href="mail/{{$id}}" class="mail-link">{{$subject}}</a></span> - <span class="mail-list" title="{{$date}}">{{$date}}</span> - <span class="mail-list mail-list-remove" class="btn btn-default btn-sm"><a href="message/dropconv/{{$id}}" onclick="return confirmDelete();" title="{{$delete}}" class="btn btn-default btn-sm" ><i class="icon-trash mail-icons drop-icons"></i></a></span> - <div class="clear"> </div> -</div> +<a href="{{$message.from_url}}" class ="mail-list" ><img class="mail-list-sender-photo" src="{{$message.from_photo}}" alt="{{$message.from_name}}" /></a> +<span class="mail-list">{{$message.from_name}}</span> +<span class="mail-list {{if $message.seen}}seen{{else}}unseen{{/if}}"><a href="mail/{{$message.id}}" class="mail-link">{{$message.subject}}</a></span> +<span class="mail-list" title="{{$message.date}}">{{$message.date}}</span> +<span class="mail-list mail-list-remove" class="btn btn-default btn-sm"><a href="message/dropconv/{{$message.id}}" onclick="return confirmDelete();" title="{{$message.delete}}" class="btn btn-default btn-sm" ><i class="icon-trash mail-icons drop-icons"></i></a></span> +<div class="clear"></div> 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"> diff --git a/view/tpl/settings.tpl b/view/tpl/settings.tpl index 3a6e8b7a3..ab62ede45 100755 --- a/view/tpl/settings.tpl +++ b/view/tpl/settings.tpl @@ -26,6 +26,9 @@ {{include file="field_input.tpl" field=$photo_path}} {{include file="field_input.tpl" field=$attach_path}} + <div class="settings-submit-wrapper" > + <button type="submit" name="submit" class="btn btn-primary">{{$submit}}</button> + </div> </div> </div> </div> @@ -75,6 +78,9 @@ {{include file="field_checkbox.tpl" field=$blocktags}} {{include file="field_input.tpl" field=$expire}} </div> + <div class="settings-submit-wrapper" > + <button type="submit" name="submit" class="btn btn-primary">{{$submit}}</button> + </div> </div> </div> </div> @@ -124,14 +130,10 @@ {{include file="field_input.tpl" field=$evdays}} </div> </div> - </div> - </div> - </div> - <div class="panel"> - <div class"section-subtitle-wrapper" role="tab" id="form-buttons"> <div class="settings-submit-wrapper" > <button type="submit" name="submit" class="btn btn-primary">{{$submit}}</button> </div> + </div> </div> </div> {{if $menus}} |