Commit 7b99e599 authored by Jonny Bradley's avatar Jonny Bradley

[MRG] Automatic merge, branches/15.x 57682 to 57711

parent ce19822f
......@@ -1325,9 +1325,9 @@ $.fn.tiki = function(func, type, options) {
return this.each(function(){
var comment = this;
var text = $('dt:contains("note")', comment).next('dd').text();
var title = $('h6:first', comment).clone();
var body = $('.body:first', comment).clone();
body.find('dt:contains("note")').closest('dl').remove();
var title = $('h4:first', comment).clone();
var body = $('.comment-body:first', comment).clone();
body.find('dt:contains("note")').closest('dl').remove().addClass('panel');
if( text.length > 0 ) {
var parents = container.find(':contains("' + text + '")').parent();
......@@ -1336,7 +1336,7 @@ $.fn.tiki = function(func, type, options) {
.each( function() {
var child = $('dl.note-list',this);
if( ! child.length ) {
child = $('<dl class="note-list list-group-item-warning"/>')
child = $('<dl class="note-list list-group-item-info"/>')
.appendTo(this)
.hide();
......@@ -1379,6 +1379,8 @@ $.fn.tiki = function(func, type, options) {
$('form', this).submit(function () {
$.post($(this).attr('action'), $(this).serialize(), function () {
$block.dialog('destroy');
// update the comments list
editlink.closest('.comment-container').reload();
});
return false;
});
......
......@@ -330,7 +330,7 @@ function prefs_feature_list($partial = false)
'tags' => array('basic'),
),
'feature_faqs' => array(
'name' => tra('FAQ'),
'name' => tra('FAQs'),
'description' => tra('Frequently asked questions and answers'),
'warning' => tra('There has been discussion about this feature being retired, so keep in mind that normal wiki pages can be used to create and display FAQs.'),
'help' => 'FAQ',
......@@ -2827,6 +2827,7 @@ function prefs_feature_list($partial = false)
'description' => tra('Enable/disable inline comments.'),
'dependencies' => array(
'feature_wiki_comments',
'feature_wiki_paragraph_formatting',
),
'type' => 'flag',
'default' => 'n',
......
......@@ -101,7 +101,7 @@ function prefs_geo_list()
'description' => tr(''),
'type' => 'list',
'options' => array(
'ol2' => tra('OpenLayers 2.x (pre-Tiki 15.x legacy)'),
'ol2' => tra('OpenLayers 2.x (for use up to at least 15.x)'),
'ol3' => tra('OpenLayers 3.x (experimental)'),
),
'default' => 'ol2',
......
......@@ -39,8 +39,6 @@
<fieldset>
<legend>{tr}Inline comments{/tr}</legend>
{preference name=feature_inline_comments}
{tr}The feature below must be activated for this feature to work.{/tr}
{preference name=feature_wiki_paragraph_formatting}
</fieldset>
<fieldset>
<legend>{tr}Using comments in various features{/tr}</legend>
......
......@@ -2,10 +2,10 @@
<form class="form-horizontal" action="tiki-admin.php?page=community" method="post">
<input type="hidden" name="ticket" value="{$ticket|escape}">
<div class="t_navbar margin-bottom-md">
{button href="tiki-admingroups.php" _class="btn btn-link tips" _icon_name="group" _text="{tr}Groups{/tr}" _title=":{tr}Group Administration{/tr}"}
{button href="tiki-adminusers.php" _class="btn btn-link tips" _icon_name="user" _text="{tr}Users{/tr}" _title=":{tr}User Administration{/tr}"}
{permission_link mode=text label="{tr}Permissions{/tr}"}
<a href="{service controller=managestream action=list}" class="btn btn-link">{tr}Activity Rules{/tr}</a>
{button href="tiki-admingroups.php" _class="btn-link tips" _icon_name="group" _text="{tr}Groups{/tr}" _title=":{tr}Group Administration{/tr}"}
{button href="tiki-adminusers.php" _class="btn-link tips" _icon_name="user" _text="{tr}Users{/tr}" _title=":{tr}User Administration{/tr}"}
{permission_link addclass="btn btn-default btn-link" mode=text label="{tr}Permissions{/tr}"}
<a href="{service controller=managestream action=list}" class="btn btn-default btn-link tips">{tr}Activity Rules{/tr}</a>
<div class="pull-right">
<input type="submit" class="btn btn-primary btn-sm tips" title=":{tr}Apply Changes{/tr}" value="{tr}Apply{/tr}">
</div>
......
......@@ -25,7 +25,7 @@
<div class="panel-footer">
<input type="submit" class="clearfix comment-editclass btn btn-primary btn-sm" value="{tr}Save{/tr}"/>
<div class="btn btn-link">
<a href="#" onclick="$(this).closest('.comment-container, .ui-dialog-content').reload(); return false;">{tr}Cancel{/tr}</a>
<a href="#" onclick="$(this).closest('.comment-container').reload(); $(this).closest('.ui-dialog').remove(); return false;">{tr}Cancel{/tr}</a>
</div>
</div>
</fieldset>
......
......@@ -28,16 +28,15 @@
{if $allow_post}
<div class="submit">
<h3>
<div class="button buttons comment-form {if $prefs.wiki_comments_form_displayed_default eq 'y'}autoshow{/if}">
<a class="btn btn-primary custom-handling" href="{service controller=comment action=post type=$type objectId=$objectId}" data-target="#add-comment-zone-{$objectId|replace:' ':''|replace:',':''}">{tr}Post new comment{/tr}</a>
</div>
<div class="button buttons comment-form {if $prefs.wiki_comments_form_displayed_default eq 'y'}autoshow{/if}">
<a class="btn btn-primary custom-handling" href="{service controller=comment action=post type=$type objectId=$objectId}" data-target="#add-comment-zone-{$objectId|replace:' ':''|replace:',':''}">{tr}Post new comment{/tr}</a>
</div>
</div>
<div id="add-comment-zone-{$objectId|replace:' ':''|replace:',':''}" class="comment-form"></div>
<div id="add-comment-zone-{$objectId|replace:' ':''|replace:',':''}" class="add-comment-zone"></div>
{/if}
{if $prefs.feature_inline_comments eq 'y'}
<a id="note-editor-comment" class="alert alert-warning" href="#">{tr}Add Comment{/tr}</a>
<a id="note-editor-comment" class="alert alert-info" style="display:none;" href="#">{tr}Add Comment{/tr}</a>
{/if}
<script type="text/javascript">
......
......@@ -62,7 +62,7 @@
<input type="hidden" name="return_url" value="{$return_url|escape}">
<input type="submit" class="comment-post btn btn-primary btn-sm" value="{tr}Post{/tr}"/>
<div class="btn btn-link">
<a href="#" onclick="$(this).closest('.comment-container, .ui-dialog-content').reload(); return false;">{tr}Cancel{/tr}</a>
<a href="#" onclick="$(this).closest('.comment-container').reload(); $(this).closest('.ui-dialog').remove(); return false;">{tr}Cancel{/tr}</a>
</div>
</div>
</div>
......
......@@ -397,12 +397,12 @@
<label class="col-sm-3 control-label">
{tr}Default event status:{/tr}
</label>
<div class="col-sm-2">
<div class="col-sm-3">
{html_options class="form-control" name='options[defaulteventstatus]' options=$eventstatus selected=$defaulteventstatus}
</div>
</div>
<div class="form-group">
<div class="checkbox col-sm-3 col-sm-offset-3">
<div class="checkbox col-sm-4 col-sm-offset-3">
<label class="control-label">
<input type="checkbox" name="show[status]" value="on"{if $info.show_status eq 'y'} checked="checked"{/if}>
{tr}Show in popup view{/tr}
......@@ -410,7 +410,7 @@
</div>
</div>
<div class="form-group">
<div class="checkbox col-sm-3 col-sm-offset-3">
<div class="checkbox col-sm-4 col-sm-offset-3">
<label class="control-label">
<input type="checkbox" name="show[status_calview]" value="on"{if $info.show_status_calview ne 'n'} checked="checked"{/if}>
{tr}Show in calendar view{/tr}
......
......@@ -85,8 +85,8 @@
</tr>
{/foreach}
</table>
{button _icon_name="cog" _text="{tr}Admin Mail-in Routes{/tr}" href="tiki-admin_mailin_routes.php"}
<a href="{bootstrap_modal controller=mailin action=replace_account}" class="btn btn-default">{icon name="add"} {tr}Add Account{/tr}</a>
{button _icon_name="cog" _text="{tr}Admin Mail-in Routes{/tr}" _type="link" href="tiki-admin_mailin_routes.php"}
{if $tikifeedback}
{section name=n loop=$tikifeedback}<div class="alert {if $tikifeedback[n].num > 0} alert-warning{/if}">{$tikifeedback[n].mes}</div>{/section}
{/if}
......
......@@ -6,7 +6,7 @@
<a class="btn btn-default" href="{bootstrap_modal controller=menu action=manage_menu}">
{icon name="create"} {tr}Create Menu{/tr}
</a>
{button href="tiki-admin_modules.php" _icon_name="cogs" _text="{tr}Modules{/tr}"}
{button href="tiki-admin_modules.php" _icon_name="cogs" _type="link" _text="{tr}Modules{/tr}"}
</div>
{/if}
{include file='find.tpl'}
......
......@@ -5,16 +5,16 @@
<div class="t_navbar margin-bottom-md">
{button href="tiki-admin_modules.php?clear_cache=1" _icon_name="trash" _text="{tr}Clear Cache{/tr}"}
{if $tiki_p_edit_menu eq 'y'}
{button href="tiki-admin_menus.php" _icon_name="menu" _text="{tr}Admin Menus{/tr}"}
{/if}
{if empty($smarty.request.show_hidden_modules)}
{button show_hidden_modules="y" _icon_name="ok" _text="{tr}Show hidden modules{/tr}"}
{else}
{button show_hidden_modules="" _icon_name="disable" _text="{tr}Hide hidden modules{/tr}"}
{/if}
{button href="./" _icon_name="disable" _text="{tr}Exit Modules{/tr}"}
{button _text="{tr}Save{/tr}" _type="primary" _icon_name="floppy" _id="save_modules" _ajax="n"}
{if $tiki_p_edit_menu eq 'y'}
{button href="tiki-admin_menus.php" _icon_name="menu" _type="link" _text="{tr}Admin Menus{/tr}"}
{/if}
{button href="./" _icon_name="disable" _type="link" _text="{tr}Exit Modules{/tr}"}
</div>
{if !empty($missing_params)}
......
{* $Id$ *}
{title help="Banners"}{tr}Edit or create banners{/tr}{/title}
{title help="Banners"}{tr}Create or edit banners{/tr}{/title}
<div class="t_navbar margin-bottom-md">
{button href="tiki-list_banners.php" _text="{tr}List banners{/tr}"}
{button href="tiki-list_banners.php" _class="btn btn-link" _type="link" _icon_name="list" _text="{tr}List banners{/tr}"}
</div>
<form action="tiki-edit_banner.php" method="post" enctype="multipart/form-data" class="form-horizontal">
......@@ -139,29 +139,16 @@
<div class="panel panel-default">
<div class="panel-body">
<h4>{tr}Show the banner only on:{/tr}</h4>
<div class="col-sm-12">
<div class="form-group">
<div class="col-sm-1 col-sm-offset-2">
<label class="checkbox-inline"><input type="checkbox" name="Dmon" {if $Dmon eq 'y'}checked="checked"{/if}>{tr}Mon{/tr}</label>
</div>
<div class="col-sm-1">
<label class="checkbox-inline"><input type="checkbox" name="Dtue" {if $Dtue eq 'y'}checked="checked"{/if}>{tr}Tue{/tr}</label>
</div>
<div class="col-sm-1">
<label class="checkbox-inline"><input type="checkbox" name="Dwed" {if $Dwed eq 'y'}checked="checked"{/if}>{tr}Wed{/tr}</label>
</div>
<div class="col-sm-1">
<label class="checkbox-inline"><input type="checkbox" name="Dthu" {if $Dthu eq 'y'}checked="checked"{/if}>{tr}Thu{/tr}</label>
</div>
<div class="col-sm-1">
<label class="checkbox-inline"><input type="checkbox" name="Dfri" {if $Dfri eq 'y'}checked="checked"{/if}>{tr}Fri{/tr}</label>
</div>
<div class="col-sm-1">
<label class="checkbox-inline"><input type="checkbox" name="Dsat" {if $Dsat eq 'y'}checked="checked"{/if}>{tr}Sat{/tr}</label>
</div>
<div class="col-sm-1">
<label class="checkbox-inline"><input type="checkbox" name="Dsun" {if $Dsun eq 'y'}checked="checked"{/if}>{tr}Sun{/tr}</label>
</div>
</div>
</div></div>
</div>
</div>
......@@ -215,21 +202,25 @@
<div class="form-group">
<label class="col-sm-3 control-label">{tr}Movie URL{/tr}</label>
<div class="col-sm-7 margin-bottom-sm">
<input type="text" size="50" name="movieUrl" value="{$movie.movie|escape}" class="form-control">
<input type="text" name="movieUrl" value="{$movie.movie|escape}" class="form-control">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">{tr}Movie Size{/tr}</label>
<div class="col-sm-3">
<input type="text" size="4" name="movieWidth" value="{$movie.width|escape}" class="form-control" placeholder="{tr}width in pixels{/tr}">
<input type="text" name="movieWidth" value="{$movie.width|escape}" class="form-control" placeholder="{tr}width in pixels{/tr}">
<div class="help-block">
{tr}Pixels{/tr}
</div>
</div>
<div class="col-sm-3">
<input type="text" size="4" name="movieHeight" value="{$movie.height|escape}" class="form-control" placeholder="{tr}height in pixels{/tr}">
<input type="text" name="movieHeight" value="{$movie.height|escape}" class="form-control" placeholder="{tr}height in pixels{/tr}">
<div class="help-block">
{tr}Pixels{/tr}
</div>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">{tr}FlashPlugin min version{/tr}</label>
<div class="col-sm-7 margin-bottom-sm">
<input type="text" name="movieVersion" value="{$movie.version|escape}" class="form-control">
......@@ -251,7 +242,7 @@
</div>
</div>
</div>
<input type="submit" class="btn btn-default btn-sm" name="save" value="{tr}Save the Banner{/tr}">
<input type="submit" class="btn btn-default" name="save" value="{tr}Save the Banner{/tr}">
</form>
{if $zones}
......
......@@ -6,7 +6,7 @@
{if $tiki_p_admin_banners eq 'y'}
<div class="t_navbar margin-bottom-md">
{button href="tiki-edit_banner.php" class="btn btn-default" _text="{tr}Create banner{/tr}"}
{button href="tiki-edit_banner.php" class="btn btn-link" _type="link" _icon_name="sticky-note-o" _text="{tr}Create banner{/tr}"}
</div>
{/if}
......
......@@ -4,7 +4,7 @@
{button href='#' _onclick="javascript:window.open('tiki-live_support_console.php','','menubar=no,scrollbars=yes,resizable=yes,height=400,width=600');" class="btn btn-default" _text="{tr}Open operator console{/tr}"}
{button href='#' _onclick="javascript:window.open('tiki-live_support_client.php','','menubar=no,scrollbars=yes,resizable=yes,height=450,width=300');" class="btn btn-default" _text="{tr}Open client window{/tr}"}
{button href="?show_html" class="btn btn-default" _text="{tr}Generate HTML{/tr}"}
{button href="tiki-live_support_transcripts.php" class="btn btn-default" _text="{tr}Transcripts{/tr}"}
{button href="tiki-live_support_transcripts.php" class="btn btn-default" _type="link" _icon_name="file-text-o" _text="{tr}Transcripts{/tr}"}
</div>
{if $html}
......
......@@ -6,7 +6,7 @@
<div class="margin-bottom-md nohighlight">
{if $searchStyle neq "menu" && $prefs.feature_search_show_object_filter eq 'y'}
<div class="t_navbar">
<div class="t_navbar margin-bottom-sm">
{tr}Search in:{/tr}
{foreach item=name key=k from=$where_list}
{button _auto_args='where,highlight' href="tiki-searchresults.php?where=$k" _selected="{if $where == $k}y{else}n{/if}" _selected_class="highlight" class="btn btn-default" _text="$name"}
......
......@@ -8,7 +8,9 @@ if ($("form > input[name=origin]:hidden").length === 0) { // lightweight fix to
iframe: true,
scrolling: false,
width: 650,
height: 600
height: 650,
escKey: false,
overlayClose: false
});
}, 1000);
}
......
......@@ -2,8 +2,8 @@
{title help="System+Log"}{tr}Tiki Logs{/tr}{/title}
<div class="t_navbar margin-bottom-md">
<a href="tiki-sqllog.php" class="btn btn-link" title="{tr}Log SQL{/tr}">{icon name=""} {tr}Log SQL{/tr}</a>
<a href="tiki-admin_actionlog.php#Report" class="btn btn-link" title="{tr}Export through Action Log{/tr}">{icon name=""} {tr}Export through Action Log{/tr}</a>
<a href="tiki-sqllog.php" class="btn btn-link" title="{tr}Log SQL{/tr}">{icon name="pencil"} {tr}Log SQL{/tr}</a>
<a href="tiki-admin_actionlog.php#Report" class="btn btn-link" title="{tr}Export through Action Log{/tr}">{icon name="upload"} {tr}Export through Action Log{/tr}</a>
{* {button class="btn btn-default" _text="{tr}Log SQL{/tr}" href="tiki-sqllog.php"}
{button class="btn btn-default" _text="{tr}Export through Action Log{/tr}" href="tiki-admin_actionlog.php#Report"}
*}</div>
......
......@@ -77,7 +77,9 @@
{button href="#showtikiorg{$field.fieldId}_{$item.itemId}{if isset($context.list_mode)}_view{/if}" _onclick="showtikiorg_process{$field.fieldId}_{$item.itemId}('destroy');" _text="{tr}Destroy this show.tiki.org instance{/tr}"}
{button href="#showtikiorg{$field.fieldId}_{$item.itemId}{if isset($context.list_mode)}_view{/if}" _onclick="showtikiorg_process{$field.fieldId}_{$item.itemId}('reset');" _text="{tr}Reset password to 12345{/tr}"}
{/if}
<span class="buttonupdate{$field.fieldId}_{$item.itemId}" {if $field.version != 'trunk' && $field.version != '14.x' && $field.version != '13.x' && $field.version != '12.x'}style="display: none;"{/if}>{button href="#showtikiorg{$field.fieldId}_{$item.itemId}{if isset($context.list_mode)}_view{/if}" _onclick="showtikiorg_process{$field.fieldId}_{$item.itemId}('update');" _text="{tr}SVN update{/tr}"}</span>
<span class="buttonupdate{$field.fieldId}_{$item.itemId}" {if $field.version != 'trunk' && $field.version != '15.x' && $field.version != '14.x' && $field.version != '12.x'}style="display: none;"{/if}>
{button href="#showtikiorg{$field.fieldId}_{$item.itemId}{if isset($context.list_mode)}_view{/if}" _onclick="showtikiorg_process{$field.fieldId}_{$item.itemId}('update');" _text="{tr}SVN update{/tr}"}
</span>
</div>
{if $field.debugmode}
......
......@@ -2974,7 +2974,7 @@ body.tiki.navbar-padding {
.img-thumbnail.media-object {
max-width: none;
}
.tiki .form-horizontal input[type="checkbox"] {
.tiki .form-horizontal .form-group label + div > input[type="checkbox"] {
margin-top: .8em;
}
.tiki .form-horizontal .checkbox input[type="checkbox"] {
......
......@@ -164,7 +164,7 @@ body.tiki.navbar-padding {
}
// Needed to align checkbox with label, which has a top margin (admin forms with labels on left of input)
.tiki .form-horizontal input[type="checkbox"] { margin-top: .8em;}
.tiki .form-horizontal .form-group label + div > input[type="checkbox"] { margin-top: .8em; }
.tiki .form-horizontal .checkbox input[type="checkbox"] {margin-top: .4em;}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment