From: <xa...@us...> - 2016-08-26 10:25:10
|
Revision: 59519 http://sourceforge.net/p/tikiwiki/code/59519 Author: xavidp Date: 2016-08-26 10:25:07 +0000 (Fri, 26 Aug 2016) Log Message: ----------- [DOC]Add link to doc page about Preference filters in most places where they were cited. Modified Paths: -------------- trunk/templates/admin/admin_navbar.tpl trunk/templates/admin/include_list_sections.tpl trunk/templates/wizard/admin_wiki.tpl Modified: trunk/templates/admin/admin_navbar.tpl =================================================================== --- trunk/templates/admin/admin_navbar.tpl 2016-08-25 19:22:19 UTC (rev 59518) +++ trunk/templates/admin/admin_navbar.tpl 2016-08-26 10:25:07 UTC (rev 59519) @@ -7,7 +7,7 @@ <span class="icon-bar"></span> </button> <ul class="nav navbar-nav"> - <li class="dropdown"> + <li class="dropdown"> <a href="#" class="dropdown-toggle" data-toggle="dropdown" title="{tr}Settings{/tr}"> {icon name="filter"} <span class="caret"></span> </a> @@ -171,6 +171,6 @@ {/jq} {elseif $lm_criteria} {remarksbox type="note" title="{tr}No results{/tr}" icon="magnifier"} - {tr}No preferences were found for your search query with your current choice of Preference Filters ({icon name="filter"}).{/tr}{if $prefs.unified_engine eq 'lucene'}{tr} Not what you expected? Try {/tr}<a class="alert-link" href="tiki-admin.php?prefrebuild">{tr}rebuild{/tr}</a> {tr}the preferences search index.{/tr}{/if} + {tr}No preferences were found for your search query with your <a class='alert-link' target='tikihelp' href='https://doc.tiki.org/Preference+Filters'>current choice of Preference Filters</a> ({icon name="filter"}).{/tr}{if $prefs.unified_engine eq 'lucene'}{tr} Not what you expected? Try {/tr}<a class="alert-link" href="tiki-admin.php?prefrebuild">{tr}rebuild{/tr}</a> {tr}the preferences search index.{/tr}{/if} {/remarksbox} {/if} Modified: trunk/templates/admin/include_list_sections.tpl =================================================================== --- trunk/templates/admin/include_list_sections.tpl 2016-08-25 19:22:19 UTC (rev 59518) +++ trunk/templates/admin/include_list_sections.tpl 2016-08-26 10:25:07 UTC (rev 59519) @@ -8,7 +8,7 @@ {remarksbox type="tip" title="{tr}Tip{/tr}"} {tr}Enable/disable Tiki features in {/tr}<a class="alert-link" href="tiki-admin.php?page=features">{tr}Control Panels{/tr} {$prefs.site_crumb_seper} {tr}Features{/tr}</a>{tr}, but configure them elsewhere{/tr}. <br/> - {tr}See <strong>more options</strong> after you enable more <em>Preference Filters</em> above ({icon name="filter"}){/tr}. + {tr}See <strong>more options</strong> after you enable more <a class='alert-link' target='tikihelp' href='https://doc.tiki.org/Preference+Filters'>Preference Filters</a> above ({icon name="filter"}){/tr}. {/remarksbox} <div class="clearfix"> Modified: trunk/templates/wizard/admin_wiki.tpl =================================================================== --- trunk/templates/wizard/admin_wiki.tpl 2016-08-25 19:22:19 UTC (rev 59518) +++ trunk/templates/wizard/admin_wiki.tpl 2016-08-26 10:25:07 UTC (rev 59519) @@ -29,7 +29,7 @@ {remarksbox type="info" title="{tr}Info{/tr}"} {tr}Once you have the feature '<strong>Categories</strong>' enabled, you will need to define some content categories, and indicate which ones require revision approval for their wiki pages{/tr}. <br><br/> - {tr}You will be able to set the category ids here when you come back with Categories enabled, or at the corresponding <a href="tiki-admin.php?page=wiki&cookietab=3" target="_blank">Control Panel</a> with the '<em>Advanced</em>' features shown in the Preference Filters{/tr}. + {tr}You will be able to set the category ids here when you come back with Categories enabled, or at the corresponding <a href="tiki-admin.php?page=wiki&cookietab=3" target="_blank">Control Panel</a> with the '<em>Advanced</em>' features shown in the <a class='alert-link' target='tikihelp' href='https://doc.tiki.org/Preference+Filters'>Preference Filters</a>{/tr}. {/remarksbox} {/if} </div> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <li...@us...> - 2017-01-01 16:38:06
|
Revision: 60757 http://sourceforge.net/p/tikiwiki/code/60757 Author: lindonb Date: 2017-01-01 16:38:03 +0000 (Sun, 01 Jan 2017) Log Message: ----------- notices Modified Paths: -------------- trunk/templates/find.tpl trunk/templates/tiki-listpages.tpl Modified: trunk/templates/find.tpl =================================================================== --- trunk/templates/find.tpl 2017-01-01 16:34:54 UTC (rev 60756) +++ trunk/templates/find.tpl 2017-01-01 16:38:03 UTC (rev 60757) @@ -43,7 +43,7 @@ </span> <input class="form-control" type="text" name="find" id="find" value="{$find|escape}" placeholder="{if empty($whatlabel)}{tr}Find{/tr}...{else}{tr}{$whatlabel}{/tr}{/if}"> {if isset($autocomplete)} - {jq}$("#find").tiki("autocomplete", "{{$autocomplete}}"){/jq} + {jq}$("#find").tiki("autocomplete", "{{$autocomplete}}");{/jq} {/if} {if $prefs.javascript_enabled eq 'y' and (isset($exact_match) or isset($types) or isset($types_tag) or isset($find_topics) or isset($find_show_languages) or isset($find_lang) or isset($find_show_categories) or isset($find_show_categories_multi) or isset($find_categId) or isset($find_show_num_rows) or isset($find_show_date_range) or isset($find_show_orphans) or isset($find_show_sub) or isset($find_show_other))} <div class="input-group-btn btn btn-default btn-sm find-parameters-btn"> Modified: trunk/templates/tiki-listpages.tpl =================================================================== --- trunk/templates/tiki-listpages.tpl 2017-01-01 16:34:54 UTC (rev 60756) +++ trunk/templates/tiki-listpages.tpl 2017-01-01 16:38:03 UTC (rev 60757) @@ -4,7 +4,7 @@ {tabset name='tabs_wikipages'} {tab name="{tr}List Wiki Pages{/tr}"} <h2>{tr}List Wiki Pages{/tr}</h2> - {if !$tsOn} + {if !$ts.enabled} <div class="clearfix"> {include autocomplete='pagename' file='find.tpl' find_show_languages='y' find_show_languages_excluded='y' find_show_categories_multi='y' find_show_num_rows='y' find_in="<ul><li>{tr}Page name{/tr}</li></ul>" } </div> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <chi...@us...> - 2017-01-20 11:38:09
|
Revision: 60955 http://sourceforge.net/p/tikiwiki/code/60955 Author: chibaguy Date: 2017-01-20 11:38:07 +0000 (Fri, 20 Jan 2017) Log Message: ----------- [MRG][FIX] Add bottom margin to div.t_navbar for white space between buttons and tabs in legacy tab view. No visual change when when modal popup is used rather than tabs. (Merged from 16.x revision 60954.) Revision Links: -------------- http://sourceforge.net/p/tikiwiki/code/60954 Modified Paths: -------------- trunk/templates/tiki-view_tracker.tpl Property Changed: ---------------- trunk/templates/ Index: trunk/templates =================================================================== --- trunk/templates 2017-01-20 11:29:35 UTC (rev 60954) +++ trunk/templates 2017-01-20 11:38:07 UTC (rev 60955) Property changes on: trunk/templates ___________________________________________________________________ Modified: svn:mergeinfo ## -4,7 +4,7 ## /branches/13.x/templates:51407-53060,53145,53192 /branches/14.x/templates:54103-54145,54150-54151,54156-54187,54232-54237,54240-54306,54309-54345,54352-54391,54396-54402,54405-54418,54422-54454,54457-54473,54476-54585,54598-54622,54632-54739,54753-54780,54788-54796,54806-54859,54862-54863,54876-54894,54897-54918,54925-54929,54932-54935,54957-54966,54981-54989,54992-54996,55000-55052,55055-55159,55167-55204,55235-55299,55304-55310,55317-55332,55337-55363,55366-55486,55493-55519,55549-55571,55578-55585,55588-55658,55671-55683,55686-55741,55744-55778,55784-55857,55863-55872,55881-55910,55914-55922,55927-55971,55984-56001,56008-56019,56022-56023,56033-56040,56045-56055,56077-56117,56157-56185,56199-56224,56258-56264,56292-56311,56326-56328,56335-56339,56353-56357,56371-56382,56385-56387,56405-56411,56427-56429,56452-56464,56469-56484,56512-56544,56561-56592,56638-56640,56645-56646,56649-56652,56730-56742 /branches/15.x/templates:57422-57449,57465-57504,57514-57541,57556-57598,57604-57609,57614-57678,57683-57731,57735-57748,57754-57848,57853-57865,57868-57882,57887-57924,57927-57977,57983-58007,58013-58028,58031-58060,58065-58089,58097-58102,58107-58131,58147-58158,58167-58276,58280-58305,58314-58355,58361-58364,58396-58399,58406-58417,58433-58435,58451-58452,58455-58535,58538-58573,58576-58581,58591-58689,58694-58756,58761-58793,58796-58797,58806-58808,58821-58835,58863-58871,58876-58896,58904-58914,58919-58969,58983-58997,59003-59004,59007-59013,59016-59076,59085-59163,59420 -/branches/16.x/templates:59885-59892,59903-59914,59944-59945,59954-59958,59963-59967,60011-60062,60066-60095,60105-60122,60168-60189,60192-60200,60256-60269,60278-60286,60306-60347,60375-60397,60408,60433-60437,60445-60454,60473-60499,60504-60517,60523-60528,60537-60569,60587-60596,60606-60614,60638-60692,60698-60710,60714-60715,60723-60745,60766,60806-60825,60841-60852,60859-60896,60914-60922,60929-60935 +/branches/16.x/templates:59885-59892,59903-59914,59944-59945,59954-59958,59963-59967,60011-60062,60066-60095,60105-60122,60168-60189,60192-60200,60256-60269,60278-60286,60306-60347,60375-60397,60408,60433-60437,60445-60454,60473-60499,60504-60517,60523-60528,60537-60569,60587-60596,60606-60614,60638-60692,60698-60710,60714-60715,60723-60745,60766,60806-60825,60841-60852,60859-60896,60914-60922,60929-60935,60954 /branches/3.0/templates:16998-18916 /branches/4.x/templates:22817-23908 /branches/5.x/templates:26025-26523,26527-28378 \ No newline at end of property Modified: trunk/templates/tiki-view_tracker.tpl =================================================================== --- trunk/templates/tiki-view_tracker.tpl 2017-01-20 11:29:35 UTC (rev 60954) +++ trunk/templates/tiki-view_tracker.tpl 2017-01-20 11:38:07 UTC (rev 60955) @@ -7,7 +7,7 @@ <div class="description help-block">{$tracker_info.description|escape|nl2br}</div> {/if} {/if} -<div class="t_navbar"> +<div class="t_navbar margin-bottom-md"> {if $tiki_p_create_tracker_items eq 'y' && $prefs.tracker_legacy_insert neq 'y'} <a class="btn btn-default" href="{bootstrap_modal controller=tracker action=insert_item trackerId=$trackerId}"> {icon name="create"} {tr}Create Item{/tr} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mar...@us...> - 2017-02-08 12:36:02
|
Revision: 61250 http://sourceforge.net/p/tikiwiki/code/61250 Author: marclaporte Date: 2017-02-08 12:36:00 +0000 (Wed, 08 Feb 2017) Log Message: ----------- fix some typos Modified Paths: -------------- trunk/templates/antibot.tpl trunk/templates/register-email.tpl trunk/templates/register-pass.tpl trunk/templates/register-pass2.tpl trunk/templates/register-passcode.tpl Modified: trunk/templates/antibot.tpl =================================================================== --- trunk/templates/antibot.tpl 2017-02-08 11:05:37 UTC (rev 61249) +++ trunk/templates/antibot.tpl 2017-02-08 12:36:00 UTC (rev 61250) @@ -36,7 +36,7 @@ <input class="form-control" type="text" maxlength="8" size="22" name="captcha[input]" id="antibotcode"> </div> <div class="col-md-1 col-sm-1"> - <span class='text-danger tips' title=":{tr}This field is manadatory{/tr}">*</span> + <span class='text-danger tips' title=":{tr}This field is mandatory{/tr}">*</span> </div> {else} <div class="{if $form === 'register' && !empty($inputclass)}{$inputclass}{else}col-md-8 col-sm-9 col-xs-12{/if}"> @@ -54,7 +54,7 @@ </div> {if $showmandatory eq 'y'} <div class="col-md-1 col-sm-1"> - <span class='text-danger tips' title=":{tr}This field is manadatory{/tr}">*</span> + <span class='text-danger tips' title=":{tr}This field is mandatory{/tr}">*</span> </div> {/if} </div> Modified: trunk/templates/register-email.tpl =================================================================== --- trunk/templates/register-email.tpl 2017-02-08 11:05:37 UTC (rev 61249) +++ trunk/templates/register-email.tpl 2017-02-08 12:36:00 UTC (rev 61250) @@ -5,7 +5,7 @@ {else} {if $prefs.login_is_email ne 'y'} <div class="form-group"> - <label class="col-sm-4 control-label" for="email">{tr}Email{/tr} {if $trackerEditFormId}<span class='text-danger tips' title=":{tr}This field is manadatory{/tr}">*</span>{/if}</label> + <label class="col-sm-4 control-label" for="email">{tr}Email{/tr} {if $trackerEditFormId}<span class='text-danger tips' title=":{tr}This field is mandatory{/tr}">*</span>{/if}</label> <div class="col-sm-8"> <input class="form-control" type="text" id="email" name="email" value="{if !empty($smarty.post.email)}{$smarty.post.email}{/if}"> {if $prefs.validateUsers eq 'y' and $prefs.validateEmail ne 'y'} Modified: trunk/templates/register-pass.tpl =================================================================== --- trunk/templates/register-pass.tpl 2017-02-08 11:05:37 UTC (rev 61249) +++ trunk/templates/register-pass.tpl 2017-02-08 12:36:00 UTC (rev 61250) @@ -5,7 +5,7 @@ {else} {if !isset($openid_associate) || $openid_associate neq 'y'} <div class="form-group"> - <label class="col-sm-4 control-label" for="pass1">{tr}Password{/tr} {if $trackerEditFormId}<span class='text-danger tips' title=":{tr}This field is manadatory{/tr}">*</span>{/if}</label> + <label class="col-sm-4 control-label" for="pass1">{tr}Password{/tr} {if $trackerEditFormId}<span class='text-danger tips' title=":{tr}This field is mandatory{/tr}">*</span>{/if}</label> <div class="col-sm-8"> <input class="form-control" Modified: trunk/templates/register-pass2.tpl =================================================================== --- trunk/templates/register-pass2.tpl 2017-02-08 11:05:37 UTC (rev 61249) +++ trunk/templates/register-pass2.tpl 2017-02-08 12:36:00 UTC (rev 61250) @@ -5,7 +5,7 @@ {else} {if !isset($openid_associate) || $openid_associate neq 'y'} <div class="form-group"> - <label class="col-sm-4 control-label" for="pass2">{tr}Repeat password{/tr} {if $trackerEditFormId}<span class='text-danger tips' title=":{tr}This field is manadatory{/tr}">*</span>{/if}</label> + <label class="col-sm-4 control-label" for="pass2">{tr}Repeat password{/tr} {if $trackerEditFormId}<span class='text-danger tips' title=":{tr}This field is mandatory{/tr}">*</span>{/if}</label> <div class="col-sm-8"> <input class="form-control" Modified: trunk/templates/register-passcode.tpl =================================================================== --- trunk/templates/register-passcode.tpl 2017-02-08 11:05:37 UTC (rev 61249) +++ trunk/templates/register-passcode.tpl 2017-02-08 12:36:00 UTC (rev 61250) @@ -5,7 +5,7 @@ {else} {if $prefs.useRegisterPasscode eq 'y'} <div class="form-group"> - <label class="col-sm-4 control-label" for="passcode">{tr}Passcode to register{/tr} <span class='text-danger tips' title=":{tr}This field is manadatory{/tr}">*</span> + <label class="col-sm-4 control-label" for="passcode">{tr}Passcode to register{/tr} <span class='text-danger tips' title=":{tr}This field is mandatory{/tr}">*</span> </label> <div class="col-sm-8"> <input class="form-control" required="" type="password" name="passcode" id="passcode" onkeypress="regCapsLock(event)" value="{if !empty($smarty.post.passcode)}{$smarty.post.passcode}{/if}"> <em class="help-block">{tr}Not your password.{/tr} <span id="passcode-help" style="display:none">{tr}To request a passcode, {if $prefs.feature_contact eq 'y'}<a href="tiki-contact.php">{/if} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jy...@us...> - 2017-03-22 23:53:30
|
Revision: 61826 http://sourceforge.net/p/tikiwiki/code/61826 Author: jyhem Date: 2017-03-22 23:53:26 +0000 (Wed, 22 Mar 2017) Log Message: ----------- Indentation fixes. Tiki standardises on tab indenting Modified Paths: -------------- trunk/templates/layouts/basic/layout_view.tpl trunk/templates/layouts/classic/layout_view.tpl trunk/templates/layouts/classic/module.tpl trunk/templates/layouts/fixed_top_modules/layout_view.tpl trunk/templates/layouts/header_middle_footer_containers_3-6-3/layout_view.tpl trunk/templates/tiki-admin.tpl trunk/templates/tiki-admin_polls.tpl trunk/templates/tiki-directory_bar.tpl trunk/templates/tiki-edit_perspective.tpl trunk/templates/tiki-import_structuredtext.tpl trunk/templates/tiki-list_submissions.tpl trunk/templates/tiki-mods_admin.tpl trunk/templates/tiki-pagehistory.tpl trunk/templates/tiki-upload_file.tpl trunk/templates/tiki-view_tracker_item.tpl trunk/templates/tracker_filter.tpl Modified: trunk/templates/layouts/basic/layout_view.tpl =================================================================== --- trunk/templates/layouts/basic/layout_view.tpl 2017-03-22 21:52:45 UTC (rev 61825) +++ trunk/templates/layouts/basic/layout_view.tpl 2017-03-22 23:53:26 UTC (rev 61826) @@ -1,8 +1,8 @@ {* $Id: layout_view.tpl 48366 2013-11-08 16:12:24Z lphuberdeau $ *}<!DOCTYPE html> <html lang="{if !empty($pageLang)}{$pageLang}{else}{$prefs.language}{/if}"{if !empty($page_id)} id="page_{$page_id}"{/if}> <head> - {include file='header.tpl'} - <meta name="viewport" content="width=device-width, initial-scale=1.0"> + {include file='header.tpl'} + <meta name="viewport" content="width=device-width, initial-scale=1.0"> </head> <body{html_body_attributes}> {$cookie_consent_html} @@ -10,121 +10,121 @@ {include file="layout_fullscreen_check.tpl"} {if $prefs.feature_ajax eq 'y'} - {include file='tiki-ajax_header.tpl'} + {include file='tiki-ajax_header.tpl'} {/if} <div class="container{if isset($smarty.session.fullscreen) && $smarty.session.fullscreen eq 'y'}-fluid{/if}"> {if !isset($smarty.session.fullscreen) || $smarty.session.fullscreen ne 'y'} - <div class="page-header" id="page-header"> - {modulelist zone=top class='row top_modules'} - <div class="topbar row" id="topbar"> - {modulelist zone=topbar} - </div> - </div> + <div class="page-header" id="page-header"> + {modulelist zone=top class='row top_modules'} + <div class="topbar row" id="topbar"> + {modulelist zone=topbar} + </div> + </div> {/if} - <div class="row row-middle" id="row-middle"> - {if zone_is_empty('left') and zone_is_empty('right')} - <div class="col-md-12 col1" id="col1"> - {if $prefs.module_zones_pagetop eq 'fixed' or ($prefs.module_zones_pagetop ne 'n' && ! zone_is_empty('pagetop'))} - {modulelist zone=pagetop} - {/if} - {feedback} - {block name=quicknav}{/block} - {block name=title}{/block} - {block name=navigation}{/block} - {block name=content}{/block} - {if $prefs.module_zones_pagebottom eq 'fixed' or ($prefs.module_zones_pagebottom ne 'n' && ! zone_is_empty('pagebottom'))} - {modulelist zone=pagebottom} - {/if} - </div> - {elseif zone_is_empty('left') or $prefs.feature_left_column eq 'n'} - <div class="col-md-12 text-right"> - {if $prefs.feature_right_column eq 'user'} - {$icon_name = (not empty($smarty.cookies.hide_zone_right)) ? 'toggle-left' : 'toggle-right'} - {icon name=$icon_name class='toggle_zone right' href='#' title='{tr}Toggle right modules{/tr}'} - {/if} - </div> - <div class="col-md-9 col1" id="col1"> - {if $prefs.module_zones_pagetop eq 'fixed' or ($prefs.module_zones_pagetop ne 'n' && ! zone_is_empty('pagetop'))} - {modulelist zone=pagetop} - {/if} - {feedback} - {block name=quicknav}{/block} - {block name=title}{/block} - {block name=navigation}{/block} - {block name=content}{/block} - {if $prefs.module_zones_pagebottom eq 'fixed' or ($prefs.module_zones_pagebottom ne 'n' && ! zone_is_empty('pagebottom'))} - {modulelist zone=pagebottom} - {/if} - </div> - <div class="col-md-3" id="col3"> - {modulelist zone=right} - </div> - {elseif zone_is_empty('right') or $prefs.feature_right_column eq 'n'} - <div class="col-md-12 text-left"> - {if $prefs.feature_left_column eq 'user'} - {$icon_name = (not empty($smarty.cookies.hide_zone_left)) ? 'toggle-right' : 'toggle-left'} - {icon name=$icon_name class='toggle_zone left' href='#' title='{tr}Toggle left modules{/tr}'} - {/if} - </div> - <div class="col-md-9 col-md-push-3 col1" id="col1"> - {if $prefs.module_zones_pagetop eq 'fixed' or ($prefs.module_zones_pagetop ne 'n' && ! zone_is_empty('pagetop'))} - {modulelist zone=pagetop} - {/if} - {feedback} - {block name=quicknav}{/block} - {block name=title}{/block} - {block name=navigation}{/block} - {block name=content}{/block} - {if $prefs.module_zones_pagebottom eq 'fixed' or ($prefs.module_zones_pagebottom ne 'n' && ! zone_is_empty('pagebottom'))} - {modulelist zone=pagebottom} - {/if} - </div> - <div class="col-md-3 col-md-pull-9" id="col2"> - {modulelist zone=left} - </div> - {else} - <div class="col-md-6 text-left"> - {if $prefs.feature_left_column eq 'user'} - {$icon_name = (not empty($smarty.cookies.hide_zone_left)) ? 'toggle-right' : 'toggle-left'} - {icon name=$icon_name class='toggle_zone left' href='#' title='{tr}Toggle left modules{/tr}'} - {/if} - </div> - <div class="col-md-6 text-right"> - {if $prefs.feature_right_column eq 'user'} - {$icon_name = (not empty($smarty.cookies.hide_zone_right)) ? 'toggle-left' : 'toggle-right'} - {icon name=$icon_name class='toggle_zone right' href='#' title='{tr}Toggle right modules{/tr}'} - {/if} - </div> - <div class="col-md-8 col-md-push-2 col1" id="col1"> - {if $prefs.module_zones_pagetop eq 'fixed' or ($prefs.module_zones_pagetop ne 'n' && ! zone_is_empty('pagetop'))} - {modulelist zone=pagetop} - {/if} - {feedback} - {block name=quicknav}{/block} - {block name=title}{/block} - {block name=navigation}{/block} - {block name=content}{/block} - {if $prefs.module_zones_pagebottom eq 'fixed' or ($prefs.module_zones_pagebottom ne 'n' && ! zone_is_empty('pagebottom'))} - {modulelist zone=pagebottom} - {/if} - </div> - <div class="col-md-2 col-md-pull-8" id="col2"> - {modulelist zone=left} - </div> - <div class="col-md-2" id="col3"> - {modulelist zone=right} - </div> - {/if} - </div> + <div class="row row-middle" id="row-middle"> + {if zone_is_empty('left') and zone_is_empty('right')} + <div class="col-md-12 col1" id="col1"> + {if $prefs.module_zones_pagetop eq 'fixed' or ($prefs.module_zones_pagetop ne 'n' && ! zone_is_empty('pagetop'))} + {modulelist zone=pagetop} + {/if} + {feedback} + {block name=quicknav}{/block} + {block name=title}{/block} + {block name=navigation}{/block} + {block name=content}{/block} + {if $prefs.module_zones_pagebottom eq 'fixed' or ($prefs.module_zones_pagebottom ne 'n' && ! zone_is_empty('pagebottom'))} + {modulelist zone=pagebottom} + {/if} + </div> + {elseif zone_is_empty('left') or $prefs.feature_left_column eq 'n'} + <div class="col-md-12 text-right"> + {if $prefs.feature_right_column eq 'user'} + {$icon_name = (not empty($smarty.cookies.hide_zone_right)) ? 'toggle-left' : 'toggle-right'} + {icon name=$icon_name class='toggle_zone right' href='#' title='{tr}Toggle right modules{/tr}'} + {/if} + </div> + <div class="col-md-9 col1" id="col1"> + {if $prefs.module_zones_pagetop eq 'fixed' or ($prefs.module_zones_pagetop ne 'n' && ! zone_is_empty('pagetop'))} + {modulelist zone=pagetop} + {/if} + {feedback} + {block name=quicknav}{/block} + {block name=title}{/block} + {block name=navigation}{/block} + {block name=content}{/block} + {if $prefs.module_zones_pagebottom eq 'fixed' or ($prefs.module_zones_pagebottom ne 'n' && ! zone_is_empty('pagebottom'))} + {modulelist zone=pagebottom} + {/if} + </div> + <div class="col-md-3" id="col3"> + {modulelist zone=right} + </div> + {elseif zone_is_empty('right') or $prefs.feature_right_column eq 'n'} + <div class="col-md-12 text-left"> + {if $prefs.feature_left_column eq 'user'} + {$icon_name = (not empty($smarty.cookies.hide_zone_left)) ? 'toggle-right' : 'toggle-left'} + {icon name=$icon_name class='toggle_zone left' href='#' title='{tr}Toggle left modules{/tr}'} + {/if} + </div> + <div class="col-md-9 col-md-push-3 col1" id="col1"> + {if $prefs.module_zones_pagetop eq 'fixed' or ($prefs.module_zones_pagetop ne 'n' && ! zone_is_empty('pagetop'))} + {modulelist zone=pagetop} + {/if} + {feedback} + {block name=quicknav}{/block} + {block name=title}{/block} + {block name=navigation}{/block} + {block name=content}{/block} + {if $prefs.module_zones_pagebottom eq 'fixed' or ($prefs.module_zones_pagebottom ne 'n' && ! zone_is_empty('pagebottom'))} + {modulelist zone=pagebottom} + {/if} + </div> + <div class="col-md-3 col-md-pull-9" id="col2"> + {modulelist zone=left} + </div> + {else} + <div class="col-md-6 text-left"> + {if $prefs.feature_left_column eq 'user'} + {$icon_name = (not empty($smarty.cookies.hide_zone_left)) ? 'toggle-right' : 'toggle-left'} + {icon name=$icon_name class='toggle_zone left' href='#' title='{tr}Toggle left modules{/tr}'} + {/if} + </div> + <div class="col-md-6 text-right"> + {if $prefs.feature_right_column eq 'user'} + {$icon_name = (not empty($smarty.cookies.hide_zone_right)) ? 'toggle-left' : 'toggle-right'} + {icon name=$icon_name class='toggle_zone right' href='#' title='{tr}Toggle right modules{/tr}'} + {/if} + </div> + <div class="col-md-8 col-md-push-2 col1" id="col1"> + {if $prefs.module_zones_pagetop eq 'fixed' or ($prefs.module_zones_pagetop ne 'n' && ! zone_is_empty('pagetop'))} + {modulelist zone=pagetop} + {/if} + {feedback} + {block name=quicknav}{/block} + {block name=title}{/block} + {block name=navigation}{/block} + {block name=content}{/block} + {if $prefs.module_zones_pagebottom eq 'fixed' or ($prefs.module_zones_pagebottom ne 'n' && ! zone_is_empty('pagebottom'))} + {modulelist zone=pagebottom} + {/if} + </div> + <div class="col-md-2 col-md-pull-8" id="col2"> + {modulelist zone=left} + </div> + <div class="col-md-2" id="col3"> + {modulelist zone=right} + </div> + {/if} + </div> {if !isset($smarty.session.fullscreen) || $smarty.session.fullscreen ne 'y'} - <footer class="footer" id="footer"> - <div class="footer_liner"> - {modulelist zone=bottom class='row row-sidemargins-zero'} - </div> - </footer> + <footer class="footer" id="footer"> + <div class="footer_liner"> + {modulelist zone=bottom class='row row-sidemargins-zero'} + </div> + </footer> {/if} </div> @@ -132,5 +132,5 @@ </body> </html> {if !empty($smarty.request.show_smarty_debug)} - {debug} + {debug} {/if} Modified: trunk/templates/layouts/classic/layout_view.tpl =================================================================== --- trunk/templates/layouts/classic/layout_view.tpl 2017-03-22 21:52:45 UTC (rev 61825) +++ trunk/templates/layouts/classic/layout_view.tpl 2017-03-22 23:53:26 UTC (rev 61826) @@ -1,8 +1,8 @@ {* $Id$ *}<!DOCTYPE html> <html lang="{if !empty($pageLang)}{$pageLang}{else}{$prefs.language}{/if}"{if $prefs.feature_bidi eq 'y'} dir="rtl"{/if}{if !empty($page_id)} id="page_{$page_id}"{/if}> <head> - {include file='header.tpl'} - <meta name="viewport" content="width=device-width, initial-scale=1.0"> + {include file='header.tpl'} + <meta name="viewport" content="width=device-width, initial-scale=1.0"> </head> <body{html_body_attributes}> {$cookie_consent_html} @@ -10,7 +10,7 @@ {include file="layout_fullscreen_check.tpl"} {if $prefs.feature_ajax eq 'y'} - {include file='tiki-ajax_header.tpl'} + {include file='tiki-ajax_header.tpl'} {/if} {if $prefs.feature_layoutshadows eq 'y'} @@ -17,155 +17,155 @@ <div id="main-shadow">{eval var=$prefs.main_shadow_start}{/if} {if $smarty.session.fullscreen ne 'y'} - {if $prefs.feature_layoutshadows eq 'y'} - <div id="header-shadow">{eval var=$prefs.header_shadow_start}{/if} - <div class="header_outer" id="header_outer"> - <div class="header_container"> - <div class="container{if $smarty.session.fullscreen eq 'y'}-fluid{/if}"> - <header class="header page-header" id="page-header"> - {modulelist zone=top class='row top_modules'} - </header> - </div> - </div> - </div> - {if $prefs.feature_layoutshadows eq 'y'}{eval var=$prefs.header_shadow_end}</div>{/if} + {if $prefs.feature_layoutshadows eq 'y'} + <div id="header-shadow">{eval var=$prefs.header_shadow_start}{/if} + <div class="header_outer" id="header_outer"> + <div class="header_container"> + <div class="container{if $smarty.session.fullscreen eq 'y'}-fluid{/if}"> + <header class="header page-header" id="page-header"> + {modulelist zone=top class='row top_modules'} + </header> + </div> + </div> + </div> + {if $prefs.feature_layoutshadows eq 'y'}{eval var=$prefs.header_shadow_end}</div>{/if} {/if} - <div class="middle_outer" id="middle_outer" > - <div class="container{if $smarty.session.fullscreen eq 'y'}-fluid{/if} clearfix middle" id="middle"> - <div class="row topbar" id="topbar"> - {modulelist zone=topbar} - </div> - <div class="row" id="row-middle"> - {if zone_is_empty('left') and zone_is_empty('right')} - <div class="col-md-12 col1" id="col1"> + <div class="middle_outer" id="middle_outer" > + <div class="container{if $smarty.session.fullscreen eq 'y'}-fluid{/if} clearfix middle" id="middle"> + <div class="row topbar" id="topbar"> + {modulelist zone=topbar} + </div> + <div class="row" id="row-middle"> + {if zone_is_empty('left') and zone_is_empty('right')} + <div class="col-md-12 col1" id="col1"> - {if $prefs.feature_layoutshadows eq 'y'} - <div id="tiki-center-shadow">{eval var=$prefs.center_shadow_start}{/if} - {if $prefs.module_zones_pagetop eq 'fixed' or ($prefs.module_zones_pagetop ne 'n' && ! zone_is_empty('pagetop'))} - {modulelist zone=pagetop} - {/if} - {feedback} - {block name=quicknav}{/block} - {block name=title}{/block} - {block name=navigation}{/block} - {block name=content}{/block} - {if $prefs.module_zones_pagebottom eq 'fixed' or ($prefs.module_zones_pagebottom ne 'n' && ! zone_is_empty('pagebottom'))} - {modulelist zone=pagebottom} - {/if} - {if $prefs.feature_layoutshadows eq 'y'}{eval var=$prefs.center_shadow_end}</div>{/if} + {if $prefs.feature_layoutshadows eq 'y'} + <div id="tiki-center-shadow">{eval var=$prefs.center_shadow_start}{/if} + {if $prefs.module_zones_pagetop eq 'fixed' or ($prefs.module_zones_pagetop ne 'n' && ! zone_is_empty('pagetop'))} + {modulelist zone=pagetop} + {/if} + {feedback} + {block name=quicknav}{/block} + {block name=title}{/block} + {block name=navigation}{/block} + {block name=content}{/block} + {if $prefs.module_zones_pagebottom eq 'fixed' or ($prefs.module_zones_pagebottom ne 'n' && ! zone_is_empty('pagebottom'))} + {modulelist zone=pagebottom} + {/if} + {if $prefs.feature_layoutshadows eq 'y'}{eval var=$prefs.center_shadow_end}</div>{/if} - </div> - {elseif zone_is_empty('left') or $prefs.feature_left_column eq 'n'} - <div class="col-md-12 text-right"> - {if $prefs.feature_right_column eq 'user'} - {$icon_name = (not empty($smarty.cookies.hide_zone_right)) ? 'toggle-left' : 'toggle-right'} - {icon name=$icon_name class='toggle_zone right' href='#' title='{tr}Toggle right modules{/tr}'} - {/if} - </div> - <div class="col-md-9 col1" id="col1"> - {if $prefs.feature_layoutshadows eq 'y'} - <div id="tiki-center-shadow">{eval var=$prefs.center_shadow_start}{/if} - {if $prefs.module_zones_pagetop eq 'fixed' or ($prefs.module_zones_pagetop ne 'n' && ! zone_is_empty('pagetop'))} - {modulelist zone=pagetop} - {/if} - {feedback} - {block name=quicknav}{/block} - {block name=title}{/block} - {block name=navigation}{/block} - {block name=content}{/block} - {if $prefs.module_zones_pagebottom eq 'fixed' or ($prefs.module_zones_pagebottom ne 'n' && ! zone_is_empty('pagebottom'))} - {modulelist zone=pagebottom} - {/if} - {if $prefs.feature_layoutshadows eq 'y'}{eval var=$prefs.center_shadow_end}</div>{/if} - </div> - <div class="col-md-3" id="col3"> - {modulelist zone=right} - </div> - {elseif zone_is_empty('right') or $prefs.feature_right_column eq 'n'} - <div class="col-md-12 text-left"> - {if $prefs.feature_left_column eq 'user'} - {$icon_name = (not empty($smarty.cookies.hide_zone_left)) ? 'toggle-right' : 'toggle-left'} - {icon name=$icon_name class='toggle_zone left' href='#' title='{tr}Toggle left modules{/tr}'} - {/if} - </div> - <div class="col-md-9 col-md-push-3 col1" id="col1"> - {if $prefs.feature_layoutshadows eq 'y'} - <div id="tiki-center-shadow">{eval var=$prefs.center_shadow_start}{/if} - {if $prefs.module_zones_pagetop eq 'fixed' or ($prefs.module_zones_pagetop ne 'n' && ! zone_is_empty('pagetop'))} - {modulelist zone=pagetop} - {/if} - {feedback} - {block name=quicknav}{/block} - {block name=title}{/block} - {block name=navigation}{/block} - {block name=content}{/block} - {if $prefs.module_zones_pagebottom eq 'fixed' or ($prefs.module_zones_pagebottom ne 'n' && ! zone_is_empty('pagebottom'))} - {modulelist zone=pagebottom} - {/if} - {if $prefs.feature_layoutshadows eq 'y'}{eval var=$prefs.center_shadow_end}</div>{/if} - </div> - <div class="col-md-3 col-md-pull-9" id="col2"> - {modulelist zone=left} - </div> - {else} - <div class="col-md-6 text-left"> - {if $prefs.feature_left_column eq 'user'} - {$icon_name = (not empty($smarty.cookies.hide_zone_left)) ? 'toggle-right' : 'toggle-left'} - {icon name=$icon_name class='toggle_zone left' href='#' title='{tr}Toggle left modules{/tr}'} - {/if} - </div> - <div class="col-md-6 text-right"> - {if $prefs.feature_right_column eq 'user'} - {$icon_name = (not empty($smarty.cookies.hide_zone_right)) ? 'toggle-left' : 'toggle-right'} - {icon name=$icon_name class='toggle_zone right' href='#' title='{tr}Toggle right modules{/tr}'} - {/if} - </div> - <div class="col-md-8 col-md-push-2 col1" id="col1"> - {if $prefs.feature_layoutshadows eq 'y'} - <div id="tiki-center-shadow">{eval var=$prefs.center_shadow_start}{/if} - {if $prefs.module_zones_pagetop eq 'fixed' or ($prefs.module_zones_pagetop ne 'n' && ! zone_is_empty('pagetop'))} - {modulelist zone=pagetop} - {/if} - {feedback} - {block name=quicknav}{/block} - {block name=title}{/block} - {block name=navigation}{/block} - {block name=content}{/block} - {if $prefs.module_zones_pagebottom eq 'fixed' or ($prefs.module_zones_pagebottom ne 'n' && ! zone_is_empty('pagebottom'))} - {modulelist zone=pagebottom} - {/if} - {if $prefs.feature_layoutshadows eq 'y'}{eval var=$prefs.center_shadow_end}</div>{/if} - </div> - <div class="col-md-2 col-md-pull-8" id="col2"> - {modulelist zone=left} - </div> - <div class="col-md-2" id="col3"> - {modulelist zone=right} - </div> - {/if} - </div> - </div> - </div> + </div> + {elseif zone_is_empty('left') or $prefs.feature_left_column eq 'n'} + <div class="col-md-12 text-right"> + {if $prefs.feature_right_column eq 'user'} + {$icon_name = (not empty($smarty.cookies.hide_zone_right)) ? 'toggle-left' : 'toggle-right'} + {icon name=$icon_name class='toggle_zone right' href='#' title='{tr}Toggle right modules{/tr}'} + {/if} + </div> + <div class="col-md-9 col1" id="col1"> + {if $prefs.feature_layoutshadows eq 'y'} + <div id="tiki-center-shadow">{eval var=$prefs.center_shadow_start}{/if} + {if $prefs.module_zones_pagetop eq 'fixed' or ($prefs.module_zones_pagetop ne 'n' && ! zone_is_empty('pagetop'))} + {modulelist zone=pagetop} + {/if} + {feedback} + {block name=quicknav}{/block} + {block name=title}{/block} + {block name=navigation}{/block} + {block name=content}{/block} + {if $prefs.module_zones_pagebottom eq 'fixed' or ($prefs.module_zones_pagebottom ne 'n' && ! zone_is_empty('pagebottom'))} + {modulelist zone=pagebottom} + {/if} + {if $prefs.feature_layoutshadows eq 'y'}{eval var=$prefs.center_shadow_end}</div>{/if} + </div> + <div class="col-md-3" id="col3"> + {modulelist zone=right} + </div> + {elseif zone_is_empty('right') or $prefs.feature_right_column eq 'n'} + <div class="col-md-12 text-left"> + {if $prefs.feature_left_column eq 'user'} + {$icon_name = (not empty($smarty.cookies.hide_zone_left)) ? 'toggle-right' : 'toggle-left'} + {icon name=$icon_name class='toggle_zone left' href='#' title='{tr}Toggle left modules{/tr}'} + {/if} + </div> + <div class="col-md-9 col-md-push-3 col1" id="col1"> + {if $prefs.feature_layoutshadows eq 'y'} + <div id="tiki-center-shadow">{eval var=$prefs.center_shadow_start}{/if} + {if $prefs.module_zones_pagetop eq 'fixed' or ($prefs.module_zones_pagetop ne 'n' && ! zone_is_empty('pagetop'))} + {modulelist zone=pagetop} + {/if} + {feedback} + {block name=quicknav}{/block} + {block name=title}{/block} + {block name=navigation}{/block} + {block name=content}{/block} + {if $prefs.module_zones_pagebottom eq 'fixed' or ($prefs.module_zones_pagebottom ne 'n' && ! zone_is_empty('pagebottom'))} + {modulelist zone=pagebottom} + {/if} + {if $prefs.feature_layoutshadows eq 'y'}{eval var=$prefs.center_shadow_end}</div>{/if} + </div> + <div class="col-md-3 col-md-pull-9" id="col2"> + {modulelist zone=left} + </div> + {else} + <div class="col-md-6 text-left"> + {if $prefs.feature_left_column eq 'user'} + {$icon_name = (not empty($smarty.cookies.hide_zone_left)) ? 'toggle-right' : 'toggle-left'} + {icon name=$icon_name class='toggle_zone left' href='#' title='{tr}Toggle left modules{/tr}'} + {/if} + </div> + <div class="col-md-6 text-right"> + {if $prefs.feature_right_column eq 'user'} + {$icon_name = (not empty($smarty.cookies.hide_zone_right)) ? 'toggle-left' : 'toggle-right'} + {icon name=$icon_name class='toggle_zone right' href='#' title='{tr}Toggle right modules{/tr}'} + {/if} + </div> + <div class="col-md-8 col-md-push-2 col1" id="col1"> + {if $prefs.feature_layoutshadows eq 'y'} + <div id="tiki-center-shadow">{eval var=$prefs.center_shadow_start}{/if} + {if $prefs.module_zones_pagetop eq 'fixed' or ($prefs.module_zones_pagetop ne 'n' && ! zone_is_empty('pagetop'))} + {modulelist zone=pagetop} + {/if} + {feedback} + {block name=quicknav}{/block} + {block name=title}{/block} + {block name=navigation}{/block} + {block name=content}{/block} + {if $prefs.module_zones_pagebottom eq 'fixed' or ($prefs.module_zones_pagebottom ne 'n' && ! zone_is_empty('pagebottom'))} + {modulelist zone=pagebottom} + {/if} + {if $prefs.feature_layoutshadows eq 'y'}{eval var=$prefs.center_shadow_end}</div>{/if} + </div> + <div class="col-md-2 col-md-pull-8" id="col2"> + {modulelist zone=left} + </div> + <div class="col-md-2" id="col3"> + {modulelist zone=right} + </div> + {/if} + </div> + </div> + </div> {if $smarty.session.fullscreen ne 'y'} - {if $prefs.feature_layoutshadows eq 'y'} - <div id="footer-shadow">{eval var=$prefs.footer_shadow_start}{/if} - <footer class="footer" id="footer"> - <div class="footer_liner"> - <div class="container{if $smarty.session.fullscreen eq 'y'}-fluid{/if}" style="padding-left: 0; padding-right: 0;"> - {modulelist zone=bottom class='row-sidemargins-zero'} - </div> - </div> - </footer> - {if $prefs.feature_layoutshadows eq 'y'}{eval var=$prefs.footer_shadow_end}</div>{/if} + {if $prefs.feature_layoutshadows eq 'y'} + <div id="footer-shadow">{eval var=$prefs.footer_shadow_start}{/if} + <footer class="footer" id="footer"> + <div class="footer_liner"> + <div class="container{if $smarty.session.fullscreen eq 'y'}-fluid{/if}" style="padding-left: 0; padding-right: 0;"> + {modulelist zone=bottom class='row-sidemargins-zero'} + </div> + </div> + </footer> + {if $prefs.feature_layoutshadows eq 'y'}{eval var=$prefs.footer_shadow_end}</div>{/if} {/if} - {if $prefs.feature_layoutshadows eq 'y'}{eval var=$prefs.main_shadow_end}</div>{/if} + {if $prefs.feature_layoutshadows eq 'y'}{eval var=$prefs.main_shadow_end}</div>{/if} {include file='footer.tpl'} </body> </html> {if !empty($smarty.request.show_smarty_debug)} - {debug} + {debug} {/if} Modified: trunk/templates/layouts/classic/module.tpl =================================================================== --- trunk/templates/layouts/classic/module.tpl 2017-03-22 21:52:45 UTC (rev 61825) +++ trunk/templates/layouts/classic/module.tpl 2017-03-22 23:53:26 UTC (rev 61826) @@ -5,98 +5,98 @@ {capture name=name}{$module_name|replace:"+":"_"|cat:$module_position|cat:$module_ord|escape}{/capture} {if !empty($module_params.topclass)} <div class="{$module_params.topclass}">{/if} - {if $module_nobox neq 'y'} - {if $prefs.feature_layoutshadows eq 'y'} - <div class="box-shadow">{$prefs.box_shadow_start} - {/if} - {if !isset($moduleId)}{assign var=moduleId value=' '}{/if} - <div id="module_{$moduleId}" - class="panel panel-default box-{$module_name}{if $module_type eq 'cssmenu'} cssmenubox{/if} module"{if !empty($tpl_module_style)} style="{$tpl_module_style}"{/if}> - {if $module_decorations ne 'n'} - <div class="panel-heading"> - <h3 class="panel-title clearfix" {if !empty($module_params.bgcolor)} style="background-color:{$module_params.bgcolor};"{/if}> - {if $module_notitle ne 'y'} - <span class="moduletitle">{$module_title}</span> - {/if} - {if $module_flip eq 'y' and $prefs.javascript_enabled ne 'n'} - <span class="moduleflip" id="moduleflip-{$smarty.capture.name}"> + {if $module_nobox neq 'y'} + {if $prefs.feature_layoutshadows eq 'y'} + <div class="box-shadow">{$prefs.box_shadow_start} + {/if} + {if !isset($moduleId)}{assign var=moduleId value=' '}{/if} + <div id="module_{$moduleId}" + class="panel panel-default box-{$module_name}{if $module_type eq 'cssmenu'} cssmenubox{/if} module"{if !empty($tpl_module_style)} style="{$tpl_module_style}"{/if}> + {if $module_decorations ne 'n'} + <div class="panel-heading"> + <h3 class="panel-title clearfix" {if !empty($module_params.bgcolor)} style="background-color:{$module_params.bgcolor};"{/if}> + {if $module_notitle ne 'y'} + <span class="moduletitle">{$module_title}</span> + {/if} + {if $module_flip eq 'y' and $prefs.javascript_enabled ne 'n'} + <span class="moduleflip" id="moduleflip-{$smarty.capture.name}"> <a title="{tr}Toggle module contents{/tr}" class="flipmodtitle close" - href="javascript:icntoggle('mod-{$smarty.capture.name}','module.png');"> - {icon id="icnmod-"|cat:$smarty.capture.name class="flipmodimage" name="arrows-v" alt="[{tr}Toggle{/tr}]"} - </a> + href="javascript:icntoggle('mod-{$smarty.capture.name}','module.png');"> + {icon id="icnmod-"|cat:$smarty.capture.name class="flipmodimage" name="arrows-v" alt="[{tr}Toggle{/tr}]"} + </a> </span> - {if $prefs.menus_items_icons eq 'y'} - <span class="moduleflip moduleflip-vert" id="moduleflip-vert-{$smarty.capture.name}"> + {if $prefs.menus_items_icons eq 'y'} + <span class="moduleflip moduleflip-vert" id="moduleflip-vert-{$smarty.capture.name}"> <a title="{tr}Toggle module contents{/tr}" class="flipmodtitle" - href="javascript:flip_class('main','minimize-modules-left','maximize-modules');icntoggle('mod-{$smarty.capture.name}','vmodule.png');"> - {icon id="icnmod-"|cat:$smarty.capture.name class="flipmodimage" name="move" alt="[{tr}Toggle Vertically{/tr}]" _defaultdir="img"} - </a> + href="javascript:flip_class('main','minimize-modules-left','maximize-modules');icntoggle('mod-{$smarty.capture.name}','vmodule.png');"> + {icon id="icnmod-"|cat:$smarty.capture.name class="flipmodimage" name="move" alt="[{tr}Toggle Vertically{/tr}]" _defaultdir="img"} + </a> </span> - {/if} - {/if} - </h3> - </div> - {elseif $module_notitle ne 'y'}{* means when module decorations are set to 'n' don't render the panel-heading wrapper as above *} - {if $module_flip eq 'y' and $prefs.javascript_enabled ne 'n'} - <h3 class="panel-title" - ondblclick="javascript:icntoggle('mod-{$smarty.capture.name}','module.png');"{if !empty($module_params.color)} style="color:{$module_params.color};"{/if}> - {else} - <h3 class="panel-title"{if !empty($module_params.color)} style="color:{$module_params.color};"{/if}> - {/if} - {$module_title} - {if $module_flip eq 'y' and $prefs.javascript_enabled ne 'n'} - <span class="moduleflip" id="moduleflip-{$smarty.capture.name}"> + {/if} + {/if} + </h3> + </div> + {elseif $module_notitle ne 'y'}{* means when module decorations are set to 'n' don't render the panel-heading wrapper as above *} + {if $module_flip eq 'y' and $prefs.javascript_enabled ne 'n'} + <h3 class="panel-title" + ondblclick="javascript:icntoggle('mod-{$smarty.capture.name}','module.png');"{if !empty($module_params.color)} style="color:{$module_params.color};"{/if}> + {else} + <h3 class="panel-title"{if !empty($module_params.color)} style="color:{$module_params.color};"{/if}> + {/if} + {$module_title} + {if $module_flip eq 'y' and $prefs.javascript_enabled ne 'n'} + <span class="moduleflip" id="moduleflip-{$smarty.capture.name}"> <a title="{tr}Toggle module contents{/tr}" class="flipmodtitle" - href="javascript:icntoggle('mod-{$smarty.capture.name}','module.png');"> - {icon id="icnmod-"|cat:$smarty.capture.name class="flipmodimage" name="module" alt="[{tr}Toggle{/tr}]"} - </a> + href="javascript:icntoggle('mod-{$smarty.capture.name}','module.png');"> + {icon id="icnmod-"|cat:$smarty.capture.name class="flipmodimage" name="module" alt="[{tr}Toggle{/tr}]"} + </a> </span> - {/if} - </h3> - {/if} - <div id="mod-{$smarty.capture.name}" - style="display: {if !isset($module_display) or $module_display}block{else}none{/if};{$module_params.style}" - class="clearfix panel-body{if !empty($module_params.class)} {$module_params.class}{/if}"> - {else}{* $module_nobox eq 'y' *} - <div id="module_{$moduleId}" style="{$module_params.style}{$tpl_module_style}" - class="module{if !empty($module_params.class)} {$module_params.class}{/if} box-{$module_name}"> - <div id="mod-{$smarty.capture.name}" class=""> - {/if} - {$module_content} - {if $module_error} - {remarksbox type="warning" title="{tr}Error{/tr}"} - {$module_error} - {/remarksbox} - {/if} - {if $module_nobox neq 'y'} - </div>{* close div id="mod-{$smarty.capture.name}" *} - {if $user and $prefs.user_assigned_modules == 'y' and $prefs.feature_modulecontrols eq 'y'} - <div class="panel-footer"> + {/if} + </h3> + {/if} + <div id="mod-{$smarty.capture.name}" + style="display: {if !isset($module_display) or $module_display}block{else}none{/if};{$module_params.style}" + class="clearfix panel-body{if !empty($module_params.class)} {$module_params.class}{/if}"> + {else}{* $module_nobox eq 'y' *} + <div id="module_{$moduleId}" style="{$module_params.style}{$tpl_module_style}" + class="module{if !empty($module_params.class)} {$module_params.class}{/if} box-{$module_name}"> + <div id="mod-{$smarty.capture.name}" class=""> + {/if} + {$module_content} + {if $module_error} + {remarksbox type="warning" title="{tr}Error{/tr}"} + {$module_error} + {/remarksbox} + {/if} + {if $module_nobox neq 'y'} + </div>{* close div id="mod-{$smarty.capture.name}" *} + {if $user and $prefs.user_assigned_modules == 'y' and $prefs.feature_modulecontrols eq 'y'} + <div class="panel-footer"> <span class="modcontrols"> <a class="tips" title=":{tr}Move module up{/tr}" - href="{$current_location|escape}{$mpchar|escape}mc_up={$module_name}"> - {icon name="up" alt="{tr}Up{/tr}"} - </a> + href="{$current_location|escape}{$mpchar|escape}mc_up={$module_name}"> + {icon name="up" alt="{tr}Up{/tr}"} + </a> <a class="tips" title=":{tr}Move module down{/tr}" - href="{$current_location|escape}{$mpchar|escape}mc_down={$module_name}"> - {icon name="down" alt="{tr}Down{/tr}"} - </a> + href="{$current_location|escape}{$mpchar|escape}mc_down={$module_name}"> + {icon name="down" alt="{tr}Down{/tr}"} + </a> <a class="tips" title=":{tr}Move module to opposite side{/tr}" - href="{$current_location|escape}{$mpchar|escape}mc_move={$module_name}"> - {icon name="move" alt="{tr}Move to opposite side{/tr}"} - </a> + href="{$current_location|escape}{$mpchar|escape}mc_move={$module_name}"> + {icon name="move" alt="{tr}Move to opposite side{/tr}"} + </a> <a class="tips" title=":{tr}Unassign this module{/tr}" - href="{$current_location|escape}{$mpchar|escape}mc_unassign={$module_name}" - onclick='return confirmTheLink(this,"{tr}Are you sure you want to unassign this module?{/tr}")'> - {icon name="remove" alt="{tr}Unassign{/tr}"} - </a> + href="{$current_location|escape}{$mpchar|escape}mc_unassign={$module_name}" + onclick='return confirmTheLink(this,"{tr}Are you sure you want to unassign this module?{/tr}")'> + {icon name="remove" alt="{tr}Unassign{/tr}"} + </a> </span> - </div> - {/if} - </div>{* close div id="module_{$moduleId}" *} - {if $prefs.feature_layoutshadows eq 'y'}{$prefs.box_shadow_end}</div>{/if} - {else}{* $module_nobox eq 'y' *} - </div>{* close div id="mod-{$smarty.capture.name}" *} - </div>{* close div id="module_{$moduleId}" *} - {/if} + </div> + {/if} + </div>{* close div id="module_{$moduleId}" *} + {if $prefs.feature_layoutshadows eq 'y'}{$prefs.box_shadow_end}</div>{/if} + {else}{* $module_nobox eq 'y' *} + </div>{* close div id="mod-{$smarty.capture.name}" *} + </div>{* close div id="module_{$moduleId}" *} + {/if} {if !empty($module_params.topclass)}</div>{/if} Modified: trunk/templates/layouts/fixed_top_modules/layout_view.tpl =================================================================== --- trunk/templates/layouts/fixed_top_modules/layout_view.tpl 2017-03-22 21:52:45 UTC (rev 61825) +++ trunk/templates/layouts/fixed_top_modules/layout_view.tpl 2017-03-22 23:53:26 UTC (rev 61826) @@ -1,8 +1,8 @@ {* $Id: layout_view.tpl 48366 2013-11-08 16:12:24Z lphuberdeau $ *}<!DOCTYPE html> <html lang="{if !empty($pageLang)}{$pageLang}{else}{$prefs.language}{/if}"{if !empty($page_id)} id="page_{$page_id}"{/if}> <head> - {include file='header.tpl'} - <meta name="viewport" content="width=device-width, initial-scale=1.0"> + {include file='header.tpl'} + <meta name="viewport" content="width=device-width, initial-scale=1.0"> </head> <body{html_body_attributes class="navbar-padding"}> {$cookie_consent_html} @@ -10,148 +10,148 @@ {include file="layout_fullscreen_check.tpl"} {if $prefs.feature_ajax eq 'y'} - {include file='tiki-ajax_header.tpl'} + {include file='tiki-ajax_header.tpl'} {/if} <div class="middle_outer" id="middle_outer"> {if $smarty.session.fullscreen ne 'y'} - <div class="fixed-topbar"></div> + <div class="fixed-topbar"></div> {/if} - <div class="container{if $smarty.session.fullscreen eq 'y'}-fluid{/if} clearfix middle" id="middle"> + <div class="container{if $smarty.session.fullscreen eq 'y'}-fluid{/if} clearfix middle" id="middle"> {if $smarty.session.fullscreen ne 'y'} - <div class="topbar_wrapper"> - <div class="topbar row" id="topbar"> - {modulelist zone=topbar} - </div> - </div> + <div class="topbar_wrapper"> + <div class="topbar row" id="topbar"> + {modulelist zone=topbar} + </div> + </div> {/if} - <div class="row" id="row-middle"> - {if zone_is_empty('left') and zone_is_empty('right')} - <div class="col-md-12 col1" id="col1"> - {if $prefs.module_zones_pagetop eq 'fixed' or ($prefs.module_zones_pagetop ne 'n' && ! zone_is_empty('pagetop'))} - {modulelist zone=pagetop} - {/if} - {feedback} - {block name=quicknav}{/block} - {block name=title}{/block} - {block name=navigation}{/block} - {block name=content}{/block} - {if $prefs.module_zones_pagebottom eq 'fixed' or ($prefs.module_zones_pagebottom ne 'n' && ! zone_is_empty('pagebottom'))} - {modulelist zone=pagebottom} - {/if} - </div> - {elseif zone_is_empty('left') or $prefs.feature_left_column eq 'n'} - <div class="col-md-12 text-right"> - {if $prefs.feature_right_column eq 'user'} - {$icon_name = (not empty($smarty.cookies.hide_zone_right)) ? 'toggle-left' : 'toggle-right'} - {icon name=$icon_name class='toggle_zone right' href='#' title='{tr}Toggle right modules{/tr}'} - {/if} - </div> - <div class="col-md-9 col1" id="col1"> - {if $prefs.module_zones_pagetop eq 'fixed' or ($prefs.module_zones_pagetop ne 'n' && ! zone_is_empty('pagetop'))} - {modulelist zone=pagetop} - {/if} - {feedback} - {block name=quicknav}{/block} - {block name=title}{/block} - {block name=navigation}{/block} - {block name=content}{/block} - {if $prefs.module_zones_pagebottom eq 'fixed' or ($prefs.module_zones_pagebottom ne 'n' && ! zone_is_empty('pagebottom'))} - {modulelist zone=pagebottom} - {/if} - </div> - <div class="col-md-3" id="col3"> - {modulelist zone=right} - </div> - {elseif zone_is_empty('right') or $prefs.feature_right_column eq 'n'} - <div class="col-md-12 text-left"> - {if $prefs.feature_left_column eq 'user'} - {$icon_name = (not empty($smarty.cookies.hide_zone_left)) ? 'toggle-right' : 'toggle-left'} - {icon name=$icon_name class='toggle_zone left' href='#' title='{tr}Toggle left modules{/tr}'} - {/if} - </div> - <div class="col-md-9 col-md-push-3 col1" id="col1"> - {if $prefs.module_zones_pagetop eq 'fixed' or ($prefs.module_zones_pagetop ne 'n' && ! zone_is_empty('pagetop'))} - {modulelist zone=pagetop} - {/if} - {feedback} - {block name=quicknav}{/block} - {block name=title}{/block} - {block name=navigation}{/block} - {block name=content}{/block} - {if $prefs.module_zones_pagebottom eq 'fixed' or ($prefs.module_zones_pagebottom ne 'n' && ! zone_is_empty('pagebottom'))} - {modulelist zone=pagebottom} - {/if} - </div> - <div class="col-md-3 col-md-pull-9" id="col2"> - {modulelist zone=left} - </div> - {else} - <div class="col-md-6 text-left"> - {if $prefs.feature_left_column eq 'user'} - {$icon_name = (not empty($smarty.cookies.hide_zone_left)) ? 'toggle-right' : 'toggle-left'} - {icon name=$icon_name class='toggle_zone left' href='#' title='{tr}Toggle left modules{/tr}'} - {/if} - </div> - <div class="col-md-6 text-right"> - {if $prefs.feature_right_column eq 'user'} - {$icon_name = (not empty($smarty.cookies.hide_zone_right)) ? 'toggle-left' : 'toggle-right'} - {icon name=$icon_name class='toggle_zone right' href='#' title='{tr}Toggle right modules{/tr}'} - {/if} - </div> - <div class="col-md-8 col-md-push-2 col1" id="col1"> - {if $prefs.module_zones_pagetop eq 'fixed' or ($prefs.module_zones_pagetop ne 'n' && ! zone_is_empty('pagetop'))} - {modulelist zone=pagetop} - {/if} - {feedback} - {block name=quicknav}{/block} - {block name=title}{/block} - {block name=navigation}{/block} - {block name=content}{/block} - {if $prefs.module_zones_pagebottom eq 'fixed' or ($prefs.module_zones_pagebottom ne 'n' && ! zone_is_empty('pagebottom'))} - {modulelist zone=pagebottom} - {/if} - </div> - <div class="col-md-2 col-md-pull-8" id="col2"> - {modulelist zone=left} - </div> - <div class="col-md-2" id="col3"> - {modulelist zone=right} - </div> - {/if} - </div> - </div> + <div class="row" id="row-middle"> + {if zone_is_empty('left') and zone_is_empty('right')} + <div class="col-md-12 col1" id="col1"> + {if $prefs.module_zones_pagetop eq 'fixed' or ($prefs.module_zones_pagetop ne 'n' && ! zone_is_empty('pagetop'))} + {modulelist zone=pagetop} + {/if} + {feedback} + {block name=quicknav}{/block} + {block name=title}{/block} + {block name=navigation}{/block} + {block name=content}{/block} + {if $prefs.module_zones_pagebottom eq 'fixed' or ($prefs.module_zones_pagebottom ne 'n' && ! zone_is_empty('pagebottom'))} + {modulelist zone=pagebottom} + {/if} + </div> + {elseif zone_is_empty('left') or $prefs.feature_left_column eq 'n'} + <div class="col-md-12 text-right"> + {if $prefs.feature_right_column eq 'user'} + {$icon_name = (not empty($smarty.cookies.hide_zone_right)) ? 'toggle-left' : 'toggle-right'} + {icon name=$icon_name class='toggle_zone right' href='#' title='{tr}Toggle right modules{/tr}'} + {/if} + </div> + <div class="col-md-9 col1" id="col1"> + {if $prefs.module_zones_pagetop eq 'fixed' or ($prefs.module_zones_pagetop ne 'n' && ! zone_is_empty('pagetop'))} + {modulelist zone=pagetop} + {/if} + {feedback} + {block name=quicknav}{/block} + {block name=title}{/block} + {block name=navigation}{/block} + {block name=content}{/block} + {if $prefs.module_zones_pagebottom eq 'fixed' or ($prefs.module_zones_pagebottom ne 'n' && ! zone_is_empty('pagebottom'))} + {modulelist zone=pagebottom} + {/if} + </div> + <div class="col-md-3" id="col3"> + {modulelist zone=right} + </div> + {elseif zone_is_empty('right') or $prefs.feature_right_column eq 'n'} + <div class="col-md-12 text-left"> + {if $prefs.feature_left_column eq 'user'} + {$icon_name = (not empty($smarty.cookies.hide_zone_left)) ? 'toggle-right' : 'toggle-left'} + {icon name=$icon_name class='toggle_zone left' href='#' title='{tr}Toggle left modules{/tr}'} + {/if} + </div> + <div class="col-md-9 col-md-push-3 col1" id="col1"> + {if $prefs.module_zones_pagetop eq 'fixed' or ($prefs.module_zones_pagetop ne 'n' && ! zone_is_empty('pagetop'))} + {modulelist zone=pagetop} + {/if} + {feedback} + {block name=quicknav}{/block} + {block name=title}{/block} + {block name=navigation}{/block} + {block name=content}{/block} + {if $prefs.module_zones_pagebottom eq 'fixed' or ($prefs.module_zones_pagebottom ne 'n' && ! zone_is_empty('pagebottom'))} + {modulelist zone=pagebottom} + {/if} + </div> + <div class="col-md-3 col-md-pull-9" id="col2"> + {modulelist zone=left} + </div> + {else} + <div class="col-md-6 text-left"> + {if $prefs.feature_left_column eq 'user'} + {$icon_name = (not empty($smarty.cookies.hide_zone_left)) ? 'toggle-right' : 'toggle-left'} + {icon name=$icon_name class='toggle_zone left' href='#' title='{tr}Toggle left modules{/tr}'} + {/if} + </div> + <div class="col-md-6 text-right"> + {if $prefs.feature_right_column eq 'user'} + {$icon_name = (not empty($smarty.cookies.hide_zone_right)) ? 'toggle-left' : 'toggle-right'} + {icon name=$icon_name class='toggle_zone right' href='#' title='{tr}Toggle right modules{/tr}'} + {/if} + </div> + <div class="col-md-8 col-md-push-2 col1" id="col1"> + {if $prefs.module_zones_pagetop eq 'fixed' or ($prefs.module_zones_pagetop ne 'n' && ! zone_is_empty('pagetop'))} + {modulelist zone=pagetop} + {/if} + {feedback} + {block name=quicknav}{/block} + {block name=title}{/block} + {block name=navigation}{/block} + {block name=content}{/block} + {if $prefs.module_zones_pagebottom eq 'fixed' or ($prefs.module_zones_pagebottom ne 'n' && ! zone_is_empty('pagebottom'))} + {modulelist zone=pagebottom} + {/if} + </div> + <div class="col-md-2 col-md-pull-8" id="col2"> + {modulelist zone=left} + </div> + <div class="col-md-2" id="col3"> + {modulelist zone=right} + </div> + {/if} + </div> + </div> </div> {if $smarty.session.fullscreen ne 'y'} - <footer class="footer" id="footer"> - <div class="footer_liner"> - <div class="container{if $smarty.session.fullscreen eq 'y'}-fluid{/if}"> - {modulelist zone=bottom class='row row-sidemargins-zero'} - </div> - </div> - </footer> + <footer class="footer" id="footer"> + <div class="footer_liner"> + <div class="container{if $smarty.session.fullscreen eq 'y'}-fluid{/if}"> + {modulelist zone=bottom class='row row-sidemargins-zero'} + </div> + </div> + </footer> {/if} {if $smarty.session.fullscreen ne 'y'} <nav class="navbar {* navbar-inverse *}navbar-default navbar-fixed-top" role="navigation" id="navbar-fixed-top"> - <div class="container{if $smarty.session.fullscreen eq 'y'}-fluid{/if}"> - <div class="navbar-header"> - {if $module_params.navbar_toggle neq 'n'} - <button type="button" class="navbar-toggle" data-toggle="collapse" - data-target="#navbar-collapse-social-modules"> - <span class="sr-only">Toggle navigation</span> - <span class="icon-bar"></span> - <span class="icon-bar"></span> - <span class="icon-bar"></span> - </button> - {/if} - <a class="navbar-brand" href="./">{if $prefs.sitelogo_icon}<img src="{$prefs.sitelogo_icon}">{/if} {$prefs.sitetitle|escape}</a> - </div> - <div class="collapse navbar-collapse fixed-topbar" id="navbar-collapse-social-modules"> - {modulelist zone="top" nobox="y" navbar="y" menuclass="navbar-inverse collapse navbar-collapse noclearfix" class="top_modules modules row context modules noclearfix"} - </div> - </div> + <div class="container{if $smarty.session.fullscreen eq 'y'}-fluid{/if}"> + <div class="navbar-header"> + {if $module_params.navbar_toggle neq 'n'} + <button type="button" class="navbar-toggle" data-toggle="collapse" + data-target="#navbar-collapse-social-modules"> + <span class="sr-only">Toggle navigation</span> + <span class="icon-bar"></span> + <span class="icon-bar"></span> + <span class="icon-bar"></span> + </button> + {/if} + <a class="navbar-brand" href="./">{if $prefs.sitelogo_icon}<img src="{$prefs.sitelogo_icon}">{/if} {$prefs.sitetitle|escape}</a> + </div> + <div class="collapse navbar-collapse fixed-topbar" id="navbar-collapse-social-modules"> + {modulelist zone="top" nobox="y" navbar="y" menuclass="navbar-inverse collapse navbar-collapse noclearfix" class="top_modules modules row context modules noclearfix"} + </div> + </div> </nav> {/if} @@ -158,13 +158,13 @@ {include file='footer.tpl'} </body> <script type="text/javascript"> - $(document).ready(function () { - $('.tooltips').tooltip({ - 'container': 'body' - }); - }); + $(document).ready(function () { + $('.tooltips').tooltip({ + 'container': 'body' + }); + }); </script> </html> {if !empty($smarty.request.show_smarty_debug)} - {debug} + {debug} {/if} Modified: trunk/templates/layouts/header_middle_footer_containers_3-6-3/layout_view.tpl =================================================================== --- trunk/templates/layouts/header_middle_footer_containers_3-6-3/layout_view.tpl 2017-03-22 21:52:45 UTC (rev 61825) +++ trunk/templates/layouts/header_middle_footer_containers_3-6-3/layout_view.tpl 2017-03-22 23:53:26 UTC (rev 61826) @@ -1,8 +1,8 @@ {* $Id$ *}<!DOCTYPE html> <html lang="{if !empty($pageLang)}{$pageLang}{else}{$prefs.language}{/if}"{if !empty($page_id)} id="page_{$page_id}"{/if}> <head> - {include file='header.tpl'} - <meta name="viewport" content="width=device-width, initial-scale=1.0"> + {include file='header.tpl'} + <meta name="viewport" content="width=device-width, initial-scale=1.0"> </head> <body{html_body_attributes}> {$cookie_consent_html} @@ -10,132 +10,132 @@ {include file="layout_fullscreen_check.tpl"} {if $prefs.feature_ajax eq 'y'} - {include file='tiki-ajax_header.tpl'} + {include file='tiki-ajax_header.tpl'} {/if} {if $smarty.session.fullscreen ne 'y'} -<div class="header_outer" id="header_outer"> - <div class="header_container container{if $smarty.session.fullscreen eq 'y'}-fluid{/if}"> - <header class="header page-header" id="page-header"> - {modulelist zone=top class='row top_modules'} - </header> - </div> -</div> + <div class="header_outer" id="header_outer"> + <div class="header_container container{if $smarty.session.fullscreen eq 'y'}-fluid{/if}"> + <header class="header page-header" id="page-header"> + {modulelist zone=top class='row top_modules'} + </header> + </div> + </div> {/if} <div class="middle_outer" id="middle_outer"> - <div class="container{if $smarty.session.fullscreen eq 'y'}-fluid{/if} clearfix middle" id="middle"> + <div class="container{if $smarty.session.fullscreen eq 'y'}-fluid{/if} clearfix middle" id="middle"> <div class="topbar row" id="topbar"> {modulelist zone=topbar} - </div> - <div class="row" id="row-middle"> - {if zone_is_empty('left') and zone_is_empty('right')} - <div class="col-md-12 col1" id="col1"> - {if $prefs.module_zones_pagetop eq 'fixed' or ($prefs.module_zones_pagetop ne 'n' && ! zone_is_empty('pagetop'))} - {modulelist zone=pagetop} - {/if} - {feedback} - {block name=quicknav}{/block} - {block name=title}{/block} - {block name=navigation}{/block} - {block name=content}{/block} - {if $prefs.module_zones_pagebottom eq 'fixed' or ($prefs.module_zones_pagebottom ne 'n' && ! zone_is_empty('pagebottom'))} - {modulelist zone=pagebottom} - {/if} - </div> - {elseif zone_is_empty('left') or $prefs.feature_left_column eq 'n'} - <div class="col-md-12 text-right"> - {if $prefs.feature_right_column eq 'user'} - {$icon_name = (not empty($smarty.cookies.hide_zone_right)) ? 'toggle-left' : 'toggle-right'} - {icon name=$icon_name class='toggle_zone right' href='#' title='{tr}Toggle right modules{/tr}'} - {/if} - </div> - <div class="col-md-9 col1" id="col1"> - {if $prefs.module_zones_pagetop eq 'fixed' or ($prefs.module_zones_pagetop ne 'n' && ! zone_is_empty('pagetop'))} - {modulelist zone=pagetop} - {/if} - {feedback} - {block name=quicknav}{/block} - {block name=title}{/block} - {block name=navigation}{/block} - {block name=content}{/block} - {if $prefs.module_zones_pagebottom eq 'fixed' or ($prefs.module_zones_pagebottom ne 'n' && ! zone_is_empty('pagebottom'))} - {modulelist zone=pagebottom} - {/if} - </div> - <div class="col-md-3" id="col3"> - {modulelist zone=right} - </div> - {elseif zone_is_empty('right') or $prefs.feature_right_column eq 'n'} - <div class="col-md-12 text-left"> - {if $prefs.feature_left_column eq 'user'} - {$icon_name = (not empty($smarty.cookies.hide_zone_left)) ? 'toggle-right' : 'toggle-left'} - {icon name=$icon_name class='toggle_zone left' href='#' title='{tr}Toggle left modules{/tr}'} - {/if} - </div> - <div class="col-md-9 col-md-push-3 col1" id="col1"> - {if $prefs.module_zones_pagetop eq 'fixed' or ($prefs.module_zones_pagetop ne 'n' && ! zone_is_empty('pagetop'))} - {modulelist zone=pagetop} - {/if} - {feedback} - {block name=quicknav}{/block} - {block name=title}{/block} - {block name=navigation}{/block} - {block name=content}{/block} - {if $prefs.module_zones_pagebottom eq 'fixed' or ($prefs.module_zones_pagebottom ne 'n' && ! zone_is_empty('pagebottom'))} - {modulelist zone=pagebottom} - {/if} - </div> - <div class="col-md-3 col-md-pull-9" id="col2"> - {modulelist zone=left} - </div> - {else} - <div class="col-md-6 text-left"> - {if $prefs.feature_left_column eq 'user'} - {$icon_name = (not empty($smarty.cookies.hide_zone_left)) ? 'toggle-right' : 'toggle-left'} - {icon name=$icon_name class='toggle_zone left' href='#' title='{tr}Toggle left modules{/tr}'} - {/if} - </div> - <div class="col-md-6 text-right"> - {if $prefs.feature_right_column eq 'user'} - {$icon_name = (not empty($smarty.cookies.hide_zone_right)) ? 'toggle-left' :... [truncated message content] |
From: <jy...@us...> - 2017-03-23 10:35:39
|
Revision: 61828 http://sourceforge.net/p/tikiwiki/code/61828 Author: jyhem Date: 2017-03-23 10:35:36 +0000 (Thu, 23 Mar 2017) Log Message: ----------- Indentation fixes. Tiki standardises on tab indenting Modified Paths: -------------- trunk/templates/antibot.tpl trunk/templates/article.tpl trunk/templates/metadata/meta_view_tabs.tpl trunk/templates/tiki-admin_shoutbox_words.tpl trunk/templates/tiki-admin_tokens.tpl trunk/templates/tiki-directory_admin_sites.tpl trunk/templates/tiki-edit_quiz_questions.tpl trunk/templates/tiki-faq_questions.tpl trunk/templates/tiki-minical_prefs.tpl trunk/templates/tiki-pick_avatar.tpl trunk/templates/tiki-send_newsletters.tpl trunk/templates/tiki-theme_control_sections.tpl trunk/templates/tiki-view_forum.tpl trunk/templates/tiki-webmail.tpl trunk/templates/wizard/admin_community.tpl trunk/templates/wizard/admin_date_time.tpl trunk/templates/wizard/admin_editor_type.tpl trunk/templates/wizard/admin_features.tpl trunk/templates/wizard/admin_files.tpl trunk/templates/wizard/admin_files_storage.tpl trunk/templates/wizard/admin_language.tpl trunk/templates/wizard/admin_login.tpl trunk/templates/wizard/admin_namespace.tpl trunk/templates/wizard/admin_search.tpl trunk/templates/wizard/admin_structures.tpl trunk/templates/wizard/admin_text_area.tpl trunk/templates/wizard/admin_wiki.tpl trunk/templates/wizard/admin_wizard.tpl trunk/templates/wizard/admin_wizard_completed.tpl trunk/templates/wizard/admin_wysiwyg.tpl trunk/templates/wizard/profiles_completed.tpl trunk/templates/wizard/profiles_demo_common_confs.tpl trunk/templates/wizard/profiles_demo_highly_specialized_confs.tpl trunk/templates/wizard/profiles_demo_interesting_use_cases.tpl trunk/templates/wizard/profiles_demo_more_advanced_confs.tpl trunk/templates/wizard/profiles_demo_other_interesting_use_cases.tpl trunk/templates/wizard/profiles_featured_site_confs.tpl trunk/templates/wizard/profiles_useful_admin_confs.tpl trunk/templates/wizard/profiles_useful_changes_in_display.tpl trunk/templates/wizard/profiles_useful_micro_confs.tpl trunk/templates/wizard/profiles_useful_new_tech_confs.tpl trunk/templates/wizard/upgrade_novice_admin_assistance.tpl trunk/templates/wizard/upgrade_send_feedback.tpl trunk/templates/wizard/upgrade_ui.tpl trunk/templates/wizard/user_wizard_completed.tpl Modified: trunk/templates/antibot.tpl =================================================================== --- trunk/templates/antibot.tpl 2017-03-23 07:49:31 UTC (rev 61827) +++ trunk/templates/antibot.tpl 2017-03-23 10:35:36 UTC (rev 61828) @@ -77,56 +77,56 @@ {/if} </div> - {jq} - function antibotVerification(element, rule) { - if (!jqueryTiki.validate) return; + {jq} + function antibotVerification(element, rule) { + if (!jqueryTiki.validate) return; - var form = $(".antibot").parents('form'); - if (!form.data("validator")) { - form.validate({}); - } - element.rules( "add", rule); - } - {/jq} + var form = $(".antibot").parents('form'); + if (!form.data("validator")) { + form.validate({}); + } + element.rules( "add", rule); + } + {/jq} - {if $captchalib->type eq 'recaptcha'} - {jq} - var existCondition = setInterval(function() { - if ($('#recaptcha_response_field').length) { - clearInterval(existCondition); - antibotVerification($("#recaptcha_response_field"), {required: true}); - } - }, 100); // wait for captcha to load + {if $captchalib->type eq 'recaptcha'} + {jq} + var existCondition = setInterval(function() { + if ($('#recaptcha_response_field').length) { + clearInterval(existCondition); + antibotVerification($("#recaptcha_response_field"), {required: true}); + } + }, 100); // wait for captcha to load - {/jq} - {elseif $captchalib->type eq 'recaptcha20'} - {jq} - var existCondition = setInterval(function() { - if ($('#g-recaptcha-response').length) { - clearInterval(existCondition); - antibotVerification($("#g-recaptcha-response"), {required: true}); - } - }, 100); // wait for captcha to load - {/jq} - {else} - {jq} - antibotVerification($("#antibotcode"), { - required: true, - remote: { - url: "validate-ajax.php", - type: "post", - data: { - validator: "captcha", - parameter: function() { - return $("#captchaId").val(); - }, - input: function() { - return $("#antibotcode").val(); - } - } - } - }); - {/jq} - {/if} + {/jq} + {elseif $captchalib->type eq 'recaptcha20'} + {jq} + var existCondition = setInterval(function() { + if ($('#g-recaptcha-response').length) { + clearInterval(existCondition); + antibotVerification($("#g-recaptcha-response"), {required: true}); + } + }, 100); // wait for captcha to load + {/jq} + {else} + {jq} + antibotVerification($("#antibotcode"), { + required: true, + remote: { + url: "validate-ajax.php", + type: "post", + data: { + validator: "captcha", + parameter: function() { + return $("#captchaId").val(); + }, + input: function() { + return $("#antibotcode").val(); + } + } + } + }); + {/jq} + {/if} {/if} Modified: trunk/templates/article.tpl =================================================================== --- trunk/templates/article.tpl 2017-03-23 07:49:31 UTC (rev 61827) +++ trunk/templates/article.tpl 2017-03-23 10:35:36 UTC (rev 61828) @@ -1,5 +1,5 @@ <article class="article"> - {if $prefs.art_trailer_pos ne 'between'}{include file='article_trailer.tpl'}{/if} + {if $prefs.art_trailer_pos ne 'between'}{include file='article_trailer.tpl'}{/if} {if $show_topline eq 'y' and $topline} <div class="articletopline">{$topline|escape}</div> {/if} Modified: trunk/templates/metadata/meta_view_tabs.tpl =================================================================== --- trunk/templates/metadata/meta_view_tabs.tpl 2017-03-23 07:49:31 UTC (rev 61827) +++ trunk/templates/metadata/meta_view_tabs.tpl 2017-03-23 10:35:36 UTC (rev 61828) @@ -1,12 +1,12 @@ {* $Id$ *} <div class="margin-bottom-md"> - <em>{tr}Read-only metadata extracted from the file.{/tr}</em> - {if isset($metarray.basiconly) and $metarray.basiconly} - <span> - {tr}<em>Only basic metadata processed for this file type.</em>{/tr} - </span> - {/if} + <em>{tr}Read-only metadata extracted from the file.{/tr}</em> + {if isset($metarray.basiconly) and $metarray.basiconly} + <span> + {tr}<em>Only basic metadata processed for this file type.</em>{/tr} + </span> + {/if} </div> {tabset name="metadata"} {foreach $metarray as $subtypes} Modified: trunk/templates/tiki-admin_shoutbox_words.tpl =================================================================== --- trunk/templates/tiki-admin_shoutbox_words.tpl 2017-03-23 07:49:31 UTC (rev 61827) +++ trunk/templates/tiki-admin_shoutbox_words.tpl 2017-03-23 10:35:36 UTC (rev 61828) @@ -9,15 +9,15 @@ </div> <form method="post" action="tiki-admin_shoutbox_words.php" class="form-horizontal"> - <div class="form-group"> - <label class="control-label col-md-2" for="word">{tr}Word{/tr}</label> - <div class="col-md-9"> - <input type="text" name="word" id="word" class="form-control"> - </div> - </div> - <div class="text-center margin-bottom-lg"> - <input type="submit" class="btn btn-default btn-sm" name="add" value="{tr}Add{/tr}"> - </div> + <div class="form-group"> + <label class="control-label col-md-2" for="word">{tr}Word{/tr}</label> + <div class="col-md-9"> + <input type="text" name="word" id="word" class="form-control"> + </div> + </div> + <div class="text-center margin-bottom-lg"> + <input type="submit" class="btn btn-default btn-sm" name="add" value="{tr}Add{/tr}"> + </div> </form> {include file='find.tpl'} Modified: trunk/templates/tiki-admin_tokens.tpl =================================================================== --- trunk/templates/tiki-admin_tokens.tpl 2017-03-23 07:49:31 UTC (rev 61827) +++ trunk/templates/tiki-admin_tokens.tpl 2017-03-23 10:35:36 UTC (rev 61828) @@ -64,36 +64,36 @@ <form action="tiki-admin_tokens.php" method="post" class="form-horizontal"> <input type="hidden" name="action" value="add"> - <div class="form-group"> - <label class="col-sm-4 control-label">{tr}Full URL{/tr}</label> - <div class="col-sm-7 col-sm-offset-1"> - <input type="text" id='entry' name='entry' class="form-control"> - </div> - </div> - <div class="form-group"> - <label class="col-sm-4 control-label">{tr}Timeout in seconds (-1 for unlimited){/tr}</label> - <div class="col-sm-7 col-sm-offset-1"> - <input type="text" id='timeout' name='timeout' class="form-control"> - </div> - </div> - <div class="form-group"> - <label class="col-sm-4 control-label">{tr}Maximum number of hits (-1 for unlimited){/tr}</label> - <div class="col-sm-7 col-sm-offset-1"> - <input type="text" id='maxhits' name='maxhits' class="form-control"> - </div> - </div> - <div class="form-group"> - <label class="col-sm-4 control-label">{tr}Groups (separated by comma){/tr}</label> - <div class="col-sm-7 col-sm-offset-1"> - <input type="text" id='groups' name='groups' class="form-control"> - </div> - </div> - <div class="form-group"> - <label class="col-sm-4 control-label"></label> - <div class="col-sm-7 col-sm-offset-1"> - <input type="submit" class="btn btn-default btn-sm" value="{tr}Add{/tr}"> - </div> - </div> + <div class="form-group"> + <label class="col-sm-4 control-label">{tr}Full URL{/tr}</label> + <div class="col-sm-7 col-sm-offset-1"> + <input type="text" id='entry' name='entry' class="form-control"> + </div> + </div> + <div class="form-group"> + <label class="col-sm-4 control-label">{tr}Timeout in seconds (-1 for unlimited){/tr}</label> + <div class="col-sm-7 col-sm-offset-1"> + <input type="text" id='timeout' name='timeout' class="form-control"> + </div> + </div> + <div class="form-group"> + <label class="col-sm-4 control-label">{tr}Maximum number of hits (-1 for unlimited){/tr}</label> + <div class="col-sm-7 col-sm-offset-1"> + <input type="text" id='maxhits' name='maxhits' class="form-control"> + </div> + </div> + <div class="form-group"> + <label class="col-sm-4 control-label">{tr}Groups (separated by comma){/tr}</label> + <div class="col-sm-7 col-sm-offset-1"> + <input type="text" id='groups' name='groups' class="form-control"> + </div> + </div> + <div class="form-group"> + <label class="col-sm-4 control-label"></label> + <div class="col-sm-7 col-sm-offset-1"> + <input type="submit" class="btn btn-default btn-sm" value="{tr}Add{/tr}"> + </div> + </div> </form> {/tab} {/tabset} Modified: trunk/templates/tiki-directory_admin_sites.tpl =================================================================== --- trunk/templates/tiki-directory_admin_sites.tpl 2017-03-23 07:49:31 UTC (rev 61827) +++ trunk/templates/tiki-directory_admin_sites.tpl 2017-03-23 10:35:36 UTC (rev 61828) @@ -36,25 +36,25 @@ <div class="form-group"> <label class="col-sm-3 control-label">{tr}Name{/tr}</label> <div class="col-sm-7"> - <input type="text" name="name" value="{$info.name|escape}" class="form-control"> - </div> - </div> - <div class="form-group"> + <input type="text" name="name" value="{$info.name|escape}" class="form-control"> + </div> + </div> + <div class="form-group"> <label class="col-sm-3 control-label">{tr}Description{/tr}</label> <div class="col-sm-7"> - <textarea rows="5" cols="60" name="description" class="form-control">{$info.description|escape}</textarea> - </div> - </div> - <div class="form-group"> + <textarea rows="5" cols="60" name="description" class="form-control">{$info.description|escape}</textarea> + </div> + </div> + <div class="form-group"> <label class="col-sm-3 control-label">{tr}URL{/tr}</label> <div class="col-sm-7"> - <input type="text" size="60" name="url" value="{if $info.url ne ""}{$info.url|escape}{else}http://{/if}" class="form-control"> - </div> - </div> - <div class="form-group"> + <input type="text" size="60" name="url" value="{if $info.url ne ""}{$info.url|escape}{else}http://{/if}" class="form-control"> + </div> + </div> + <div class="form-group"> <label class="col-sm-3 control-label">{tr}Directory Categories{/tr}</label> <div class="col-sm-7"> - <select name="siteCats[]" multiple="multiple" size="4" class="form-control"> + <select name="siteCats[]" multiple="multiple" size="4" class="form-control"> {section name=ix loop=$categs} <option value="{$categs[ix].categId|escape}" {if $categs[ix].belongs eq 'y' or $categs[ix].categId eq $addtocat}selected="selected"{/if}> {$categs[ix].path|escape} @@ -65,32 +65,32 @@ {if $categs|@count ge '2'} {remarksbox type="tip" title="{tr}Tip{/tr}"}{tr}Use Ctrl+Click to select multiple options{/tr}{/remarksbox} {/if} - </div> - </div> - {if $prefs.directory_country_flag eq 'y'} - <div class="form-group"> + </div> + </div> + {if $prefs.directory_country_flag eq 'y'} + <div class="form-group"> <label class="col-sm-3 control-label">{tr}Country{/tr}</label> <div class="col-sm-7"> - <select id="country" name="country" class="form-control"> + <select id="country" name="country" class="form-control"> {section name=ux loop=$countries} <option value="{$countries[ux]|escape}" {if $info.country eq $countries[ux]}selected="selected"{/if}>{tr}{$countries[ux]}{/tr}</option> {/section} </select> - </div> - </div> + </div> + </div> {/if} - <div class="form-group"> + <div class="form-group"> <label class="col-sm-3 control-label">{tr}Is valid{/tr} </label> <div class="col-sm-7"> - <input name="isValid" type="checkbox" {if $info.isValid eq 'y'}checked="checked"{/if}> - </div> - </div> - <div class="form-group"> + <input name="isValid" type="checkbox" {if $info.isValid eq 'y'}checked="checked"{/if}> + </div> + </div> + <div class="form-group"> <label class="col-sm-3 control-label"></label> <div class="col-sm-7"> - <input type="submit" class="btn btn-primary btn-sm" name="save" value="{tr}Save{/tr}"> - </div> - </div> + <input type="submit" class="btn btn-primary btn-sm" name="save" value="{tr}Save{/tr}"> + </div> + </div> </form> <h2>{tr}Sites{/tr}</h2> Modified: trunk/templates/tiki-edit_quiz_questions.tpl =================================================================== --- trunk/templates/tiki-edit_quiz_questions.tpl 2017-03-23 07:49:31 UTC (rev 61827) +++ trunk/templates/tiki-edit_quiz_questions.tpl 2017-03-23 10:35:36 UTC (rev 61828) @@ -23,27 +23,27 @@ <div class="form-group"> <label class="col-sm-3 control-label">{tr}Question{/tr}</label> <div class="col-sm-7"> - <textarea name="question" rows="5" cols="80" class="form-control">{$question|escape}</textarea> - </div> - </div> - <div class="form-group"> + <textarea name="question" rows="5" cols="80" class="form-control">{$question|escape}</textarea> + </div> + </div> + <div class="form-group"> <label class="col-sm-3 control-label">{tr}Position{/tr}</label> <div class="col-sm-7"> - <select name="position" class="form-control">{html_options values=$positions output=$positions selected=$position}</select> - </div> - </div> - <div class="form-group"> + <select name="position" class="form-control">{html_options values=$positions output=$positions selected=$position}</select> + </div> + </div> + <div class="form-group"> <label class="col-sm-3 control-label">{tr}Question Type{/tr}</label> <div class="col-sm-7"> - <select name="questionType" class="form-control">{html_options options=$questionTypes selected=$type}</select> - </div> - </div> - <div class="form-group"> + <select name="questionType" class="form-control">{html_options options=$questionTypes selected=$type}</select> + </div> + </div> + <div class="form-group"> <label class="col-sm-3 control-label"></label> <div class="col-sm-7"> - <input type="submit" class="btn btn-primary btn-sm" name="save" value="{tr}Save{/tr}"> - </div> - </div> + <input type="submit" class="btn btn-primary btn-sm" name="save" value="{tr}Save{/tr}"> + </div> + </div> </form> <h2>{tr}Import questions from text{/tr} @@ -62,15 +62,15 @@ <div class="form-group"> <label class="col-sm-3 control-label">{tr}Input{/tr}</label> <div class="col-sm-7"> - <textarea class="form-control wikiedit" name="input_data" rows="30" cols="80" id='subheading'></textarea> - </div> - </div> - <div class="form-group"> + <textarea class="form-control wikiedit" name="input_data" rows="30" cols="80" id='subheading'></textarea> + </div> + </div> + <div class="form-group"> <label class="col-sm-3 control-label"></label> <div class="col-sm-7"> - <input type="submit" class="wikiaction btn btn-default" name="import" value="Import"> - </div> - </div> + <input type="submit" class="wikiaction btn btn-default" name="import" value="Import"> + </div> + </div> </form> <!-- begin form for searching questions --> Modified: trunk/templates/tiki-faq_questions.tpl =================================================================== --- trunk/templates/tiki-faq_questions.tpl 2017-03-23 07:49:31 UTC (rev 61827) +++ trunk/templates/tiki-faq_questions.tpl 2017-03-23 10:35:36 UTC (rev 61828) @@ -16,60 +16,60 @@ <div class="form-group"> <label class="col-sm-3 control-label">{tr}Question{/tr}</label> <div class="col-sm-7"> - <textarea type="text" rows="2" cols="80" name="question" class="form-control" tabindex="1">{$question|escape}</textarea> - </div> - </div> - <div class="form-group"> + <textarea type="text" rows="2" cols="80" name="question" class="form-control" tabindex="1">{$question|escape}</textarea> + </div> + </div> + <div class="form-group"> <label class="col-sm-3 control-label">{tr}Answer{/tr}</label> <div class="col-sm-7"> - {toolbars area_id="faqans"} + {toolbars area_id="faqans"} <textarea id='faqans' type="text" rows="8" cols="80" name="answer" class="form-control" tabindex="2">{$answer|escape}</textarea> - </div> - </div> - <div class="form-group"> + </div> + </div> + <div class="form-group"> <label class="col-sm-3 control-label"></label> <div class="col-sm-7"> - <input type="submit" class="btn btn-primary btn-sm" name="save" value="{tr}Save{/tr}" tabindex="3"> - </div> - </div> + <input type="submit" class="btn btn-primary btn-sm" name="save" value="{tr}Save{/tr}" tabindex="3"> + </div> + </div> </form> {* This is the area for choosing questions from the db... it really should support choosing options from the answers, but only show if there are existing questions *} {if $allq} -<h2> {tr}Use a question from another FAQ{/tr}</h2> -<br> -<form action="tiki-faq_questions.php" method="post" class="form-horizontal"> - <input type="hidden" name="questionId" value="{$questionId|escape}"> - <input type="hidden" name="faqId" value="{$faqId|escape}"> - <div class="form-group"> - <label class="col-sm-3 control-label">{tr}Filter{/tr}</label> - <div class="col-sm-7"> - <div class="input-group"> - <input type="text" name="filter" id="filter" value="{$filter|escape}" class="form-control input-sm"> - <div class="input-group-btn"> - <input type="submit" class="btn btn-default btn-sm" name="filteruseq" value="{tr}Filter{/tr}"> + <h2> {tr}Use a question from another FAQ{/tr}</h2> + <br> + <form action="tiki-faq_questions.php" method="post" class="form-horizontal"> + <input type="hidden" name="questionId" value="{$questionId|escape}"> + <input type="hidden" name="faqId" value="{$faqId|escape}"> + <div class="form-group"> + <label class="col-sm-3 control-label">{tr}Filter{/tr}</label> + <div class="col-sm-7"> + <div class="input-group"> + <input type="text" name="filter" id="filter" value="{$filter|escape}" class="form-control input-sm"> + <div class="input-group-btn"> + <input type="submit" class="btn btn-default btn-sm" name="filteruseq" value="{tr}Filter{/tr}"> + </div> </div> </div> - </div> - </div> - <div class="form-group"> - <label class="col-sm-3 control-label">{tr}Question{/tr}</label> - <div class="col-sm-7"> - <select name="usequestionId" class="form-control"> - {section name=ix loop=$allq} - {* Ok, here's where you change the truncation field for this field *} - <option value="{$allq[ix].questionId|escape|truncate:20:"":true}">{$allq[ix].question|escape|truncate:110:"":true}</option> - {/section} - </select> - </div> - </div> - <div class="form-group"> - <label class="col-sm-3 control-label"></label> - <div class="col-sm-7"> - <input type="submit" class="btn btn-default btn-sm" name="useq" value="{tr}Use{/tr}"> - </div> - </div> -</form> + </div> + <div class="form-group"> + <label class="col-sm-3 control-label">{tr}Question{/tr}</label> + <div class="col-sm-7"> + <select name="usequestionId" class="form-control"> + {section name=ix loop=$allq} + {* Ok, here's where you change the truncation field for this field *} + <option value="{$allq[ix].questionId|escape|truncate:20:"":true}">{$allq[ix].question|escape|truncate:110:"":true}</option> + {/section} + </select> + </div> + </div> + <div class="form-group"> + <label class="col-sm-3 control-label"></label> + <div class="col-sm-7"> + <input type="submit" class="btn btn-default btn-sm" name="useq" value="{tr}Use{/tr}"> + </div> + </div> + </form> {/if} <br> Modified: trunk/templates/tiki-minical_prefs.tpl =================================================================== --- trunk/templates/tiki-minical_prefs.tpl 2017-03-23 07:49:31 UTC (rev 61827) +++ trunk/templates/tiki-minical_prefs.tpl 2017-03-23 10:35:36 UTC (rev 61828) @@ -15,7 +15,7 @@ <div class="form-group"> <label class="col-sm-3 control-label">{tr}Calendar Interval in daily view{/tr}</label> <div class="col-sm-7"> - <select name="minical_interval" class="form-control"> + <select name="minical_interval" class="form-control"> <option value="300" {if $minical_interval eq 300}selected="selected"{/if}>5 {tr}minutes{/tr}</option> <option value="600" {if $minical_interval eq 600}selected="selected"{/if}>10 {tr}minutes{/tr}</option> <option value="900" {if $minical_interval eq 900}selected="selected"{/if}>15 {tr}minutes{/tr}</option> @@ -22,36 +22,36 @@ <option value="1800" {if $minical_interval eq 1800}selected="selected"{/if}>30 {tr}minutes{/tr}</option> <option value="3600" {if $minical_interval eq 3600}selected="selected"{/if}>1 {tr}hour{/tr}</option> </select> - </div> - </div> - <div class="form-group"> + </div> + </div> + <div class="form-group"> <label class="col-sm-3 control-label">{tr}Start hour for days{/tr}</label> <div class="col-sm-7"> - <select name="minical_start_hour" class="form-control"> + <select name="minical_start_hour" class="form-control"> {html_options output=$hours values=$hours selected=$minical_start_hour} </select> - </div> - </div> - <div class="form-group"> + </div> + </div> + <div class="form-group"> <label class="col-sm-3 control-label">{tr}End hour for days{/tr}</label> <div class="col-sm-7"> - <select name="minical_end_hour" class="form-control"> + <select name="minical_end_hour" class="form-control"> {html_options output=$hours values=$hours selected=$minical_end_hour} </select> - </div> - </div> - <div class="form-group"> + </div> + </div> + <div class="form-group"> <label class="col-sm-3 control-label">{tr}Upcoming Events{/tr}</label> <div class="col-sm-7"> - <select name="minical_upcoming" class="form-control"> + <select name="minical_upcoming" class="form-control"> {html_options output=$upcoming values=$upcoming selected=$minical_upcoming} </select> - </div> - </div> - <div class="form-group"> + </div> + </div> + <div class="form-group"> <label class="col-sm-3 control-label">{tr}Reminders{/tr}</label> <div class="col-sm-7"> - <select name="minical_reminders" class="form-control"> + <select name="minical_reminders" class="form-control"> <option value="0" {if $prefs.minical_reminders eq 0}selected="selected"{/if}>{tr}no reminders{/tr}</option> <option value="60" {if $prefs.minical_reminders eq 60}selected="selected"{/if}>1 {tr}min{/tr}</option> <option value="120" {if $prefs.minical_reminders eq 120}selected="selected"{/if}>2 {tr}min{/tr}</option> @@ -59,14 +59,14 @@ <option value="600" {if $prefs.minical_reminders eq 600}selected="selected"{/if}>10 {tr}min{/tr}</option> <option value="900" {if $prefs.minical_reminders eq 900}selected="selected"{/if}>15 {tr}min{/tr}</option> </select> - </div> - </div> - <div class="form-group"> + </div> + </div> + <div class="form-group"> <label class="col-sm-3 control-label"></label> <div class="col-sm-7"> - <input type="submit" class="btn btn-primary btn-sm" name="save" value="{tr}Save{/tr}"> - </div> - </div> + <input type="submit" class="btn btn-primary btn-sm" name="save" value="{tr}Save{/tr}"> + </div> + </div> </form> <a id="import"></a> <h2>{tr}Import CSV file{/tr}</h2> @@ -74,16 +74,16 @@ <div class="form-group"> <label class="col-sm-3 control-label">{tr}Upload file{/tr}</label> <div class="col-sm-7"> - <input type="hidden" name="MAX_FILE_SIZE" value="10000000000000"> + <input type="hidden" name="MAX_FILE_SIZE" value="10000000000000"> <input size="16" name="userfile1" type="file"> - </div> - </div> - <div class="form-group"> + </div> + </div> + <div class="form-group"> <label class="col-sm-3 control-label"></label> <div class="col-sm-7"> - <input type="submit" class="btn btn-default btn-sm" name="import" value="{tr}import{/tr}"> - </div> - </div> + <input type="submit" class="btn btn-default btn-sm" name="import" value="{tr}import{/tr}"> + </div> + </div> </form> <h2>{tr}Admin Topics{/tr}</h2> @@ -91,27 +91,27 @@ <div class="form-group"> <label class="col-sm-3 control-label">{tr}Name:{/tr}</label> <div class="col-sm-7"> - <input type="text" name="name" class="form-control"> - </div> - </div> - <div class="form-group"> + <input type="text" name="name" class="form-control"> + </div> + </div> + <div class="form-group"> <label class="col-sm-3 control-label">{tr}Upload file:{/tr}</label> <div class="col-sm-7"> - <input type="hidden" name="MAX_FILE_SIZE" value="10000000000000" /><input size="16" name="userfile1" type="file"> - </div> - </div> - <div class="form-group"> + <input type="hidden" name="MAX_FILE_SIZE" value="10000000000000" /><input size="16" name="userfile1" type="file"> + </div> + </div> + <div class="form-group"> <label class="col-sm-3 control-label">{tr}Or enter path or URL:{/tr}</label> <div class="col-sm-7"> - <input type="text" name="path" class="form-control"> - </div> - </div> - <div class="form-group"> + <input type="text" name="path" class="form-control"> + </div> + </div> + <div class="form-group"> <label class="col-sm-3 control-label"></label> <div class="col-sm-7"> - <input type="submit" class="btn btn-default btn-sm" name="addtopic" value="{tr}Add Topic{/tr}"> - </div> - </div> + <input type="submit" class="btn btn-default btn-sm" name="addtopic" value="{tr}Add Topic{/tr}"> + </div> + </div> </form> {if count($topics) > 0} <div class="panel panel-default"><div class="panel-body"> Modified: trunk/templates/tiki-pick_avatar.tpl =================================================================== --- trunk/templates/tiki-pick_avatar.tpl 2017-03-23 07:49:31 UTC (rev 61827) +++ trunk/templates/tiki-pick_avatar.tpl 2017-03-23 10:35:36 UTC (rev 61828) @@ -118,13 +118,13 @@ <div class="help-block"> {if $prefs.user_store_file_gallery_picture neq 'y'}{tr}File (only .gif, .jpg and .png images approximately 45px × 45px){/tr}{else}{tr}File (only .gif, .jpg and .png images){/tr}{/if}: </div> - </div> - </div> - <div class="form-group"> + </div> + </div> + <div class="form-group"> <label class="col-sm-3 control-label"></label> <div class="col-sm-7"> <input type="submit" class="btn btn-primary btn-sm" name="upload" value="{tr}Upload{/tr}"> - </div> - </div> + </div> + </div> </form> </div> Modified: trunk/templates/tiki-send_newsletters.tpl =================================================================== --- trunk/templates/tiki-send_newsletters.tpl 2017-03-23 07:49:31 UTC (rev 61827) +++ trunk/templates/tiki-send_newsletters.tpl 2017-03-23 10:35:36 UTC (rev 61828) @@ -59,7 +59,7 @@ {remarksbox type='note' title="{tr}Please Confirm{/tr}"} <b>{tr}This newsletter will be sent to {$subscribers} email addresses.{/tr}</b> <br> - {if $prefs.newsletter_throttle eq 'y'}{tr}Sending will be throttled with a batch size of {$prefs.newsletter_batch_size} and a pause period of {$prefs.newsletter_pause_length} seconds.{/tr}<br>{/if} + {if $prefs.newsletter_throttle eq 'y'}{tr}Sending will be throttled with a batch size of {$prefs.newsletter_batch_size} and a pause period of {$prefs.newsletter_pause_length} seconds.{/tr}<br>{/if} {tr}Reply to:{/tr} {if empty($replyto) AND empty($sendfrom)}{$prefs.sender_email|escape} ({tr}default{/tr})<br>{elseif !empty($replyto) AND !empty($sendfrom)}{$replyto|escape}<br>{elseif !empty($sendfrom)}{$sendfrom|escape}<br>{else}{$replyto|escape}<br>{/if} {tr}Send from:{/tr} {if empty($sendfrom)}{$prefs.sender_email|escape} ({tr}default{/tr})<br>{else}{$sendfrom|escape}<br>{/if} {/remarksbox} @@ -140,7 +140,7 @@ <div id="sendingArea" style="display:none"> <h3>{tr}Sending Newsletter{/tr} ...</h3> - <h5> ... {if $prefs.newsletter_throttle eq 'y'}throttled {/if}{tr}sending to {$subscribers} addresses{/tr}</h5> + <h5> ... {if $prefs.newsletter_throttle eq 'y'}throttled {/if}{tr}sending to {$subscribers} addresses{/tr}</h5> {if $replyto ne ''}<h5> ... {tr}with the 'Reply To' email set to: {$replyto}{/tr}</h5>{/if} {if $sendfrom ne ''}<h5> ... {tr}with the 'Send From' email set to: {$sendfrom}{/tr}</h5>{/if} <div id="confirmed"></div> @@ -241,7 +241,7 @@ <div class="form-group"> <label class="control-label col-sm-2">{tr}Data HTML:{/tr}</label> </div> - <div class="form-group"> + <div class="form-group"> <div class="col-sm-12"> {textarea class="form-control" name='data' id='editwiki'}{$info.data}{/textarea} </div> Modified: trunk/templates/tiki-theme_control_sections.tpl =================================================================== --- trunk/templates/tiki-theme_control_sections.tpl 2017-03-23 07:49:31 UTC (rev 61827) +++ trunk/templates/tiki-theme_control_sections.tpl 2017-03-23 10:35:36 UTC (rev 61828) @@ -26,7 +26,7 @@ <h2>{tr}Assigned sections{/tr}</h2> <form action="tiki-theme_control_sections.php" method="post" role="form" class="form"> - <div class="table-responsive"> + <div class="table-responsive"> <table class="table"> <tr> <th> @@ -59,5 +59,5 @@ </tr> {/section} </table> - </div> + </div> </form> Modified: trunk/templates/tiki-view_forum.tpl =================================================================== --- trunk/templates/tiki-view_forum.tpl 2017-03-23 07:49:31 UTC (rev 61827) +++ trunk/templates/tiki-view_forum.tpl 2017-03-23 10:35:36 UTC (rev 61828) @@ -90,7 +90,7 @@ {tr}Unlock{/tr} {/self_link} {else} - {self_link lock='y' _icon_name='lock' _menu_text='y' _menu_icon='y'} + {self_link lock='y' _icon_name='lock' _menu_text='y' _menu_icon='y'} {tr}Lock{/tr} {/self_link} {/if} @@ -378,7 +378,7 @@ </div> <!-- end forumpost --> {/if} {if $prefs.feature_forum_content_search eq 'y' and $prefs.feature_search eq 'y'} - <div class="row margin-bottom-md"> + <div class="row margin-bottom-md"> <div class="col-md-5 col-md-offset-7"> <form id="search-form" class="form" role="form" method="get" action="tiki-search{if $prefs.feature_forum_local_tiki_search eq 'y'}index{else}results{/if}.php"> <div class="form-group"> @@ -396,7 +396,7 @@ </div> </form> </div> - </div> + </div> {/if} {/if} {if $tiki_p_admin_forum eq 'y' && ($comments_coms|@count > 0 || $queued > 0 || $reported > 0)} Modified: trunk/templates/tiki-webmail.tpl =================================================================== --- trunk/templates/tiki-webmail.tpl 2017-03-23 07:49:31 UTC (rev 61827) +++ trunk/templates/tiki-webmail.tpl 2017-03-23 10:35:36 UTC (rev 61828) @@ -351,7 +351,7 @@ </table> {if $tiki_p_admin_group_webmail eq 'y'} {include file='categorize.tpl'} - {/if} + {/if} </form> </div> {else} @@ -601,7 +601,7 @@ {if $sent eq 'n'} <form action="tiki-webmail.php" method="post"> <input type="hidden" name="locSection" value="compose"> - <input type="hidden" name="current" value="{$curacctId|escape}"> + <input type="hidden" name="current" value="{$curacctId|escape}"> <input type="hidden" name="attach1" value="{$attach1|escape}"> <input type="hidden" name="attach2" value="{$attach2|escape}"> <input type="hidden" name="attach3" value="{$attach3|escape}"> @@ -611,21 +611,21 @@ <input type="hidden" name="attach1type" value="{$attach1type|escape}"> <input type="hidden" name="attach2type" value="{$attach2type|escape}"> <input type="hidden" name="attach3type" value="{$attach3type|escape}"> - <input type="hidden" name="fattId" value="{$fattId|escape}"> + <input type="hidden" name="fattId" value="{$fattId|escape}"> <input type="submit" class="btn btn-primary btn-sm" name="send" value="{tr}Send{/tr}"> <table class="formcolor"> <tr> - <td colspan="4"> - {tr}Sending from webmail account:{/tr} {$sendFrom} - </td> - </tr> - <tr> + <td colspan="4"> + {tr}Sending from webmail account:{/tr} {$sendFrom} + </td> + </tr> + <tr> <td>{tr}Wiki page after send{/tr}</td> <td colspan="3"> <input size="69" type="text" name="pageaftersend" value="{$pageaftersend|escape}"> </td> </tr> - <tr> + <tr> <td> <a title="{tr}Select from address book{/tr}" class="link" href="#" onclick="javascript:window.open('tiki-webmail_contacts.php?element=to','','menubar=no,width=452,height=550');">{tr}To{/tr}</a>: </td> @@ -664,7 +664,7 @@ {if $attach3} ({$attach3}) {/if} - {if $fattId} + {if $fattId} (File Gallery file: {$fattId}) {/if} <input type="submit" class="btn btn-primary btn-sm" name="attach" value="{tr}Add{/tr}"> @@ -687,14 +687,14 @@ </table> </form> {elseif $pageaftersend ne ''} - {$msg} - <br><br> - <form action="tiki-index.php?page={$pageaftersend}" method="post"> - {tr}Click to go to:{/tr} {$pageaftersend} <input type="submit" class="btn btn-default btn-sm" name="pageafter" value="{tr}Go to page{/tr}"> - </form> - {else} {$msg} <br><br> + <form action="tiki-index.php?page={$pageaftersend}" method="post"> + {tr}Click to go to:{/tr} {$pageaftersend} <input type="submit" class="btn btn-default btn-sm" name="pageafter" value="{tr}Go to page{/tr}"> + </form> + {else} + {$msg} + <br><br> {if $notcon eq 'y'} {tr}The following addresses are not in your address book{/tr} <br><br> @@ -740,7 +740,7 @@ {else} <form enctype="multipart/form-data" action="tiki-webmail.php" method="post"> <input type="hidden" name="locSection" value="compose"> - <input type="hidden" name="current" value="{$curacctId|escape}"> + <input type="hidden" name="current" value="{$curacctId|escape}"> <input type="hidden" name="to" value="{$to|escape}"> <input type="hidden" name="cc" value="{$cc|escape}"> <input type="hidden" name="bcc" value="{$bcc|escape}"> @@ -755,8 +755,8 @@ <input type="hidden" name="attach1type" value="{$attach1type|escape}"> <input type="hidden" name="attach2type" value="{$attach2type|escape}"> <input type="hidden" name="attach3type" value="{$attach3type|escape}"> - <input type="hidden" name="fattId" value="{$fattId|escape}"> - <input type="hidden" name="pageaftersend" value="{$pageaftersend|escape}"> + <input type="hidden" name="fattId" value="{$fattId|escape}"> + <input type="hidden" name="pageaftersend" value="{$pageaftersend|escape}"> <table class="formcolor"> {if $attach1} <tr> @@ -804,7 +804,7 @@ </td> </tr> {/if} - <tr> + <tr> <td>{tr}Attach a File Gallery file{/tr}</td> <td> <input size="10" type="text" id="fattId" name="fattId" value="{$fattId|escape}"> :FileId @@ -816,7 +816,7 @@ <input size="10" type="text" id="fattId" name="fattId" value="{$fattId|escape}"> :FileId </td> </tr> - <tr> + <tr> <td> </td> <td> <input type="submit" class="btn btn-default btn-sm" name="attached" value="{tr}Done{/tr}"> Modified: trunk/templates/wizard/admin_community.tpl =================================================================== --- trunk/templates/wizard/admin_community.tpl 2017-03-23 07:49:31 UTC (rev 61827) +++ trunk/templates/wizard/admin_community.tpl 2017-03-23 10:35:36 UTC (rev 61828) @@ -8,7 +8,7 @@ {tr}Configure general user & community features and settings related to sharing and social networks{/tr}. </br></br></br> <div class="media-body"> - {icon name="user" size=3 iclass="pull-right"} + {icon name="user" size=3 iclass="pull-right"} <fieldset> <legend>{tr}User Features{/tr}</legend> <div class="row"> @@ -39,9 +39,9 @@ </em> <br/><br/> <em>{tr}To set up the <strong>User Watches</strong> and their associated settings, visit the page to {/tr} <a href="tiki-wizard_admin.php?&stepNr=15&url={$homepageUrl}">{tr}Set up Main features{/tr}</a></em> - </br></br> + </br></br> </fieldset> - {icon name="users" size=3 iclass="pull-right"} + {icon name="users" size=3 iclass="pull-right"} <fieldset> <legend>{tr}Community General Settings{/tr}</legend> <div class="row"> @@ -76,10 +76,10 @@ </div> </div> <br> - <em>{tr}See also{/tr} {tr}Community{/tr} <a href="tiki-admin.php?page=community&cookietab=1" target="_blank">{tr}admin panel{/tr}</a> & <a href="https://doc.tiki.org/Community" target="_blank">{tr}in doc.tiki.org{/tr}</a></em> + <em>{tr}See also{/tr} {tr}Community{/tr} <a href="tiki-admin.php?page=community&cookietab=1" target="_blank">{tr}admin panel{/tr}</a> & <a href="https://doc.tiki.org/Community" target="_blank">{tr}in doc.tiki.org{/tr}</a></em> </div> </fieldset> - {icon name="admin_share" size=3 iclass="pull-right"} + {icon name="admin_share" size=3 iclass="pull-right"} <fieldset> <legend>{tr}Sharing & Networking{/tr}</legend> <div class="row"> @@ -86,7 +86,7 @@ <div class="col-lg-3"> {preference name=feature_share} <br> - <em>{tr}See also{/tr} {tr}Share{/tr} <a href="tiki-admin.php?page=share" target="_blank">{tr}admin panel{/tr}</a> & <a href="https://doc.tiki.org/Share" target="_blank">{tr}in doc.tiki.org{/tr}</a></em>. + <em>{tr}See also{/tr} {tr}Share{/tr} <a href="tiki-admin.php?page=share" target="_blank">{tr}admin panel{/tr}</a> & <a href="https://doc.tiki.org/Share" target="_blank">{tr}in doc.tiki.org{/tr}</a></em>. </div> <div class="col-lg-6"> {preference name=feature_friends} @@ -94,12 +94,12 @@ {preference name=social_network_type} </div> <br> - <em>{tr}See also{/tr} "{tr}Community{/tr} <a href="tiki-admin.php?page=community&cookietab=2" target="_blank">{tr}admin panel{/tr}</a> > {tr}Social Network{/tr} > {tr}Friendship and Followers{/tr}" & <a href="https://doc.tiki.org/Friendship+Network" target="_blank">{tr}in doc.tiki.org{/tr}</a></em>. + <em>{tr}See also{/tr} "{tr}Community{/tr} <a href="tiki-admin.php?page=community&cookietab=2" target="_blank">{tr}admin panel{/tr}</a> > {tr}Social Network{/tr} > {tr}Friendship and Followers{/tr}" & <a href="https://doc.tiki.org/Friendship+Network" target="_blank">{tr}in doc.tiki.org{/tr}</a></em>. </div> <div class="col-lg-3"> {preference name=feature_socialnetworks} <br> - <em>{tr}See also{/tr} {tr}Social networks{/tr} <a href="tiki-admin.php?page=socialnetworks&cookietab=1" target="_blank">{tr}admin panel{/tr}</a> & <a href="https://doc.tiki.org/Social+Networks" target="_blank">{tr}in doc.tiki.org{/tr}</a></em> + <em>{tr}See also{/tr} {tr}Social networks{/tr} <a href="tiki-admin.php?page=socialnetworks&cookietab=1" target="_blank">{tr}admin panel{/tr}</a> & <a href="https://doc.tiki.org/Social+Networks" target="_blank">{tr}in doc.tiki.org{/tr}</a></em> </div> </div> </fieldset> Modified: trunk/templates/wizard/admin_date_time.tpl =================================================================== --- trunk/templates/wizard/admin_date_time.tpl 2017-03-23 07:49:31 UTC (rev 61827) +++ trunk/templates/wizard/admin_date_time.tpl 2017-03-23 10:35:36 UTC (rev 61828) @@ -6,11 +6,11 @@ </span> {tr}Set the site time zone and format for displaying dates and times{/tr}.</br></br> <div class="media"> - {icon name="admin_general" size=3 iclass="adminWizardIconright"} + {icon name="admin_general" size=3 iclass="adminWizardIconright"} <div class="media-content"> <fieldset> <legend>{tr}Date and Time setup{/tr}</legend> - {icon name="clock-o" size=2 iclass="adminWizardIconright"} + {icon name="clock-o" size=2 iclass="adminWizardIconright"} <div class="admin clearfix featurelist"> {preference name=server_timezone} {preference name=users_prefs_display_12hr_clock} Modified: trunk/templates/wizard/admin_editor_type.tpl =================================================================== --- trunk/templates/wizard/admin_editor_type.tpl 2017-03-23 07:49:31 UTC (rev 61827) +++ trunk/templates/wizard/admin_editor_type.tpl 2017-03-23 10:35:36 UTC (rev 61828) @@ -6,7 +6,7 @@ </span> {tr}Select editor type{/tr}.</br></br></br> <div class="adminWizardContent"> - {icon name="admin_textarea" size=3 iclass="adminWizardIconright"} + {icon name="admin_textarea" size=3 iclass="adminWizardIconright"} <fieldset> <legend>{tr}Editor{/tr}</legend> <br> @@ -14,7 +14,7 @@ <tr> <td> <input type="radio" name="editorType" value="text" {if empty($editorType) || $editorType eq 'text'}checked="checked"{/if} /> {tr}Only Plain Text Editor (Disable Wysiwyg){/tr} - {icon name="file-text-o" size=2 iclass="adminWizardIconright"} + {icon name="file-text-o" size=2 iclass="adminWizardIconright"} <div style="display:block; margin-left:40px"> {tr}Use only the plain text editor, which is the most stable editor mode and most compatible with Tiki functionality. The Full WYSIWYG Editor will be disabled, but you will still be able to insert wysiwyg sections through the Plain Text editor with <a href="https://doc.tiki.org/PluginWysiwyg" alt="Link to Plugin Wysiwyg doc. page" target="blank">Plugin Wysiwyg</a>{/tr}. </div> @@ -26,8 +26,8 @@ <tr> <td> <input type="radio" name="editorType" value="wysiwyg" {if $editorType eq 'wysiwyg'}checked="checked"{/if} /> {tr}Wysiwyg{/tr} - {icon name="file-text-o" size=2 iclass="adminWizardIconright"} - {icon name="file-text" size=2 iclass="adminWizardIconright"} + {icon name="file-text-o" size=2 iclass="adminWizardIconright"} + {icon name="file-text" size=2 iclass="adminWizardIconright"} <div style="display:block; margin-left:40px"> {tr}Use a What You See Is What You Get (Wysiwyg) editor, by default in all new pages or only in some when selected. Provides a visual interface preferred by many. You will be able to configure the Full WYSIWYG Editor options in a next wizard page{/tr}. </div> Modified: trunk/templates/wizard/admin_features.tpl =================================================================== --- trunk/templates/wizard/admin_features.tpl 2017-03-23 07:49:31 UTC (rev 61827) +++ trunk/templates/wizard/admin_features.tpl 2017-03-23 10:35:36 UTC (rev 61828) @@ -5,9 +5,9 @@ <i class="fa fa-gear fa-stack-2x"></i> <i class="fa fa-rotate-270 fa-magic fa-stack-2x margin-left-9em"></i> </span> - {tr}Set up the main Tiki features. The wiki and file gallery features are always enabled.{/tr}</br></br></br> + {tr}Set up the main Tiki features. The wiki and file gallery features are always enabled.{/tr}</br></br></br> <div class="media-body"> - {icon name="admin_features" size=3 iclass="pull-right"} + {icon name="admin_features" size=3 iclass="pull-right"} <fieldset> <legend>{tr}Main Tiki features{/tr}</legend> {* preference name=feature_wiki *} @@ -30,7 +30,7 @@ </fieldset> <fieldset> <legend>{tr}Watches{/tr}</legend> - {icon name="envelope-o" size=2 iclass="pull-right"} + {icon name="envelope-o" size=2 iclass="pull-right"} {tr}Enable email notifications to users when changes in the content of specific items (pages, posts, trackers, etc.) are made{/tr}. <div class="admin clearfix featurelist"> {preference name=feature_user_watches} Modified: trunk/templates/wizard/admin_files.tpl =================================================================== --- trunk/templates/wizard/admin_files.tpl 2017-03-23 07:49:31 UTC (rev 61827) +++ trunk/templates/wizard/admin_files.tpl 2017-03-23 10:35:36 UTC (rev 61828) @@ -1,12 +1,12 @@ {* $Id$ *} <div class="media"> -<span class="pull-left fa-stack fa-lg margin-right-18em" alt="{tr}Configuration Wizard{/tr}" title="Configuration Wizard"> - <i class="fa fa-gear fa-stack-2x"></i> - <i class="fa fa-rotate-270 fa-magic fa-stack-2x margin-left-9em"></i> -</span> - {icon name="admin_fgal" size=3 iclass="pull-right"} - {tr}Set up the file gallery and attachments{/tr}. {tr}Choose to store them either in the database or in files on disk, among other options{/tr}.<br/><br/> + <span class="pull-left fa-stack fa-lg margin-right-18em" alt="{tr}Configuration Wizard{/tr}" title="Configuration Wizard"> + <i class="fa fa-gear fa-stack-2x"></i> + <i class="fa fa-rotate-270 fa-magic fa-stack-2x margin-left-9em"></i> + </span> + {icon name="admin_fgal" size=3 iclass="pull-right"} + {tr}Set up the file gallery and attachments{/tr}. {tr}Choose to store them either in the database or in files on disk, among other options{/tr}.<br/><br/> <div class="media-body"> <div class="row"> <div class="col-lg-6"> Modified: trunk/templates/wizard/admin_files_storage.tpl =================================================================== --- trunk/templates/wizard/admin_files_storage.tpl 2017-03-23 07:49:31 UTC (rev 61827) +++ trunk/templates/wizard/admin_files_storage.tpl 2017-03-23 10:35:36 UTC (rev 61828) @@ -5,7 +5,7 @@ <i class="fa fa-gear fa-stack-2x"></i> <i class="fa fa-rotate-270 fa-magic fa-stack-2x margin-left-9em"></i> </span> - {tr}Choose your desired settings below{/tr}</br></br> + {tr}Choose your desired settings below{/tr}</br></br> <div class="media-body"> <p> {if isset($promptElFinder) AND $promptElFinder eq 'y'} @@ -12,7 +12,7 @@ <div> <fieldset> <legend>{tr}elFinder{/tr}</legend> - {icon name="admin_fgal" size=2 iclass="pull-right"} + {icon name="admin_fgal" size=2 iclass="pull-right"} <input type="checkbox" name="useElFinderAsDefault" {if !isset($useElFinderAsDefault) or $useElFinderAsDefault eq true}checked='checked'{/if} /> {tr}Set elFinder as the default file gallery viewer{/tr}. <div class="adminoptionboxchild"> {tr}See also{/tr} <a href="http://doc.tiki.org/elFinder" target="_blank">{tr}elFinder{/tr} @ doc.tiki.org</a> Modified: trunk/templates/wizard/admin_language.tpl =================================================================== --- trunk/templates/wizard/admin_language.tpl 2017-03-23 07:49:31 UTC (rev 61827) +++ trunk/templates/wizard/admin_language.tpl 2017-03-23 10:35:36 UTC (rev 61828) @@ -5,9 +5,9 @@ <i class="fa fa-gear fa-stack-2x"></i> <i class="fa fa-rotate-270 fa-magic fa-stack-2x margin-left-9em"></i> </span> - {tr}Select the site language{/tr}.</br></br></br> + {tr}Select the site language{/tr}.</br></br></br> <div class="media-content"> - {icon name="admin_i18n" size=3 iclass="adminWizardIconright"} + {icon name="admin_i18n" size=3 iclass="adminWizardIconright"} <fieldset> <legend>{tr}Language{/tr}</legend> Modified: trunk/templates/wizard/admin_login.tpl =================================================================== --- trunk/templates/wizard/admin_login.tpl 2017-03-23 07:49:31 UTC (rev 61827) +++ trunk/templates/wizard/admin_login.tpl 2017-03-23 10:35:36 UTC (rev 61828) @@ -4,9 +4,9 @@ <i class="fa fa-gear fa-stack-2x"></i> <i class="fa fa-rotate-270 fa-magic fa-stack-2x margin-left-9em"></i> </span> - {tr}Configure the login, registration and validation preferences for the new accounts{/tr}.<br/></br></br> + {tr}Configure the login, registration and validation preferences for the new accounts{/tr}.<br/></br></br> <div class="media-body"> - {icon name="admin_login" size=3 iclass="adminWizardIconright"} + {icon name="admin_login" size=3 iclass="adminWizardIconright"} <fieldset> <legend>{tr}Registration & Log in options{/tr}</legend> <div style="position:relative;"> Modified: trunk/templates/wizard/admin_namespace.tpl =================================================================== --- trunk/templates/wizard/admin_namespace.tpl 2017-03-23 07:49:31 UTC (rev 61827) +++ trunk/templates/wizard/admin_namespace.tpl 2017-03-23 10:35:36 UTC (rev 61828) @@ -1,20 +1,20 @@ {* $Id$ *} <div class="media"> - <span class="pull-left fa-stack fa-lg margin-right-18em" alt="{tr}Configuration Wizard{/tr}" title="Configuration Wizard"> - <i class="fa fa-gear fa-stack-2x"></i> - <i class="fa fa-rotate-270 fa-magic fa-stack-2x margin-left-9em"></i> - </span> - {icon name="wrench" size=3 iclass="pull-right"} - <div class="row"> - <div class="col-lg-9"> - {tr}The namespace separator should not{/tr} - <ul> - <li>{tr}contain any of the characters not allowed in wiki page names, typically{/tr} /?#[]@$&+;=<></li> - <li>{tr}conflict with wiki syntax tagging{/tr}</li> - </ul> - </div> - </div> - <div class="media-body"> + <span class="pull-left fa-stack fa-lg margin-right-18em" alt="{tr}Configuration Wizard{/tr}" title="Configuration Wizard"> + <i class="fa fa-gear fa-stack-2x"></i> + <i class="fa fa-rotate-270 fa-magic fa-stack-2x margin-left-9em"></i> + </span> + {icon name="wrench" size=3 iclass="pull-right"} + <div class="row"> + <div class="col-lg-9"> + {tr}The namespace separator should not{/tr} + <ul> + <li>{tr}contain any of the characters not allowed in wiki page names, typically{/tr} /?#[]@$&+;=<></li> + <li>{tr}conflict with wiki syntax tagging{/tr}</li> + </ul> + </div> + </div> + <div class="media-body"> <fieldset> <legend>{tr}Namespace settings{/tr}{help url="Namespaces"}</legend> {preference name=namespace_separator} @@ -23,7 +23,7 @@ {/if} <br/> <b>{tr}Settings that may be affected by the namespace separator{/tr}:</b><br/> - {icon name="file-text-o" size=2 iclass="pull-right"} + {icon name="file-text-o" size=2 iclass="pull-right"} {tr}To use :: as a separator, you should also use ::: as the wiki center tag syntax{/tr}.<br/> {tr}Note: a conversion of :: to ::: for existing pages must be done manually{/tr} Modified: trunk/templates/wizard/admin_search.tpl =================================================================== --- trunk/templates/wizard/admin_search.tpl 2017-03-23 07:49:31 UTC (rev 61827) +++ trunk/templates/wizard/admin_search.tpl 2017-03-23 10:35:36 UTC (rev 61828) @@ -5,9 +5,9 @@ <i class="fa fa-gear fa-stack-2x"></i> <i class="fa fa-rotate-270 fa-magic fa-stack-2x margin-left-9em"></i> </span> - {icon name="admin_search" size=3 iclass="pull-right"} - {tr}There are two search systems in Tiki that use different search engines: <strong>Basic Search</strong> and <strong>Advanced Search</strong>{/tr}. - {tr}The Advanced Search generally provides better results, but is more demanding on the server (it creates a search index, updated either incrementally or based on a cron job configured elsewhere){/tr}. + {icon name="admin_search" size=3 iclass="pull-right"} + {tr}There are two search systems in Tiki that use different search engines: <strong>Basic Search</strong> and <strong>Advanced Search</strong>{/tr}. + {tr}The Advanced Search generally provides better results, but is more demanding on the server (it creates a search index, updated either incrementally or based on a cron job configured elsewhere){/tr}. <div class="media-body"> <br/><br/> <div class="row"> Modified: trunk/templates/wizard/admin_structures.tpl =================================================================== --- trunk/templates/wizard/admin_structures.tpl 2017-03-23 07:49:31 UTC (rev 61827) +++ trunk/templates/wizard/admin_structures.tpl 2017-03-23 10:35:36 UTC (rev 61828) @@ -6,7 +6,7 @@ <i class="fa fa-rotate-270 fa-magic fa-stack-2x margin-left-9em"></i> </span> {tr}Structures organize a group of wiki pages into a tree or book that can be easily navigated by users. Creating a structure is the fastest method for creating multiple pages at once. It's a great way to make a book, as well as to allow users to create new pages that will be automatically found in a common table of contents. New pages can inherit permissions from the structure homepage{/tr}. - </br></br> + </br></br> <div class="media-body"> {icon name="structure" size=3 iclass="pull-right"} <fieldset> Modified: trunk/templates/wizard/admin_text_area.tpl =================================================================== --- trunk/templates/wizard/admin_text_area.tpl 2017-03-23 07:49:31 UTC (rev 61827) +++ trunk/templates/wizard/admin_text_area.tpl 2017-03-23 10:35:36 UTC (rev 61828) @@ -5,9 +5,9 @@ <i class="fa fa-gear fa-stack-2x"></i> <i class="fa fa-rotate-270 fa-magic fa-stack-2x margin-left-9em"></i> </span> - {tr}Set up the text area environment (Editing and Plugins){/tr}.</br></br> + {tr}Set up the text area environment (Editing and Plugins){/tr}.</br></br> <div class="media"> - {icon name="admin_textarea" size=3 iclass="adminWizardIconright"} + {icon name="admin_textarea" size=3 iclass="adminWizardIconright"} <fieldset> <legend>{tr}General settings{/tr}</legend> <div class="admin clearfix featurelist"> Modified: trunk/templates/wizard/admin_wiki.tpl =================================================================== --- trunk/templates/wizard/admin_wiki.tpl 2017-03-23 07:49:31 UTC (rev 61827) +++ trunk/templates/wizard/admin_wiki.tpl 2017-03-23 10:35:36 UTC (rev 61828) @@ -5,10 +5,10 @@ <i class="fa fa-rotate-270 fa-magic fa-stack-2x margin-left-9em"></i> </span> <div class="media-content"> - {tr}Set up the Wiki environment{/tr}</br></br></br> - {icon name="file-text-o" size=3 iclass="adminWizardIconright"} + {tr}Set up the Wiki environment{/tr}</br></br></br> + {icon name="file-text-o" size=3 iclass="adminWizardIconright"} <fieldset> - <legend>{tr}Wiki environment{/tr}</legend> + <legend>{tr}Wiki environment{/tr}</legend> <div class="admin clearfix featurelist"> {preference name=feature_categories} Modified: trunk/templates/wizard/admin_wizard.tpl =================================================================== --- trunk/templates/wizard/admin_wizard.tpl 2017-03-23 07:49:31 UTC (rev 61827) +++ trunk/templates/wizard/admin_wizard.tpl 2017-03-23 10:35:36 UTC (rev 61828) @@ -5,7 +5,7 @@ <legend>{tr}Get Started{/tr}</legend> <p class="wizardCongrat text-success"> - {icon name="check" size=1} {tr _0=$tiki_version}Congratulations! You now have a working instance of Tiki %0{/tr}. + {icon name="check" size=1} {tr _0=$tiki_version}Congratulations! You now have a working instance of Tiki %0{/tr}. {tr}You may <a href="tiki-index.php">start using it right away</a>, or you may configure it to better meet your needs, using one of the configuration helpers below.{/tr} </p> Modified: trunk/templates/wizard/admin_wizard_completed.tpl =================================================================== --- trunk/templates/wizard/admin_wizard_completed.tpl 2017-03-23 07:49:31 UTC (rev 61827) +++ trunk/templates/wizard/admin_wizard_completed.tpl 2017-03-23 10:35:36 UTC (rev 61828) @@ -1,8 +1,8 @@ {* $Id$ *} <div class="media"> - {icon name="check" size=2} {tr}Congratulations{/tr}. {tr}You are done with the admin wizard{/tr}.<br> - </br></br> + {icon name="check" size=2} {tr}Congratulations{/tr}. {tr}You are done with the admin wizard{/tr}.<br> + </br></br> <div class="media-body"> <fieldset> <legend>{tr}Next?{/tr}</legend> Modified: trunk/templates/wizard/admin_wysiwyg.tpl =================================================================== --- trunk/templates/wizard/admin_wysiwyg.tpl 2017-03-23 07:49:31 UTC (rev 61827) +++ trunk/templates/wizard/admin_wysiwyg.tpl 2017-03-23 10:35:36 UTC (rev 61828) @@ -1,13 +1,13 @@ {* $Id$ *} <div class="media"> - <span class="pull-left fa-stack fa-lg margin-right-18em" alt="{tr}Configuration Wizard{/tr}" title="Configuration Wizard"> + <span class="pull-left fa-stack fa-lg margin-right-18em" alt="{tr}Configuration Wizard{/tr}" title="Configuration Wizard"> <i class="fa fa-gear fa-stack-2x"></i> <i class="fa fa-rotate-270 fa-magic fa-stack-2x margin-left-9em"></i> </span> - {tr}You can choose to use by default the 'Compatible' Wiki mode (content is saved in wiki syntax), or the HTML mode{/tr}. + {tr}You can choose to use by default the 'Compatible' Wiki mode (content is saved in wiki syntax), or the HTML mode{/tr}. <div class="media"> - {icon name="admin_wysiwyg" size=3 iclass="adminWizardIconright"} + {icon name="admin_wysiwyg" size=3 iclass="adminWizardIconright"} <fieldset> <legend>{tr}Wysiwyg editor{/tr}</legend> {tr}Select the Wysiwyg editor mode{/tr} Modified: trunk/templates/wizard/profiles_completed.tpl =================================================================== --- trunk/templates/wizard/profiles_completed.tpl 2017-03-23 07:49:31 UTC (rev 61827) +++ trunk/templates/wizard/profiles_completed.tpl 2017-03-23 10:35:36 UTC (rev 61828) @@ -1,22 +1,22 @@ {* $Id... [truncated message content] |
From: <jy...@us...> - 2017-03-24 10:27:03
|
Revision: 61837 http://sourceforge.net/p/tikiwiki/code/61837 Author: jyhem Date: 2017-03-24 10:26:59 +0000 (Fri, 24 Mar 2017) Log Message: ----------- Indentation fixes. Tiki standardises on tab indenting Modified Paths: -------------- trunk/templates/admin/include_category.tpl trunk/templates/admin/include_intertiki.tpl trunk/templates/admin/include_login.tpl trunk/templates/admin/include_look.tpl trunk/templates/admin/include_print.tpl trunk/templates/admin/include_search.tpl trunk/templates/admin/include_wiki.tpl trunk/templates/browse_file_gallery.tpl trunk/templates/canonical.tpl trunk/templates/file/uploader.tpl trunk/templates/layouts/layout_plain.tpl trunk/templates/managestream/record.tpl trunk/templates/managestream/sample.tpl trunk/templates/messu-archive.tpl trunk/templates/messu-read_sent.tpl trunk/templates/module.tpl trunk/templates/modules/mod-logo.tpl trunk/templates/modules/mod-minichat.tpl trunk/templates/modules/mod-poweredby.tpl trunk/templates/social/list_friends.tpl trunk/templates/tiki-admin.tpl trunk/templates/tiki-admin_actionlog.tpl trunk/templates/tiki-admin_hotwords.tpl trunk/templates/tiki-admin_html_page_content.tpl trunk/templates/tiki-admin_integrator_rules.tpl trunk/templates/tiki-admin_modules.tpl trunk/templates/tiki-admin_newsletters.tpl trunk/templates/tiki-admin_survey_questions.tpl trunk/templates/tiki-assignuser.tpl trunk/templates/tiki-batch_upload_files.tpl trunk/templates/tiki-calendar_edit_item.tpl trunk/templates/tiki-calendar_import.tpl trunk/templates/tiki-contacts.tpl trunk/templates/tiki-copypage.tpl trunk/templates/tiki-create_webhelp.tpl trunk/templates/tiki-directory_add_site.tpl trunk/templates/tiki-discount.tpl trunk/templates/tiki-edit_banner.tpl trunk/templates/tiki-edit_image.tpl trunk/templates/tiki-edit_programmed_content.tpl trunk/templates/tiki-edit_question_options.tpl trunk/templates/tiki-edit_quiz_results.tpl trunk/templates/tiki-edit_structure.tpl trunk/templates/tiki-edit_submission.tpl trunk/templates/tiki-forum_import.tpl trunk/templates/tiki-forums.tpl trunk/templates/tiki-list_articles.tpl trunk/templates/tiki-list_contents.tpl trunk/templates/tiki-list_faqs.tpl trunk/templates/tiki-listpages.tpl trunk/templates/tiki-listpages_content.tpl trunk/templates/tiki-live_support_admin.tpl trunk/templates/tiki-live_support_client.tpl trunk/templates/tiki-minical.tpl trunk/templates/tiki-mods_config.tpl trunk/templates/tiki-newsletters.tpl trunk/templates/tiki-notepad_list.tpl trunk/templates/tiki-notepad_write.tpl trunk/templates/tiki-pluginlist_experiment.tpl trunk/templates/tiki-print_pages.tpl trunk/templates/tiki-send_objects.tpl trunk/templates/tiki-shoutbox.tpl trunk/templates/tiki-theme_control_objects.tpl trunk/templates/tiki-tracker_force_fill.tpl trunk/templates/tiki-view_articles.tpl trunk/templates/tiki-view_forum_thread.tpl trunk/templates/tiki-view_tracker_item.tpl trunk/templates/trackerinput/files.tpl trunk/templates/trackerinput/image.tpl trunk/templates/trackerinput/showtikiorg.tpl trunk/templates/wiki-plugins/trackercalendar.tpl trunk/templates/wiki-plugins/wikiplugin_catorphans.tpl trunk/templates/wiki-plugins/wikiplugin_friend.tpl trunk/templates/wiki-plugins/wikiplugin_pivottable.tpl trunk/templates/wiki-plugins/wikiplugin_tour_template.tpl trunk/templates/wiki-plugins/wikiplugin_xmlupdate.tpl Modified: trunk/templates/admin/include_category.tpl =================================================================== --- trunk/templates/admin/include_category.tpl 2017-03-23 20:25:37 UTC (rev 61836) +++ trunk/templates/admin/include_category.tpl 2017-03-24 10:26:59 UTC (rev 61837) @@ -55,7 +55,7 @@ {preference name=categories_used_in_tpl} {preference name=categories_add_class_to_body_tag} {preference name=categories_cache_refresh_on_object_cat} - + <div class="adminoptionboxchild" id="categories_used_in_tpl_childcontainer"> {preference name=feature_areas} {preference name=areas_root} Modified: trunk/templates/admin/include_intertiki.tpl =================================================================== --- trunk/templates/admin/include_intertiki.tpl 2017-03-23 20:25:37 UTC (rev 61836) +++ trunk/templates/admin/include_intertiki.tpl 2017-03-24 10:26:59 UTC (rev 61837) @@ -111,13 +111,13 @@ </td> <td> <input type="text" class="form-control tips" id="known_hosts_key" name="known_hosts[{$k}][key]" value="{$i.key}" - readonly="readonly" title="|{tr}To change the host key you need to remove and add it as a new one{/tr}"> + readonly="readonly" title="|{tr}To change the host key you need to remove and add it as a new one{/tr}"> </td> <td> <input type="text" class="form-control" id="known_hosts_ip" name="known_hosts[{$k}][ip]" value="{$i.ip}"> </td> <td> - <input type="text" class="form-control" id="known_hosts_contact" name="known_hosts[{$k}][contact]" value="{$i.contact}"> + <input type="text" class="form-control" id="known_hosts_contact" name="known_hosts[{$k}][contact]" value="{$i.contact}"> </td> <td> <input type="checkbox" class="form-control" id="known_hosts_can_register" name="known_hosts[{$k}][allowusersregister]" {if isset($i.allowusersregister) && $i.allowusersregister eq 'y'}checked="checked"{/if} /> Modified: trunk/templates/admin/include_login.tpl =================================================================== --- trunk/templates/admin/include_login.tpl 2017-03-23 20:25:37 UTC (rev 61836) +++ trunk/templates/admin/include_login.tpl 2017-03-24 10:26:59 UTC (rev 61837) @@ -197,20 +197,22 @@ </div> </fieldset> {/tab} + {tab name="{tr}Remote Tiki Autologin{/tr}"} <br> <fieldset> - {preference name=login_autologin} - {preference name=login_autologin_user} - {preference name=login_autologin_group} - {preference name=login_autologin_createnew} - {preference name=login_autologin_allowedgroups} - {preference name=login_autologin_syncgroups} - {preference name=login_autologin_logoutremote} - {preference name=login_autologin_redirectlogin} - {preference name=login_autologin_redirectlogin_url} + {preference name=login_autologin} + {preference name=login_autologin_user} + {preference name=login_autologin_group} + {preference name=login_autologin_createnew} + {preference name=login_autologin_allowedgroups} + {preference name=login_autologin_syncgroups} + {preference name=login_autologin_logoutremote} + {preference name=login_autologin_redirectlogin} + {preference name=login_autologin_redirectlogin_url} </fieldset> {/tab} + {tab name="{tr}LDAP{/tr}"} <br> <fieldset> @@ -254,6 +256,7 @@ {preference name=auth_ldap_adminpass} </fieldset> {/tab} + {tab name="{tr}LDAP external groups{/tr}"} <br> <fieldset> @@ -304,6 +307,7 @@ {preference name=auth_ldap_group_adminpass} </fieldset> {/tab} + {tab name="{tr}PAM{/tr}"} <br> <fieldset> @@ -318,6 +322,7 @@ {preference name=pam_service} </fieldset> {/tab} + {tab name="{tr}Shibboleth{/tr}"} <br> <fieldset> @@ -422,6 +427,7 @@ </fieldset> </fieldset> {/tab} + {tab name="{tr}phpBB{/tr}"} <br> <fieldset> @@ -450,6 +456,7 @@ {preference name=auth_phpbb_table_prefix} </fieldset> {/tab} + {tab name="{tr}Web Server{/tr}"} <br> <fieldset> @@ -463,15 +470,15 @@ </fieldset> {/tab} - <input type="submit" class="btn btn-primary btn-sm tips" title=":{tr}Apply changes{/tr}" value="{tr}Apply{/tr}" /> + <input type="submit" class="btn btn-primary btn-sm tips" title=":{tr}Apply changes{/tr}" value="{tr}Apply{/tr}" /> </form> -{tab name="{tr}Password Blacklist{/tr}"} -<br> + + {tab name="{tr}Password Blacklist{/tr}"} + <br> <fieldset> - <fieldset> - <legend>{tr}Password{/tr}</legend> + <legend>{tr}Password{/tr}</legend> - {preference name=pass_blacklist_file} + {preference name=pass_blacklist_file} <legend>{tr}Password Blacklist Tools{/tr}</legend> @@ -486,7 +493,7 @@ Tiki's defaut password blacklist files were generated from Missler's top 1 million password file.</p> <form action="tiki-admin.php?page=login" class="admin form-horizontal" method="post" name="PassForm" enctype="multipart/form-data"> - <input type="hidden" name="password_blacklist" /> + <input type="hidden" name="password_blacklist" /> <input type="file" name="passwordlist" accept="text/plain" /> Use 'LOAD DATA INFILE': <input type="checkbox" name="loaddata" /> {help desc="Allows much larger files to be uploaded, but requires MySQL on localhost with extra permissions."}<br> <input type="submit" value="Create or Replace Word Index" name="uploadIndex" class="btn btn-primary btn-sm" /> @@ -493,28 +500,28 @@ {help desc="Text files with one word per line accepted. The word list will be converted to all lowe case. Duplicate entries will be removed. Typically passwords lists should be arranged with the most commonly used passwords first."}<br> - <input type="submit" value="Delete Temporary Index" name="deleteIndex" class="btn btn-primary btn-sm" /> + <input type="submit" value="Delete Temporary Index" name="deleteIndex" class="btn btn-primary btn-sm" /> {help desc="It is recomended that you delete indexed passwords from your database after your done generating your password lists. They can take up quite a lot of space and serve no pourpose after processing is complete."} - <p>Blaklist Currently Using: {$file_using}</p> - {if $num_indexed} - <h3>Generate and Save a Password Blacklist</h3> - Assuming your word list was arranged in order of most commonly used, the 'Limit' field will provide you with that many of the most commonly used passwords. - The other fields default to the password standards set in tiki. You should not have to change these, unless you plan on changing your password - requirements in the future. Saving places a text file with the generated passwords in your password blacklist folder and enables it as an option for use. - Number of passwords (limit): <input type="number" name="limit" value="{$limit}" /> - {help desc="Typical usage ranges between 1,000 & 10,000, although many more could be used. Twitter blacklists 396."}<br> - Minmum Password Length: <input type="number" name="length" value="{$length}" /> - {help desc="The minimum password length for your password. This will filter out any password that has an illegal length."}<br> - Require Numbers & Letters: <input type="checkbox" name="charnum" {if $charnum}checked{/if} /> - {help desc="If checked, will filter out any password that does not have both upper and lower case letters."}<br> - Require Special Characters: <input type="checkbox" name="special" {if $special}checked{/if} /> - {help desc="If checked, will filter out any passwords that do not have special characters."}<br> - <input type="submit" value="Save & Set as Default" name="saveblacklist" class="btn btn-primary btn-sm" /> - <input type="submit" value="View Password List" name="viewblacklist" class="btn btn-primary btn-sm" formtarget="_blank" /> - {/if} - </form> + <p>Blacklist Currently Using: {$file_using}</p> + {if $num_indexed} + <h3>Generate and Save a Password Blacklist</h3> + Assuming your word list was arranged in order of most commonly used, the 'Limit' field will provide you with that many of the most commonly used passwords. + The other fields default to the password standards set in tiki. You should not have to change these, unless you plan on changing your password + requirements in the future. Saving places a text file with the generated passwords in your password blacklist folder and enables it as an option for use. + Number of passwords (limit): <input type="number" name="limit" value="{$limit}" /> + {help desc="Typical usage ranges between 1,000 & 10,000, although many more could be used. Twitter blacklists 396."}<br> + Minmum Password Length: <input type="number" name="length" value="{$length}" /> + {help desc="The minimum password length for your password. This will filter out any password that has an illegal length."}<br> + Require Numbers & Letters: <input type="checkbox" name="charnum" {if $charnum}checked{/if} /> + {help desc="If checked, will filter out any password that does not have both upper and lower case letters."}<br> + Require Special Characters: <input type="checkbox" name="special" {if $special}checked{/if} /> + {help desc="If checked, will filter out any passwords that do not have special characters."}<br> + <input type="submit" value="Save & Set as Default" name="saveblacklist" class="btn btn-primary btn-sm" /> + <input type="submit" value="View Password List" name="viewblacklist" class="btn btn-primary btn-sm" formtarget="_blank" /> + {/if} + </form> </div> </fieldset> {/tab} Modified: trunk/templates/admin/include_look.tpl =================================================================== --- trunk/templates/admin/include_look.tpl 2017-03-23 20:25:37 UTC (rev 61836) +++ trunk/templates/admin/include_look.tpl 2017-03-24 10:26:59 UTC (rev 61837) @@ -218,7 +218,7 @@ <div class="adminoptionboxchild" id="feature_tabs_childcontainer"> {preference name=layout_tabs_optional} </div> - {preference name=site_favicon_enable} + {preference name=site_favicon_enable} {preference name=image_responsive_class} <div class="adminoptionbox"> <fieldset class="table"> Modified: trunk/templates/admin/include_print.tpl =================================================================== --- trunk/templates/admin/include_print.tpl 2017-03-23 20:25:37 UTC (rev 61836) +++ trunk/templates/admin/include_print.tpl 2017-03-24 10:26:59 UTC (rev 61837) @@ -2,60 +2,59 @@ <form class="form-horizontal" action="tiki-admin.php?page=print" class="admin" method="post"> {include file='access/include_ticket.tpl'} <input type="hidden" name="new_prefs" /> - <fieldset> - <legend>{tr}PDF Settings{/tr}</legend> - {preference name=print_pdf_from_url} - <div class="adminoptionboxchild print_pdf_from_url_childcontainer webkit"> - {preference name=print_pdf_webkit_path} - </div> - <div class="adminoptionboxchild print_pdf_from_url_childcontainer weasyprint"> - {preference name=print_pdf_weasyprint_path} - </div> - <div class="adminoptionboxchild print_pdf_from_url_childcontainer webservice"> - {preference name=print_pdf_webservice_url} - </div> - <div class="adminoptionboxchild print_pdf_from_url_childcontainer mpdf"> - {preference name=print_pdf_mpdf_path} - {preference name=print_pdf_mpdf_printfriendly} - {preference name=print_pdf_mpdf_orientation} - {preference name=print_pdf_mpdf_size} - {preference name=print_pdf_mpdf_header} - {preference name=print_pdf_mpdf_footer} - {preference name=print_pdf_mpdf_margin_left} - {preference name=print_pdf_mpdf_margin_right} - {preference name=print_pdf_mpdf_margin_top} - {preference name=print_pdf_mpdf_margin_bottom} - {preference name=print_pdf_mpdf_margin_header} - {preference name=print_pdf_mpdf_margin_footer} - <input style="display:none">{* This seems to be required for the Chromium browser to prevent autofill the password with some password stored in the user's browser *} - <input type="password" style="display:none" name="print_pdf_mpdf_password_autocomplete_off">{* This seems to be required for the Chromium browser to prevent autofill password with some password stored in the user's browser *} - {preference name=print_pdf_mpdf_password} - </div> - - </fieldset> - - <fieldset> - <legend>{tr}Wiki Print Version{/tr}</legend> - {preference name=print_wiki_authors} - {preference name=feature_wiki_print} - <div class="adminoptionboxchild" id="feature_wiki_print_childcontainer"> - {preference name=feature_wiki_multiprint} - </div> - {preference name=feature_print_indexed} - {preference name=print_original_url_wiki} - </fieldset> - - <fieldset> - <legend>{tr}Articles{/tr}</legend> - {preference name=feature_cms_print} - </fieldset> - - <fieldset> - <legend>{tr}Miscellaneous Settings{/tr}</legend> - {preference name=print_original_url_tracker} - {preference name=print_original_url_forum} - - </fieldset> + <fieldset> + <legend>{tr}PDF Settings{/tr}</legend> + {preference name=print_pdf_from_url} + <div class="adminoptionboxchild print_pdf_from_url_childcontainer webkit"> + {preference name=print_pdf_webkit_path} + </div> + <div class="adminoptionboxchild print_pdf_from_url_childcontainer weasyprint"> + {preference name=print_pdf_weasyprint_path} + </div> + <div class="adminoptionboxchild print_pdf_from_url_childcontainer webservice"> + {preference name=print_pdf_webservice_url} + </div> + <div class="adminoptionboxchild print_pdf_from_url_childcontainer mpdf"> + {preference name=print_pdf_mpdf_path} + {preference name=print_pdf_mpdf_printfriendly} + {preference name=print_pdf_mpdf_orientation} + {preference name=print_pdf_mpdf_size} + {preference name=print_pdf_mpdf_header} + {preference name=print_pdf_mpdf_footer} + {preference name=print_pdf_mpdf_margin_left} + {preference name=print_pdf_mpdf_margin_right} + {preference name=print_pdf_mpdf_margin_top} + {preference name=print_pdf_mpdf_margin_bottom} + {preference name=print_pdf_mpdf_margin_header} + {preference name=print_pdf_mpdf_margin_footer} + <input style="display:none">{* This seems to be required for the Chromium browser to prevent autofill the password with some password stored in the user's browser *} + <input type="password" style="display:none" name="print_pdf_mpdf_password_autocomplete_off">{* This seems to be required for the Chromium browser to prevent autofill password with some password stored in the user's browser *} + {preference name=print_pdf_mpdf_password} + </div> + </fieldset> + + <fieldset> + <legend>{tr}Wiki Print Version{/tr}</legend> + {preference name=print_wiki_authors} + {preference name=feature_wiki_print} + <div class="adminoptionboxchild" id="feature_wiki_print_childcontainer"> + {preference name=feature_wiki_multiprint} + </div> + {preference name=feature_print_indexed} + {preference name=print_original_url_wiki} + </fieldset> + + <fieldset> + <legend>{tr}Articles{/tr}</legend> + {preference name=feature_cms_print} + </fieldset> + + <fieldset> + <legend>{tr}Miscellaneous Settings{/tr}</legend> + {preference name=print_original_url_tracker} + {preference name=print_original_url_forum} + + </fieldset> <div class="t_navbar margin-bottom-md text-center"> <input type="submit" class="btn btn-primary btn-sm tips" title=":{tr}Apply Changes{/tr}" value="{tr}Apply{/tr}" /> </div> Modified: trunk/templates/admin/include_search.tpl =================================================================== --- trunk/templates/admin/include_search.tpl 2017-03-23 20:25:37 UTC (rev 61836) +++ trunk/templates/admin/include_search.tpl 2017-03-24 10:26:59 UTC (rev 61837) @@ -137,7 +137,7 @@ {/remarksbox} </div> </div> - {preference name=search_index_outdated} + {preference name=search_index_outdated} </fieldset> <fieldset> Modified: trunk/templates/admin/include_wiki.tpl =================================================================== --- trunk/templates/admin/include_wiki.tpl 2017-03-23 20:25:37 UTC (rev 61836) +++ trunk/templates/admin/include_wiki.tpl 2017-03-24 10:26:59 UTC (rev 61837) @@ -50,7 +50,6 @@ {preference name=wiki_authors_style label="{tr}List authors{/tr}"} <div class="adminoptionbox wiki_authors_style_childcontainer classic business collaborative lastmodif"> {preference name=wiki_authors_style_by_page label="{tr}Allow override per page{/tr}"} - </div> {preference name=feature_wiki_show_hide_before} {preference name=wiki_actions_bar} Modified: trunk/templates/browse_file_gallery.tpl =================================================================== --- trunk/templates/browse_file_gallery.tpl 2017-03-23 20:25:37 UTC (rev 61836) +++ trunk/templates/browse_file_gallery.tpl 2017-03-24 10:26:59 UTC (rev 61837) @@ -294,9 +294,9 @@ {/if} </div> {* thumbinfos *} {/if} - {if $view neq 'page'} - {$smarty.capture.thumbactions} - {/if} + {if $view neq 'page'} + {$smarty.capture.thumbactions} + {/if} </div> {* thumbnail *} {* property table in page file view *} {if $view eq 'page'} @@ -310,10 +310,10 @@ {if isset($metarray) and $metarray|count gt 0} <br> <div class="text-left"> - {remarksbox type="tip" title="{tr}Metadata{/tr}"} - {include file='metadata/meta_view_tabs.tpl'} - {/remarksbox} - </div> + {remarksbox type="tip" title="{tr}Metadata{/tr}"} + {include file='metadata/meta_view_tabs.tpl'} + {/remarksbox} + </div> {/if} {/if} </div> {* thumbnailcontener *} Modified: trunk/templates/canonical.tpl =================================================================== --- trunk/templates/canonical.tpl 2017-03-23 20:25:37 UTC (rev 61836) +++ trunk/templates/canonical.tpl 2017-03-24 10:26:59 UTC (rev 61837) @@ -3,8 +3,8 @@ {if $mid eq 'tiki-show_page.tpl' or $mid eq 'tiki-index_p.tpl' or $mid eq 'tiki-show_page_raw.tpl' or $mid eq 'tiki-all_languages.tpl' or $mid eq 'tiki-show_content.tpl'} <link rel="canonical" href="{$base_url_canonical}{$page|sefurl}{if not empty($canonical_ending)}{$canonical_ending}{/if}"> <meta content="{$base_url_canonical}{$page|sefurl}{if not empty($canonical_ending)}{$canonical_ending}{/if}" property="og:url"> - {elseif $mid eq 'extends:layouts/internal/layout_view.tpl|tiki-show_page.tpl'} - <link rel="canonical" href="{$base_url_canonical}{$page|sefurl}{if not empty($canonical_ending)}{$canonical_ending}{/if}"> + {elseif $mid eq 'extends:layouts/internal/layout_view.tpl|tiki-show_page.tpl'} + <link rel="canonical" href="{$base_url_canonical}{$page|sefurl}{if not empty($canonical_ending)}{$canonical_ending}{/if}"> <meta content="{$base_url_canonical}{$page|sefurl}{if not empty($canonical_ending)}{$canonical_ending}{/if}" property="og:url"> {elseif $mid eq 'tiki-view_tracker_item.tpl'} <link rel="canonical" href="{$base_url_canonical}{$itemId|sefurl:trackeritem}"> @@ -17,7 +17,7 @@ <meta content="{$base_url_canonical}{$comments_parentId|sefurl:forumthread}" property="og:url"> {elseif $mid eq 'tiki-print_forum_thread.tpl'} <link rel="canonical" href="{$base_url_canonical}{$comments_parentId|sefurl:forumthread}"> - <meta content="{$base_url_canonical}{$comments_parentId|sefurl:forumthread}" property="og:url"> + <meta content="{$base_url_canonical}{$comments_parentId|sefurl:forumthread}" property="og:url"> {elseif $mid eq 'tiki-view_blog.tpl'} <link rel="canonical" href="{$base_url_canonical}{$blogId|sefurl:blog}"> <meta content="{$base_url_canonical}{$blogId|sefurl:blog}" property="og:url"> Modified: trunk/templates/file/uploader.tpl =================================================================== --- trunk/templates/file/uploader.tpl 2017-03-23 20:25:37 UTC (rev 61836) +++ trunk/templates/file/uploader.tpl 2017-03-24 10:26:59 UTC (rev 61837) @@ -8,12 +8,12 @@ {if $uploadInModal} <form class="file-uploader" enctype="multipart/form-data" method="post" action="{service controller=file action=upload galleryId=$galleryId image_max_size_x=$image_max_size_x image_max_size_y=$image_max_size_y}" data-gallery-id="{$galleryId|escape}" data-image_max_size_x="{$image_max_size_x|escape}" data-image_max_size_y="{$image_max_size_y|escape}"> - <div class="progress hidden"> + <div class="progress hidden"> <div class="progress-bar progress-bar-striped active" role="progressbar" aria-valuenow="0" aria-valuemin="0" aria-valuemax="100" style="width: 0%;"> <span class="sr-only"><span class="count">0</span>% Complete</span> </div> </div> - {if $image_max_size_x || $image_max_size_y }{remarksbox type="note" title="{tr}Note{/tr}"}{tr}Images will be resized to {if $image_max_size_x} {$image_max_size_x}px in width{/if}{if $image_max_size_y} and {$image_max_size_y}px in height{/if} {/tr}{/remarksbox}{else}{remarksbox type="note" title="{tr}Note{/tr}"}{tr}Images will not be resized, for resizing edit this tracker field and set image max width and height in "Options for files" section.{/tr}{/remarksbox}{/if} + {if $image_max_size_x || $image_max_size_y }{remarksbox type="note" title="{tr}Note{/tr}"}{tr}Images will be resized to {if $image_max_size_x} {$image_max_size_x}px in width{/if}{if $image_max_size_y} and {$image_max_size_y}px in height{/if} {/tr}{/remarksbox}{else}{remarksbox type="note" title="{tr}Note{/tr}"}{tr}Images will not be resized, for resizing edit this tracker field and set image max width and height in "Options for files" section.{/tr}{/remarksbox}{/if} <input type="file" name="file[]" {if $limit !== 1}multiple{/if} {if $typeFilter}accept="{$typeFilter|escape}"{/if} /> <p class="drop-message text-center"> @@ -37,9 +37,9 @@ <span class="sr-only"><span class="count">0</span>% Complete</span> </div> </div> - {if $image_max_size_x || $image_max_size_y }{remarksbox type="note" title="{tr}Note{/tr}"}{tr}Images will be resized to {if $image_max_size_x} {$image_max_size_x}px in width{/if}{if $image_max_size_y} and {$image_max_size_y}px in height{/if} {/tr}{/remarksbox}{else}{remarksbox type="note" title="{tr}Note{/tr}"}{tr}Images will not be resized, for resizing edit this tracker field and set image max width and height in "Options for files" section.{/tr}{/remarksbox}{/if} + {if $image_max_size_x || $image_max_size_y }{remarksbox type="note" title="{tr}Note{/tr}"}{tr}Images will be resized to {if $image_max_size_x} {$image_max_size_x}px in width{/if}{if $image_max_size_y} and {$image_max_size_y}px in height{/if} {/tr}{/remarksbox}{else}{remarksbox type="note" title="{tr}Note{/tr}"}{tr}Images will not be resized, for resizing edit this tracker field and set image max width and height in "Options for files" section.{/tr}{/remarksbox}{/if} <input type="file" name="file[]" {if $limit !== 1}multiple{/if} {if $typeFilter}accept="{$typeFilter|escape}"{/if} /> - + <p class="drop-message text-center"> {if $limit !== 1}{tr}Or drop files here from your file manager.{/tr}{else}{tr}Or drop file here from your file manager.{/tr}{/if} </p> Modified: trunk/templates/layouts/layout_plain.tpl =================================================================== --- trunk/templates/layouts/layout_plain.tpl 2017-03-23 20:25:37 UTC (rev 61836) +++ trunk/templates/layouts/layout_plain.tpl 2017-03-24 10:26:59 UTC (rev 61837) @@ -6,7 +6,7 @@ </head> <body{html_body_attributes}> {$cookie_consent_html} - + {include file="layout_fullscreen_check.tpl"} {if $prefs.feature_ajax eq 'y'} Modified: trunk/templates/managestream/record.tpl =================================================================== --- trunk/templates/managestream/record.tpl 2017-03-23 20:25:37 UTC (rev 61836) +++ trunk/templates/managestream/record.tpl 2017-03-24 10:26:59 UTC (rev 61837) @@ -64,13 +64,13 @@ <input type="submit" class="btn btn-primary" value="{tr}Save{/tr}"/> </div> </form> - {jq} - $("#notification_checkbox").change(function(){ - if (this.checked){ - $(".priority-div").removeClass("hidden"); - }else{ - $(".priority-div").addClass("hidden"); - } - }); - {/jq} + {jq} + $("#notification_checkbox").change(function(){ + if (this.checked){ + $(".priority-div").removeClass("hidden"); + }else{ + $(".priority-div").addClass("hidden"); + } + }); + {/jq} {/block} Modified: trunk/templates/managestream/sample.tpl =================================================================== --- trunk/templates/managestream/sample.tpl 2017-03-23 20:25:37 UTC (rev 61836) +++ trunk/templates/managestream/sample.tpl 2017-03-24 10:26:59 UTC (rev 61837) @@ -67,6 +67,6 @@ $('#sample').html(data); } }); - }); + }); {/jq} -{/block} \ No newline at end of file +{/block} Modified: trunk/templates/messu-archive.tpl =================================================================== --- trunk/templates/messu-archive.tpl 2017-03-23 20:25:37 UTC (rev 61836) +++ trunk/templates/messu-archive.tpl 2017-03-24 10:26:59 UTC (rev 61837) @@ -45,7 +45,7 @@ <form action="messu-archive.php" method="post" name="form_messu_archive"> - <div class="form-group"> + <div class="form-group"> <input type="hidden" name="offset" value="{$offset|escape}"> <input type="hidden" name="find" value="{$find|escape}"> <input type="hidden" name="sort_mode" value="{$sort_mode|escape}"> @@ -54,7 +54,7 @@ <input type="hidden" name="priority" value="{$priority|escape}"> <input type="submit" class="btn btn-warning btn-sm" name="delete" value="{tr}Delete{/tr}"> <input type="submit" class="btn btn-default btn-sm" name="download" value="{tr}Download{/tr}"> - </div> + </div> {jq notonready=true} var CHECKBOX_LIST = [{{section name=user loop=$items}'msg[{$items[user].msgId}]'{if not $smarty.section.user.last},{/if}{/section}}]; {/jq} Modified: trunk/templates/messu-read_sent.tpl =================================================================== --- trunk/templates/messu-read_sent.tpl 2017-03-23 20:25:37 UTC (rev 61836) +++ trunk/templates/messu-read_sent.tpl 2017-03-24 10:26:59 UTC (rev 61837) @@ -4,7 +4,7 @@ <div class="row"><div class="col-xs-12">{include file='messu-nav.tpl'}</div></div> <br> {if $legend} -{$legend} + {$legend} {else} <div class="row" style="padding-bottom:10px;"> <div class="col-xs-4 col-sm-5"> @@ -32,42 +32,42 @@ </div> </div> </div> - <div class="col-xs-3 col-xs-offset-4 col-md-2 col-md-offset-5" style="padding-top: 4px;"> - <form method="post" action="messu-read_sent.php"> - <input type="hidden" name="offset" value="{$offset|escape}"> - <input type="hidden" name="find" value="{$find|escape}"> - <input type="hidden" name="sort_mode" value="{$sort_mode|escape}"> - <input type="hidden" name="flag" value="{$flag|escape}"> - <input type="hidden" name="flagval" value="{$flagval|escape}"> - <input type="hidden" name="priority" value="{$priority|escape}"> - <input type="hidden" name="msgdel" value="{$msgId|escape}"> - {if $next} - <input type="hidden" name="msgId" value="{$next|escape}"> - {elseif $prev} - <input type="hidden" name="msgId" value="{$prev|escape}"> - {else} - <input type="hidden" name="msgId" value=""> - {/if} - <input type="submit" class="btn btn-default btn-sm pull-right" name="delete" value="{tr}Delete{/tr}"> - </form> - </div> + <div class="col-xs-3 col-xs-offset-4 col-md-2 col-md-offset-5" style="padding-top: 4px;"> + <form method="post" action="messu-read_sent.php"> + <input type="hidden" name="offset" value="{$offset|escape}"> + <input type="hidden" name="find" value="{$find|escape}"> + <input type="hidden" name="sort_mode" value="{$sort_mode|escape}"> + <input type="hidden" name="flag" value="{$flag|escape}"> + <input type="hidden" name="flagval" value="{$flagval|escape}"> + <input type="hidden" name="priority" value="{$priority|escape}"> + <input type="hidden" name="msgdel" value="{$msgId|escape}"> + {if $next} + <input type="hidden" name="msgId" value="{$next|escape}"> + {elseif $prev} + <input type="hidden" name="msgId" value="{$prev|escape}"> + {else} + <input type="hidden" name="msgId" value=""> + {/if} + <input type="submit" class="btn btn-default btn-sm pull-right" name="delete" value="{tr}Delete{/tr}"> + </form> + </div> </div> <div class="row"> - <div class="col-xs-12"> - <div class="messureadhead"> - <table> - <tr><td style="font-weight:bold;">{tr}From:{/tr}</td><td>{$msg.user_from|escape}</td></tr> - <tr><td style="font-weight:bold;">{tr}To:{/tr}</td><td>{$msg.user_to|escape}</td></tr> - <tr><td style="font-weight:bold;">{tr}Cc:{/tr}</td><td>{$msg.user_cc|escape}</td></tr> - <tr><td style="font-weight:bold;">{tr}Subject:{/tr}</td><td>{$msg.subject|escape}</td></tr> - <tr><td style="font-weight:bold;">{tr}Date:{/tr}</td><td>{$msg.date|tiki_short_datetime}</td></tr><!--date_format:"%a %b %Y [%H:%I]"--> - </table> - </div> - </div> - <div class="col-xs-12"> - <div class="messureadbody"> - {$msg.parsed} - </div> - </div> + <div class="col-xs-12"> + <div class="messureadhead"> + <table> + <tr><td style="font-weight:bold;">{tr}From:{/tr}</td><td>{$msg.user_from|escape}</td></tr> + <tr><td style="font-weight:bold;">{tr}To:{/tr}</td><td>{$msg.user_to|escape}</td></tr> + <tr><td style="font-weight:bold;">{tr}Cc:{/tr}</td><td>{$msg.user_cc|escape}</td></tr> + <tr><td style="font-weight:bold;">{tr}Subject:{/tr}</td><td>{$msg.subject|escape}</td></tr> + <tr><td style="font-weight:bold;">{tr}Date:{/tr}</td><td>{$msg.date|tiki_short_datetime}</td></tr><!--date_format:"%a %b %Y [%H:%I]"--> + </table> + </div> + </div> + <div class="col-xs-12"> + <div class="messureadbody"> + {$msg.parsed} + </div> + </div> </div> {/if} Modified: trunk/templates/module.tpl =================================================================== --- trunk/templates/module.tpl 2017-03-23 20:25:37 UTC (rev 61836) +++ trunk/templates/module.tpl 2017-03-24 10:26:59 UTC (rev 61837) @@ -3,90 +3,92 @@ {if !isset($module_position)}{assign var=module_position value=''}{/if} {if !isset($module_ord)}{assign var=module_ord value=''}{/if} {capture name=name}{$module_name|replace:"+":"_"|cat:$module_position|cat:$module_ord|escape}{/capture} -{if !empty($module_params.topclass)} -<div class="{$module_params.topclass}">{/if} - {if $module_nobox neq 'y'} - {if !isset($moduleId)}{assign var=moduleId value=' '}{/if} - <div id="module_{$moduleId}" - class="panel panel-default box-{$module_name}{if $module_type eq 'cssmenu'} cssmenubox{/if} module"{if !empty($tpl_module_style)} style="{$tpl_module_style}"{/if}> - {if $module_decorations ne 'n'} - <div class="panel-heading"> - {if ($module_notitle ne 'y' && !empty($module_title)) || ($module_flip eq 'y' and $prefs.javascript_enabled ne 'n') || $prefs.menus_items_icons eq 'y'} - <h3 class="panel-title clearfix" {if !empty($module_params.bgcolor)} style="background-color:{$module_params.bgcolor};"{/if}> - {if $module_notitle ne 'y' && !empty($module_title)} - <span class="moduletitle">{$module_title}</span> - {/if} - {if $module_flip eq 'y' and $prefs.javascript_enabled ne 'n'} - <span class="moduleflip" id="moduleflip-{$smarty.capture.name}"> - <a title="{tr}Toggle module contents{/tr}" class="flipmodtitle close" - href="javascript:icntoggle('mod-{$smarty.capture.name}','module.png');"> - {icon id="icnmod-"|cat:$smarty.capture.name class="flipmodimage" name="bars" alt="[{tr}Toggle{/tr}]"} - </a> - </span> - {/if} - </h3> - {/if} - </div> - {elseif $module_notitle ne 'y'}{* means when module decorations are set to 'n' don't render the panel-heading wrapper as above *} - {if $module_flip eq 'y' and $prefs.javascript_enabled ne 'n'} - <h3 class="panel-title" - ondblclick="javascript:icntoggle('mod-{$smarty.capture.name}','module.png');"{if !empty($module_params.color)} style="color:{$module_params.color};"{/if}> - {else} - <h3 class="panel-title"{if !empty($module_params.color)} style="color:{$module_params.color};"{/if}> - {/if} - {$module_title} - {if $module_flip eq 'y' and $prefs.javascript_enabled ne 'n'} - <span class="moduleflip" id="moduleflip-{$smarty.capture.name}"> - <a title="{tr}Toggle module contents{/tr}" class="flipmodtitle" - href="javascript:icntoggle('mod-{$smarty.capture.name}','module.png');"> - {icon id="icnmod-"|cat:$smarty.capture.name class="flipmodimage" name="module" alt="[{tr}Toggle{/tr}]"} - </a> - </span> - {/if} - </h3> - {/if} - <div id="mod-{$smarty.capture.name}" - style="display: {if !isset($module_display) or $module_display}block{else}none{/if};{$module_params.style}" - class="clearfix panel-body{if !empty($module_params.class)} {$module_params.class}{/if}"> - {else}{* $module_nobox eq 'y' *} - <div id="module_{$moduleId}" style="{$module_params.style}{$tpl_module_style}" - class="module{if !empty($module_params.class)} {$module_params.class}{/if} box-{$module_name}"> - <div id="mod-{$smarty.capture.name}" class=""> - {/if} - {$module_content} - {if $module_error} - {remarksbox type="warning" title="{tr}Error{/tr}"} - {$module_error} - {/remarksbox} - {/if} - {if $module_nobox neq 'y'} - </div>{* close div id="mod-{$smarty.capture.name}" *} - {if $user and $prefs.user_assigned_modules == 'y' and $prefs.feature_modulecontrols eq 'y'} - <div class="panel-footer"> - <span class="modcontrols"> - <a class="tips" title=":{tr}Move module up{/tr}" - href="{$current_location|escape}{$mpchar|escape}mc_up={$module_name}"> - {icon name="up" alt="{tr}Up{/tr}"} - </a> - <a class="tips" title=":{tr}Move module down{/tr}" - href="{$current_location|escape}{$mpchar|escape}mc_down={$module_name}"> - {icon name="down" alt="{tr}Down{/tr}"} - </a> - <a class="tips" title=":{tr}Move module to opposite side{/tr}" - href="{$current_location|escape}{$mpchar|escape}mc_move={$module_name}"> - {icon name="move" alt="{tr}Move to opposite side{/tr}"} - </a> - <a class="tips" title=":{tr}Unassign this module{/tr}" - href="{$current_location|escape}{$mpchar|escape}mc_unassign={$module_name}" - onclick='return confirmTheLink(this,"{tr}Are you sure you want to unassign this module?{/tr}")'> - {icon name="remove" alt="{tr}Unassign{/tr}"} - </a> - </span> - </div> - {/if} - </div>{* close div id="module_{$moduleId}" *} - {else}{* $module_nobox eq 'y' *} - </div>{* close div id="mod-{$smarty.capture.name}" *} - </div>{* close div id="module_{$moduleId}" *} - {/if} - {if !empty($module_params.topclass)}</div>{/if} + +{if !empty($module_params.topclass)}<div class="{$module_params.topclass}">{/if} + +{if $module_nobox neq 'y'} +{if !isset($moduleId)}{assign var=moduleId value=' '}{/if} +<div id="module_{$moduleId}" + class="panel panel-default box-{$module_name}{if $module_type eq 'cssmenu'} cssmenubox{/if} module"{if !empty($tpl_module_style)} style="{$tpl_module_style}"{/if}> + {if $module_decorations ne 'n'} + <div class="panel-heading"> + {if ($module_notitle ne 'y' && !empty($module_title)) || ($module_flip eq 'y' and $prefs.javascript_enabled ne 'n') || $prefs.menus_items_icons eq 'y'} + <h3 class="panel-title clearfix" {if !empty($module_params.bgcolor)} style="background-color:{$module_params.bgcolor};"{/if}> + {if $module_notitle ne 'y' && !empty($module_title)} + <span class="moduletitle">{$module_title}</span> + {/if} + {if $module_flip eq 'y' and $prefs.javascript_enabled ne 'n'} + <span class="moduleflip" id="moduleflip-{$smarty.capture.name}"> + <a title="{tr}Toggle module contents{/tr}" class="flipmodtitle close" + href="javascript:icntoggle('mod-{$smarty.capture.name}','module.png');"> + {icon id="icnmod-"|cat:$smarty.capture.name class="flipmodimage" name="bars" alt="[{tr}Toggle{/tr}]"} + </a> + </span> + {/if} + </h3> + {/if} + </div> + {elseif $module_notitle ne 'y'}{* means when module decorations are set to 'n' don't render the panel-heading wrapper as above *} + {if $module_flip eq 'y' and $prefs.javascript_enabled ne 'n'} + <h3 class="panel-title" + ondblclick="javascript:icntoggle('mod-{$smarty.capture.name}','module.png');"{if !empty($module_params.color)} style="color:{$module_params.color};"{/if}> + {else} + <h3 class="panel-title"{if !empty($module_params.color)} style="color:{$module_params.color};"{/if}> + {/if} + {$module_title} + {if $module_flip eq 'y' and $prefs.javascript_enabled ne 'n'} + <span class="moduleflip" id="moduleflip-{$smarty.capture.name}"> + <a title="{tr}Toggle module contents{/tr}" class="flipmodtitle" + href="javascript:icntoggle('mod-{$smarty.capture.name}','module.png');"> + {icon id="icnmod-"|cat:$smarty.capture.name class="flipmodimage" name="module" alt="[{tr}Toggle{/tr}]"} + </a> + </span> + {/if} + </h3> + {/if} + <div id="mod-{$smarty.capture.name}" + style="display: {if !isset($module_display) or $module_display}block{else}none{/if};{$module_params.style}" + class="clearfix panel-body{if !empty($module_params.class)} {$module_params.class}{/if}"> + {else}{* $module_nobox eq 'y' *} + <div id="module_{$moduleId}" style="{$module_params.style}{$tpl_module_style}" + class="module{if !empty($module_params.class)} {$module_params.class}{/if} box-{$module_name}"> + <div id="mod-{$smarty.capture.name}" class=""> + {/if}{* close $module_nobox *} + {$module_content} + {if $module_error} + {remarksbox type="warning" title="{tr}Error{/tr}"} + {$module_error} + {/remarksbox} + {/if} + {if $module_nobox neq 'y'} + </div>{* close div id="mod-{$smarty.capture.name}" *} + {if $user and $prefs.user_assigned_modules == 'y' and $prefs.feature_modulecontrols eq 'y'} + <div class="panel-footer"> + <span class="modcontrols"> + <a class="tips" title=":{tr}Move module up{/tr}" + href="{$current_location|escape}{$mpchar|escape}mc_up={$module_name}"> + {icon name="up" alt="{tr}Up{/tr}"} + </a> + <a class="tips" title=":{tr}Move module down{/tr}" + href="{$current_location|escape}{$mpchar|escape}mc_down={$module_name}"> + {icon name="down" alt="{tr}Down{/tr}"} + </a> + <a class="tips" title=":{tr}Move module to opposite side{/tr}" + href="{$current_location|escape}{$mpchar|escape}mc_move={$module_name}"> + {icon name="move" alt="{tr}Move to opposite side{/tr}"} + </a> + <a class="tips" title=":{tr}Unassign this module{/tr}" + href="{$current_location|escape}{$mpchar|escape}mc_unassign={$module_name}" + onclick='return confirmTheLink(this,"{tr}Are you sure you want to unassign this module?{/tr}")'> + {icon name="remove" alt="{tr}Unassign{/tr}"} + </a> + </span> + </div> + {/if} + </div>{* close div id="module_{$moduleId}" *} + {else}{* $module_nobox eq 'y' *} + </div>{* close div id="mod-{$smarty.capture.name}" *} +</div>{* close div id="module_{$moduleId}" *} +{/if}{* close $module_nobox *} + +{if !empty($module_params.topclass)}</div>{/if} Modified: trunk/templates/modules/mod-logo.tpl =================================================================== --- trunk/templates/modules/mod-logo.tpl 2017-03-23 20:25:37 UTC (rev 61836) +++ trunk/templates/modules/mod-logo.tpl 2017-03-24 10:26:59 UTC (rev 61837) @@ -3,7 +3,7 @@ {tikimodule error=$module_params.error title=$tpl_module_title name="logo" flip=$module_params.flip decorations=$module_params.decorations nobox=$module_params.nobox notitle=$module_params.notitle} {if $module_params.src} <div {if $module_params.bgcolor ne ''} style="background-color: {$module_params.bgcolor};" {/if} class="pull-left {$module_params.class_image|escape}"> - <a href="{$module_params.link}" title="{$module_params.title_attr|escape}"> + <a href="{$module_params.link}" title="{$module_params.title_attr|escape}"> <img src="{$module_params.src}" alt="{$module_params.alt_attr|escape}" style="max-width: 100%; height: auto"> </a> </div> @@ -11,15 +11,15 @@ {if !empty($module_params.sitetitle) or !empty($module_params.sitesubtitle)} <div class="pull-left {$module_params.class_titles|escape}"> {if !empty($module_params.sitetitle)} - <h1 class="sitetitle"> + <h1 class="sitetitle"> <a href="{$module_params.link}"> {tr}{$module_params.sitetitle|escape}{/tr} </a> - </h1> + </h1> {/if} - {if !empty($module_params.sitesubtitle)} - <h2 class="sitesubtitle">{tr}{$module_params.sitesubtitle|escape}{/tr}</h2> - {/if} + {if !empty($module_params.sitesubtitle)} + <h2 class="sitesubtitle">{tr}{$module_params.sitesubtitle|escape}{/tr}</h2> + {/if} </div> {/if} {/tikimodule} Modified: trunk/templates/modules/mod-minichat.tpl =================================================================== --- trunk/templates/modules/mod-minichat.tpl 2017-03-23 20:25:37 UTC (rev 61836) +++ trunk/templates/modules/mod-minichat.tpl 2017-03-24 10:26:59 UTC (rev 61837) @@ -1,8 +1,7 @@ {tikimodule error=$module_params.error title=$tpl_module_title name="minichat" flip=$module_params.flip decorations=$module_params.decorations nobox=$module_params.nobox notitle=$module_params.notitle} - <div id='minichatchans' class='btn-group minichatchans margin-bottom-xs'{if $module_params.nochannelbar && $module_params.nochannelbar != "n"} style="height: 0; visibility: hidden"{/if}></div> - + <div id='minichat' class='minichat well well-sm' style='overflow-x: hidden; overflow-y: auto; height: {$module_rows}em;'></div> <div class="minichatinputs"> Modified: trunk/templates/modules/mod-poweredby.tpl =================================================================== --- trunk/templates/modules/mod-poweredby.tpl 2017-03-23 20:25:37 UTC (rev 61836) +++ trunk/templates/modules/mod-poweredby.tpl 2017-03-24 10:26:59 UTC (rev 61837) @@ -5,9 +5,9 @@ {if !isset($module_params.tiki) or $module_params.tiki neq 'n'} {tr}Powered by{/tr} <a href="http://tiki.org" title="© 2002–{$smarty.now|date_format:"%Y"} {tr}The Tiki Community{/tr}">{tr}Tiki Wiki CMS Groupware{/tr} </a> {/if} - {if !isset($module_params.version) or $module_params.version neq 'n'} - v{$tiki_version} {if $tiki_uses_svn eq 'y'} (SVN){/if} "{$tiki_star}" - {/if} + {if !isset($module_params.version) or $module_params.version neq 'n'} + v{$tiki_version} {if $tiki_uses_svn eq 'y'} (SVN){/if} "{$tiki_star}" + {/if} {if !isset($module_params.credits) or $module_params.credits neq 'n'} <span id="credits"> | {include file='credits.tpl'} Modified: trunk/templates/social/list_friends.tpl =================================================================== --- trunk/templates/social/list_friends.tpl 2017-03-23 20:25:37 UTC (rev 61836) +++ trunk/templates/social/list_friends.tpl 2017-03-24 10:26:59 UTC (rev 61837) @@ -46,7 +46,7 @@ </ul> {/if} {if $showbutton eq 'y'} - <button class="add-friend btn btn-default"><i class="fa fa-user-plus"></i> {tr}Add Friend{/tr}</button> + <button class="add-friend btn btn-default"><i class="fa fa-user-plus"></i> {tr}Add Friend{/tr}</button> {/if} </div> {/block} Modified: trunk/templates/tiki-admin.tpl =================================================================== --- trunk/templates/tiki-admin.tpl 2017-03-23 20:25:37 UTC (rev 61836) +++ trunk/templates/tiki-admin.tpl 2017-03-24 10:26:59 UTC (rev 61837) @@ -32,7 +32,7 @@ {remarksbox type="error" title="{tr}Installer not locked{/tr}"} {tr} The installer allows a user to change or destroy the site's database through the browser so it is very important to keep it locked. {/tr} {tr}<br />You can re-run the installer (tiki-install.php), skip to the last step and select <strong>LOCK THE INSTALLER</strong>. Alternatively, you can simply <strong>add a lock file</strong> (file without any extension) in your db/ folder.{/tr} - + {/remarksbox} {/if} Modified: trunk/templates/tiki-admin_actionlog.tpl =================================================================== --- trunk/templates/tiki-admin_actionlog.tpl 2017-03-23 20:25:37 UTC (rev 61836) +++ trunk/templates/tiki-admin_actionlog.tpl 2017-03-24 10:26:59 UTC (rev 61837) @@ -4,832 +4,841 @@ {tabset name="admin_actionlog"} -{tab name="{tr}Report{/tr}"} -<h2>{tr}Report{/tr}</h2> -<form method="get" action="tiki-admin_actionlog.php#List" class="form-horizontal"> - <h2>{tr}Filter{/tr}</h2> - {if empty($nbViewedConfs)} - {button _text="{tr}Please select some actions to be reported.{/tr}" href="tiki-admin_actionlog.php?cookietab=2"} - {else} - <fieldset> - <legend>{tr}Date{/tr}</legend> - <div class="form-group"> - <label class="col-sm-2 control-label" for="">{tr}Start{/tr}</label> + {tab name="{tr}Report{/tr}"} + <h2>{tr}Report{/tr}</h2> + <form method="get" action="tiki-admin_actionlog.php#List" class="form-horizontal"> + <h2>{tr}Filter{/tr}</h2> + {if empty($nbViewedConfs)} + {button _text="{tr}Please select some actions to be reported.{/tr}" href="tiki-admin_actionlog.php?cookietab=2"} + {else} + <fieldset> + <legend>{tr}Date{/tr}</legend> + <div class="form-group"> + <label class="col-sm-2 control-label" for="">{tr}Start{/tr}</label> - <div class="col-sm-8"> - <div class=""> - {html_select_date time=$startDate prefix="startDate_" start_year="-10" field_order=$prefs.display_field_order} {html_select_time use_24_hours=true time=$startDate} - </div> - </div> - </div> - <div class="form-group"> - <label class="col-sm-2 control-label" for="">{tr}End{/tr}</label> + <div class="col-sm-8"> + <div class=""> + {html_select_date time=$startDate prefix="startDate_" start_year="-10" field_order=$prefs.display_field_order} {html_select_time use_24_hours=true time=$startDate} + </div> + </div> + </div> + <div class="form-group"> + <label class="col-sm-2 control-label" for="">{tr}End{/tr}</label> - <div class="col-sm-8"> - <div class=""> - {html_select_date time=$endDate prefix="endDate_" start_year="-10" field_order=$prefs.display_field_order} {html_select_time use_24_hours=true time=$endDate prefix="end_"} - </div> - </div> - </div> - </fieldset> - <fieldset> - <legend>{tr}Users and Groups{/tr}</legend> - {if $tiki_p_list_users eq 'y'} - <div class="form-group"> - <label class="col-sm-2 control-label" for="selectedUsers">{tr}User{/tr}</label> + <div class="col-sm-8"> + <div class=""> + {html_select_date time=$endDate prefix="endDate_" start_year="-10" field_order=$prefs.display_field_order} {html_select_time use_24_hours=true time=$endDate prefix="end_"} + </div> + </div> + </div> + </fieldset> + <fieldset> + <legend>{tr}Users and Groups{/tr}</legend> + {if $tiki_p_list_users eq 'y'} + <div class="form-group"> + <label class="col-sm-2 control-label" for="selectedUsers">{tr}User{/tr}</label> - <div class="col-sm-6"> - <select multiple="multiple" - size="{if $users|@count > 5}5{else}{math equation=x+y x=$users|@count y=2}{/if}" - name="selectedUsers[]" id="selectedUsers" class="form-control"> - <option value="">{tr}All{/tr}</option> - <option value="Anonymous">{tr}Anonymous{/tr}</option> - {foreach key=ix item=auser from=$users} - <option value="{$auser|escape}" - {if $selectedUsers[$ix] eq 'y'}selected="selected"{/if}>{$auser|username}</option> - {/foreach} - </select> - </div> - </div> - {else} - <input type="hidden" name="selectedUsers[]" value="{$auser|escape}"> - {/if} + <div class="col-sm-6"> + <select multiple="multiple" + size="{if $users|@count > 5}5{else}{math equation=x+y x=$users|@count y=2}{/if}" + name="selectedUsers[]" id="selectedUsers" class="form-control"> + <option value="">{tr}All{/tr}</option> + <option value="Anonymous">{tr}Anonymous{/tr}</option> + {foreach key=ix item=auser from=$users} + <option value="{$auser|escape}" + {if $selectedUsers[$ix] eq 'y'}selected="selected"{/if}>{$auser|username}</option> + {/foreach} + </select> + </div> + </div> + {else} + <input type="hidden" name="selectedUsers[]" value="{$auser|escape}"> + {/if} - {if $groups|@count >= 1} - <div class="form-group"> - <label class="col-sm-2 control-label" for="selectedGroups">{tr}Group{/tr}</label> + {if $groups|@count >= 1} + <div class="form-group"> + <label class="col-sm-2 control-label" for="selectedGroups">{tr}Group{/tr}</label> - <div class="col-sm-6"> - <select multiple="multiple" - size="{if $groups|@count > 5}5{else}{math equation=x+y x=$groups|@count y=1}{/if}" - name="selectedGroups[]" id="selectedGroups" class="form-control"> - <option value="">{tr}All{/tr}</option> - {foreach from=$groups key=ix item=group} - <option value="{$group|escape}" - {if $selectedGroups[$group] eq 'y'}selected="selected"{/if}>{$group|escape}</option> - {/foreach} - </select> - </div> - </div> - {/if} - </fieldset> - <fieldset> - <legend>{tr}Category{/tr}</legend> - <div class="form-group"> - <label class="col-sm-2 control-label" for="categId">{tr}Category{/tr}</label> + <div class="col-sm-6"> + <select multiple="multiple" + size="{if $groups|@count > 5}5{else}{math equation=x+y x=$groups|@count y=1}{/if}" + name="selectedGroups[]" id="selectedGroups" class="form-control"> + <option value="">{tr}All{/tr}</option> + {foreach from=$groups key=ix item=group} + <option value="{$group|escape}" + {if $selectedGroups[$group] eq 'y'}selected="selected"{/if}>{$group|escape}</option> + {/foreach} + </select> + </div> + </div> + {/if} + </fieldset> + <fieldset> + <legend>{tr}Category{/tr}</legend> + <div class="form-group"> + <label class="col-sm-2 control-label" for="categId">{tr}Category{/tr}</label> - <div class="col-sm-6"> - <select name="categId" id="categId" class="form-control"> - <option value="" {if $reportCateg eq '' or $reportCateg eq 0}selected="selected"{/if}> - * {tr}All{/tr} * - </option> - {foreach item=category from=$categories} - <option value="{$category.categId|escape}" - {if $reportCateg eq $category.name}selected="selected"{/if}>{$category.name|escape}</option> - {/foreach} - </select> - </div> - </div> - </fieldset> - <fieldset> - <legend>{tr}Misc.{/tr}</legend> + <div class="col-sm-6"> + <select name="categId" id="categId" class="form-control"> + <option value="" {if $reportCateg eq '' or $reportCateg eq 0}selected="selected"{/if}> + * {tr}All{/tr} * + </option> + {foreach item=category from=$categories} + <option value="{$category.categId|escape}" + {if $reportCateg eq $category.name}selected="selected"{/if}>{$category.name|escape}</option> + {/foreach} + </select> + </div> + </div> + </fieldset> + <fieldset> + <legend>{tr}Misc.{/tr}</legend> - <div class="col-sm-11 col-sm-offset-1 form-inline"> - <div class="form-group col-sm-10"> - <div class="col-sm-4"> - <label>{tr}Units{/tr}</label> - </div> - <div class="form-group col-sm-4 col-sm-offset-1"> - <label>{tr}bytes{/tr}</label> - <input class="radio" type="radio" name="unit" - value="bytes"{if $unit ne 'kb'} checked="checked"{/if}> - <label>{tr}kb{/tr}</label> - <input type="radio" name="unit" value="kb"{if $unit eq 'kb'} checked="checked"{/if}> - </div> - </div> - </div> + <div class="col-sm-11 col-sm-offset-1 form-inline"> + <div class="form-group col-sm-10"> + <div class="col-sm-4"> + <label>{tr}Units{/tr}</label> + </div> + <div class="form-group col-sm-4 col-sm-offset-1"> + <label>{tr}bytes{/tr}</label> + <input class="radio" type="radio" name="unit" + value="bytes"{if $unit ne 'kb'} checked="checked"{/if}> + <label>{tr}kb{/tr}</label> + <input type="radio" name="unit" value="kb"{if $unit eq 'kb'} checked="checked"{/if}> + </div> + </div> + </div> - <div class="col-sm-11 col-sm-offset-1 form-inline"> - <div class="form-group col-sm-10"> - <div class="col-sm-4"> - <label>{tr}Contribution Time{/tr}</label> - </div> - <div class="form-group col-sm-4 col-sm-offset-1"> - <label>{tr}Week{/tr}</label> - <input type="radio" name="contribTime" value="w"{if $contribT... [truncated message content] |
From: <jy...@us...> - 2017-04-01 01:04:32
|
Revision: 61985 http://sourceforge.net/p/tikiwiki/code/61985 Author: jyhem Date: 2017-04-01 01:04:28 +0000 (Sat, 01 Apr 2017) Log Message: ----------- Small indentation fixes. Tiki standardises on tab indenting Modified Paths: -------------- trunk/templates/admin/include_features.tpl trunk/templates/admin/include_fgal.tpl trunk/templates/admin/include_wiki.tpl trunk/templates/antibot.tpl trunk/templates/blog_post_actions.tpl trunk/templates/error_ticket.tpl trunk/templates/feedback/perm.tpl trunk/templates/fgal_listing_conf.tpl trunk/templates/file/uploader.tpl trunk/templates/language/write_to_language_php.tpl trunk/templates/layout_fullscreen_check.tpl trunk/templates/list_file_gallery.tpl trunk/templates/lists/article-search.tpl trunk/templates/managestream/sample.tpl trunk/templates/modules/mod-calendar_new.tpl trunk/templates/modules/mod-freetags_current.tpl trunk/templates/modules/mod-freetags_most_popular.tpl trunk/templates/modules/mod-last_podcasts.tpl trunk/templates/modules/mod-messages_unread_messages.tpl trunk/templates/modules/mod-quickadmin.tpl trunk/templates/modules/mod-search.tpl trunk/templates/modules/mod-svnup.tpl trunk/templates/multilike.tpl trunk/templates/permission_link.tpl trunk/templates/plugin/edit.tpl trunk/templates/tiki-admin_actionlog.tpl trunk/templates/tiki-admin_categories.tpl trunk/templates/tiki-admin_forums.tpl trunk/templates/tiki-admin_menu_options.tpl trunk/templates/tiki-admin_newsletters.tpl trunk/templates/tiki-admin_schedulers.tpl trunk/templates/tiki-admingroups.tpl trunk/templates/tiki-adminusers.tpl trunk/templates/tiki-browse_image.tpl trunk/templates/tiki-calendar_box.tpl trunk/templates/tiki-calendar_daymode.tpl trunk/templates/tiki-calendar_nav.tpl trunk/templates/tiki-calendar_weekmode.tpl trunk/templates/tiki-edit_article.tpl trunk/templates/tiki-edit_banner.tpl trunk/templates/tiki-galleries.tpl trunk/templates/tiki-list_file_gallery.tpl trunk/templates/tiki-plugins.tpl trunk/templates/tiki-quiz_edit.tpl trunk/templates/tiki-user_tasks_view.tpl trunk/templates/tiki-user_unified_details.tpl trunk/templates/tiki-user_watches.tpl trunk/templates/tiki-view_tracker.tpl trunk/templates/tracker/insert_item.tpl trunk/templates/trackerinput/numeric.tpl trunk/templates/trackerinput/text.tpl trunk/templates/trackeroutput/popup.tpl trunk/templates/wiki-plugins/wikiplugin_stat.tpl trunk/templates/wiki-plugins/wikiplugin_trackerlist.tpl trunk/templates/wizard/profiles_demo_highly_specialized_confs.tpl trunk/templates/wizard/upgrade_doc_page_iframe.tpl Modified: trunk/templates/admin/include_features.tpl =================================================================== --- trunk/templates/admin/include_features.tpl 2017-04-01 00:22:13 UTC (rev 61984) +++ trunk/templates/admin/include_features.tpl 2017-04-01 01:04:28 UTC (rev 61985) @@ -17,9 +17,9 @@ {tabset name="admin_features"} {* - * The following section is typically for features that act like Tiki - * sections and add a configuration icon to the sections list - *} + * The following section is typically for features that act like Tiki + * sections and add a configuration icon to the sections list + *} {* ---------- Main features ------------ *} {tab name="{tr}Global features{/tr}" key=global} <br> Modified: trunk/templates/admin/include_fgal.tpl =================================================================== --- trunk/templates/admin/include_fgal.tpl 2017-04-01 00:22:13 UTC (rev 61984) +++ trunk/templates/admin/include_fgal.tpl 2017-04-01 01:04:28 UTC (rev 61985) @@ -358,7 +358,7 @@ {/tabset} <br>{* I cheated. *} - <div class="row"> + <div class="row"> <div class="form-group col-lg-12 clearfix"> <div class="text-center"> <input type="submit" class="btn btn-primary btn-sm tips" title="{tr}Apply changes{/tr}" value="{tr}Apply{/tr}"> Modified: trunk/templates/admin/include_wiki.tpl =================================================================== --- trunk/templates/admin/include_wiki.tpl 2017-04-01 00:22:13 UTC (rev 61984) +++ trunk/templates/admin/include_wiki.tpl 2017-04-01 01:04:28 UTC (rev 61985) @@ -10,7 +10,7 @@ <div class="t_navbar margin-bottom-md clearfix"> {button _icon_name='admin_wiki' _text="{tr}Pages{/tr}" _type="link" _class='btn btn-link' _script='tiki-listpages.php' _title="{tr}List wiki pages{/tr}"} {if $prefs.feature_wiki_structure eq "y" and $tiki_p_view eq "y"} - {button _icon_name='structure' _text="{tr}Structures{/tr}" _type="link" _class='btn btn-link' _script='tiki-admin_structures.php' _title="{tr}List structures{/tr}"} + {button _icon_name='structure' _text="{tr}Structures{/tr}" _type="link" _class='btn btn-link' _script='tiki-admin_structures.php' _title="{tr}List structures{/tr}"} {/if} <div class="pull-right"> <input type="submit" class="btn btn-primary btn-sm tips" title=":{tr}Apply changes{/tr}" value="{tr}Apply{/tr}"> Modified: trunk/templates/antibot.tpl =================================================================== --- trunk/templates/antibot.tpl 2017-04-01 00:22:13 UTC (rev 61984) +++ trunk/templates/antibot.tpl 2017-04-01 01:04:28 UTC (rev 61985) @@ -110,7 +110,7 @@ {/jq} {else} {jq} - antibotVerification($("#antibotcode"), { + antibotVerification($("#antibotcode"), { required: true, remote: { url: "validate-ajax.php", Modified: trunk/templates/blog_post_actions.tpl =================================================================== --- trunk/templates/blog_post_actions.tpl 2017-04-01 00:22:13 UTC (rev 61984) +++ trunk/templates/blog_post_actions.tpl 2017-04-01 01:04:28 UTC (rev 61985) @@ -53,7 +53,7 @@ //Create your sharelet with desired properties and set button element to false var object{/literal}{$postId}{literal} = SHARETHIS.addEntry({}, {button:false}); //Output your customized button - document.write('<a id="share{/literal}{$postId}{literal}" href="#">{/literal}{icon name="sharethis"} {tr}ShareThis{/tr}{literal}</a>'); + document.write('<a id="share{/literal}{$postId}{literal}" href="#">{/literal}{icon name="sharethis"} {tr}ShareThis{/tr}{literal}</a>'); //Tie customized button to ShareThis button functionality. var element{/literal}{$postId}{literal} = document.getElementById("share{/literal}{$postId}{literal}"); object{/literal}{$postId}{literal}.attachButton(element{/literal}{$postId}{literal}); Modified: trunk/templates/error_ticket.tpl =================================================================== --- trunk/templates/error_ticket.tpl 2017-04-01 00:22:13 UTC (rev 61984) +++ trunk/templates/error_ticket.tpl 2017-04-01 01:04:28 UTC (rev 61985) @@ -26,7 +26,7 @@ <input type="hidden" name="{$k}" value="{$i|escape}"> {/foreach} <input type="submit" class="btn btn-success" name="ticket_action_button" - value="{tr}Click here to confirm your action{/tr}"> + value="{tr}Click here to confirm your action{/tr}"> </form> {if $prefs.javascript_enabled eq 'y'} {button href="javascript:history.back()" _text="{tr}Go back{/tr}"} @@ -48,7 +48,7 @@ <input type="hidden" name="{$k}" value="{$i|escape}"> {/foreach} <input type="submit" class="btn btn-success" name="ticket_action_button" - value="{tr}Click here to confirm your action{/tr}"> + value="{tr}Click here to confirm your action{/tr}"> </form> {if $prefs.javascript_enabled eq 'y'} {button href="javascript:history.back()" _text="{tr}Go back{/tr}"} @@ -73,7 +73,7 @@ <input type="hidden" name="{$k}" value="{$i|escape}"> {/foreach} <input type="submit" class="btn btn-success" name="ticket_action_button" - value="{tr}Click here to confirm your action{/tr}"> + value="{tr}Click here to confirm your action{/tr}"> </form> {if $prefs.javascript_enabled eq 'y'} {button href="javascript:history.back()" _text="{tr}Go back{/tr}"} @@ -98,7 +98,7 @@ <input type="hidden" name="{$k}" value="{$i|escape}"> {/foreach} <input type="submit" class="btn btn-success" name="ticket_action_button" - value="{tr}Click here to confirm your action{/tr}"> + value="{tr}Click here to confirm your action{/tr}"> </form> {if $prefs.javascript_enabled eq 'y'} {button href="javascript:history.back()" _text="{tr}Go back{/tr}"} Modified: trunk/templates/feedback/perm.tpl =================================================================== --- trunk/templates/feedback/perm.tpl 2017-04-01 00:22:13 UTC (rev 61984) +++ trunk/templates/feedback/perm.tpl 2017-04-01 01:04:28 UTC (rev 61985) @@ -37,7 +37,7 @@ {/foreach} {/foreach} </ul> - {/foreach} + {/foreach} {/remarksbox} {else} {remarksbox type='note' title="{tr}No permissions were changed{/tr}"}{/remarksbox} Modified: trunk/templates/fgal_listing_conf.tpl =================================================================== --- trunk/templates/fgal_listing_conf.tpl 2017-04-01 00:22:13 UTC (rev 61984) +++ trunk/templates/fgal_listing_conf.tpl 2017-04-01 01:04:28 UTC (rev 61985) @@ -34,7 +34,7 @@ checked="checked" {/if} {if isset($edit_mode) and $edit_mode eq 'y' and $prefs.$pref_name neq 'y'} - disabled="disabled" + disabled="disabled" {/if} > {$item.name} Modified: trunk/templates/file/uploader.tpl =================================================================== --- trunk/templates/file/uploader.tpl 2017-04-01 00:22:13 UTC (rev 61984) +++ trunk/templates/file/uploader.tpl 2017-04-01 01:04:28 UTC (rev 61985) @@ -7,13 +7,21 @@ {block name="content"} {if $uploadInModal} - <form class="file-uploader" enctype="multipart/form-data" method="post" action="{service controller=file action=upload galleryId=$galleryId image_max_size_x=$image_max_size_x image_max_size_y=$image_max_size_y}" data-gallery-id="{$galleryId|escape}" data-image_max_size_x="{$image_max_size_x|escape}" data-image_max_size_y="{$image_max_size_y|escape}"> + <form class="file-uploader" enctype="multipart/form-data" method="post" action="{service controller=file action=upload galleryId=$galleryId image_max_size_x=$image_max_size_x image_max_size_y=$image_max_size_y}" data-gallery-id="{$galleryId|escape}" data-image_max_size_x="{$image_max_size_x|escape}" data-image_max_size_y="{$image_max_size_y|escape}"> <div class="progress hidden"> <div class="progress-bar progress-bar-striped active" role="progressbar" aria-valuenow="0" aria-valuemin="0" aria-valuemax="100" style="width: 0%;"> <span class="sr-only"><span class="count">0</span>% Complete</span> </div> </div> - {if $image_max_size_x || $image_max_size_y }{remarksbox type="note" title="{tr}Note{/tr}"}{tr}Images will be resized to {if $image_max_size_x} {$image_max_size_x}px in width{/if}{if $image_max_size_y} and {$image_max_size_y}px in height{/if} {/tr}{/remarksbox}{else}{remarksbox type="note" title="{tr}Note{/tr}"}{tr}Images will not be resized, for resizing edit this tracker field and set image max width and height in "Options for files" section.{/tr}{/remarksbox}{/if} + {if $image_max_size_x || $image_max_size_y } + {remarksbox type="note" title="{tr}Note{/tr}"} + {tr}Images will be resized to {if $image_max_size_x} {$image_max_size_x}px in width{/if}{if $image_max_size_y} and {$image_max_size_y}px in height{/if} {/tr} + {/remarksbox} + {else} + {remarksbox type="note" title="{tr}Note{/tr}"} + {tr}Images will not be resized, for resizing edit this tracker field and set image max width and height in "Options for files" section.{/tr} + {/remarksbox} + {/if} <input type="file" name="file[]" {if $limit !== 1}multiple{/if} {if $typeFilter}accept="{$typeFilter|escape}"{/if} /> <p class="drop-message text-center"> @@ -31,13 +39,21 @@ {else} - <div class="file-uploader inline" data-action="{service controller=file action=upload galleryId=$galleryId image_max_size_x=$image_max_size_x image_max_size_y=$image_max_size_y}" data-gallery-id="{$galleryId|escape}" data-image_max_size_x="{$image_max_size_x|escape}" data-image_max_size_y="{$image_max_size_y|escape}"> + <div class="file-uploader inline" data-action="{service controller=file action=upload galleryId=$galleryId image_max_size_x=$image_max_size_x image_max_size_y=$image_max_size_y}" data-gallery-id="{$galleryId|escape}" data-image_max_size_x="{$image_max_size_x|escape}" data-image_max_size_y="{$image_max_size_y|escape}"> <div class="progress hidden"> <div class="progress-bar progress-bar-striped active" role="progressbar" aria-valuenow="0" aria-valuemin="0" aria-valuemax="100" style="width: 0%;"> <span class="sr-only"><span class="count">0</span>% Complete</span> </div> </div> - {if $image_max_size_x || $image_max_size_y }{remarksbox type="note" title="{tr}Note{/tr}"}{tr}Images will be resized to {if $image_max_size_x} {$image_max_size_x}px in width{/if}{if $image_max_size_y} and {$image_max_size_y}px in height{/if} {/tr}{/remarksbox}{else}{remarksbox type="note" title="{tr}Note{/tr}"}{tr}Images will not be resized, for resizing edit this tracker field and set image max width and height in "Options for files" section.{/tr}{/remarksbox}{/if} + {if $image_max_size_x || $image_max_size_y } + {remarksbox type="note" title="{tr}Note{/tr}"} + {tr}Images will be resized to {if $image_max_size_x} {$image_max_size_x}px in width{/if}{if $image_max_size_y} and {$image_max_size_y}px in height{/if} {/tr} + {/remarksbox} + {else} + {remarksbox type="note" title="{tr}Note{/tr}"} + {tr}Images will not be resized, for resizing edit this tracker field and set image max width and height in "Options for files" section.{/tr} + {/remarksbox} + {/if} <input type="file" name="file[]" {if $limit !== 1}multiple{/if} {if $typeFilter}accept="{$typeFilter|escape}"{/if} /> <p class="drop-message text-center"> Modified: trunk/templates/language/write_to_language_php.tpl =================================================================== --- trunk/templates/language/write_to_language_php.tpl 2017-04-01 00:22:13 UTC (rev 61984) +++ trunk/templates/language/write_to_language_php.tpl 2017-04-01 01:04:28 UTC (rev 61985) @@ -12,7 +12,7 @@ {/if} {if (empty($db_languages))} {remarksbox type="note" title="{tr}Information{/tr}" close="n"} - {tr}No translations in the database available to export{/tr} + {tr}No translations in the database available to export{/tr} {/remarksbox} {else} {if $tiki_p_admin eq 'y' and $langIsWritable} @@ -44,4 +44,4 @@ </div> {/if} </form> -{/block} \ No newline at end of file +{/block} Modified: trunk/templates/layout_fullscreen_check.tpl =================================================================== --- trunk/templates/layout_fullscreen_check.tpl 2017-04-01 00:22:13 UTC (rev 61984) +++ trunk/templates/layout_fullscreen_check.tpl 2017-04-01 01:04:28 UTC (rev 61985) @@ -1,5 +1,5 @@ {* $Id$ *} -{* this tpl is included in the various layout tpl's to show the *} +{* this tpl is included in the various layout tpl's to show the *} {* clickable fullscreen icon if the full screen feature has been set *} {if $prefs.feature_fullscreen eq 'y' and $filegals_manager eq '' and $print_page ne 'y'} Modified: trunk/templates/list_file_gallery.tpl =================================================================== --- trunk/templates/list_file_gallery.tpl 2017-04-01 00:22:13 UTC (rev 61984) +++ trunk/templates/list_file_gallery.tpl 2017-04-01 01:04:28 UTC (rev 61985) @@ -12,7 +12,7 @@ && $fgal_options.show_explorer.value eq 'y' && $tiki_p_view_fgal_explorer eq 'y'} {if $prefs.javascript_enabled eq 'y'} <div id="fgalexplorer_close" style="float:left; vertical-align:middle; display:{if ! isset($smarty.session.tiki_cookie_jar.show_fgalexplorer) or $smarty.session.tiki_cookie_jar.show_fgalexplorer eq 'y'}none{else}inline{/if};"> - <a href="#" + <a href="#" class="tips" title=":{tr}Show Tree{/tr}" onclick="flip('fgalexplorer','');hide('fgalexplorer_close',false);show('fgalexplorer_open',false);return false;"> Modified: trunk/templates/lists/article-search.tpl =================================================================== --- trunk/templates/lists/article-search.tpl 2017-04-01 00:22:13 UTC (rev 61984) +++ trunk/templates/lists/article-search.tpl 2017-04-01 01:04:28 UTC (rev 61985) @@ -1,10 +1,10 @@ {literal} <div class="form-group"> <div class="input-group"> - {input _filter="content" _field="title,contents" type="text" placeholder="Search... " class="form-control clearfield"} + {input _filter="content" _field="title,contents" type="text" placeholder="Search... " class="form-control clearfield"} <span class="input-group-btn"> {input type=reset value="Clear" class="btn btn-default clearbox"} - {input type=submit value="Search" class="btn btn-search"} + {input type=submit value="Search" class="btn btn-search"} </span> </div> </div> @@ -11,6 +11,6 @@ {/literal} {jq} $(document).on('click', ".clearbox", function(e) { - $("#customsearch_announcementsearch .clearfield").val("").trigger("change"); + $("#customsearch_announcementsearch .clearfield").val("").trigger("change"); }); -{/jq} \ No newline at end of file +{/jq} Modified: trunk/templates/managestream/sample.tpl =================================================================== --- trunk/templates/managestream/sample.tpl 2017-04-01 00:22:13 UTC (rev 61984) +++ trunk/templates/managestream/sample.tpl 2017-04-01 01:04:28 UTC (rev 61985) @@ -52,7 +52,7 @@ </div> </form> {jq} - $('#eventType').change(function(event) { + $('#eventType').change(function(event) { var eventType = $('#eventType').val(); var result = $.ajax({ type: 'GET', Modified: trunk/templates/modules/mod-calendar_new.tpl =================================================================== --- trunk/templates/modules/mod-calendar_new.tpl 2017-04-01 00:22:13 UTC (rev 61984) +++ trunk/templates/modules/mod-calendar_new.tpl 2017-04-01 01:04:28 UTC (rev 61985) @@ -54,8 +54,11 @@ {if isset($cell[w][d].items[0]) and ((isset($cell[w][d].items[0].modifiable) and $cell[w][d].items[0].modifiable eq "y") || $cell[w][d].items[0].visible eq 'y')} {if empty($calendar_popup) or $calendar_popup eq "y"} - <a href="{$myurl}?todate={$date}&viewmode={$viewmodelink}" title="{tr}View{/tr}" {if (isset($sticky_popup) and $sticky_popup eq 'y') - or ($prefs.calendar_sticky_popup eq "y" and $cell[w][d].items[0].calitemId)}{popup sticky=true fullhtml="1" text=$over|escape:"javascript"|escape:"html"}{else}{popup fullhtml="1" text=$over|escape:"javascript"|escape:"html"}{/if}> + <a href="{$myurl}?todate={$date}&viewmode={$viewmodelink}" title="{tr}View{/tr}" + {if (isset($sticky_popup) and $sticky_popup eq 'y') or ($prefs.calendar_sticky_popup eq "y" and $cell[w][d].items[0].calitemId)} + {popup sticky=true fullhtml="1" text=$over|escape:"javascript"|escape:"html"}{else}{popup fullhtml="1" text=$over|escape:"javascript"|escape:"html"} + {/if} + > {if isset($day_cursor)} {$day_cursor} {/if} @@ -86,7 +89,7 @@ <p> <a href="tiki-calendar_edit_item.php" style="display: block; margin: auto auto; width: 98px;"> {icon name="add"} - {tr}Add Event{/tr} + {tr}Add Event{/tr} </a> </p> {/if} Modified: trunk/templates/modules/mod-freetags_current.tpl =================================================================== --- trunk/templates/modules/mod-freetags_current.tpl 2017-04-01 00:22:13 UTC (rev 61984) +++ trunk/templates/modules/mod-freetags_current.tpl 2017-04-01 01:04:28 UTC (rev 61985) @@ -4,10 +4,10 @@ {tikimodule error=$module_params.error title=$tpl_module_title name="freetags_current" flip=$module_params.flip decorations=$module_params.decorations nobox=$module_params.nobox notitle=$module_params.notitle} {if $modFreetagsCurrent.cant gt 0} {section name=ix loop=$modFreetagsCurrent.data} - <div class="module"> - {capture name=tagurl}{if (strstr($modFreetagsCurrent.data[ix].tag, ' '))}"{$modFreetagsCurrent.data[ix].tag}"{else}{$modFreetagsCurrent.data[ix].tag}{/if}{/capture} - <a class="linkmodule" href="tiki-browse_freetags.php?tag={$smarty.capture.tagurl|escape:'url'}">{$modFreetagsCurrent.data[ix].tag|escape}</a> - </div> + <div class="module"> + {capture name=tagurl}{if (strstr($modFreetagsCurrent.data[ix].tag, ' '))}"{$modFreetagsCurrent.data[ix].tag}"{else}{$modFreetagsCurrent.data[ix].tag}{/if}{/capture} + <a class="linkmodule" href="tiki-browse_freetags.php?tag={$smarty.capture.tagurl|escape:'url'}">{$modFreetagsCurrent.data[ix].tag|escape}</a> + </div> {/section} {/if} {if isset($addFreetags)} Modified: trunk/templates/modules/mod-freetags_most_popular.tpl =================================================================== --- trunk/templates/modules/mod-freetags_most_popular.tpl 2017-04-01 00:22:13 UTC (rev 61984) +++ trunk/templates/modules/mod-freetags_most_popular.tpl 2017-04-01 01:04:28 UTC (rev 61985) @@ -5,7 +5,7 @@ {if ($type ne 'cloud')}<li class="freetag">{/if} {capture name=tagurl}{if (strstr($tag.tag, ' '))}"{$tag.tag}"{else}{$tag.tag}{/if}{/capture} <a class="freetag_{$tag.size}" title="{tr}List everything tagged{/tr} {$tag.tag|escape}" href="tiki-browse_freetags.php?tag={$smarty.capture.tagurl|escape:'url'}{if !empty($module_params.where)}&type={$module_params.where|escape:'url'}{/if}{if !empty($module_params.objectId)}&objectId={$module_params.objectId|escape:'url'}{/if}">{$tag.tag|escape}</a> - + {if ($type ne 'cloud')}</li>{/if} {/foreach} {if ($type ne 'cloud')}</ul>{/if} Modified: trunk/templates/modules/mod-last_podcasts.tpl =================================================================== --- trunk/templates/modules/mod-last_podcasts.tpl 2017-04-01 00:22:13 UTC (rev 61984) +++ trunk/templates/modules/mod-last_podcasts.tpl 2017-04-01 01:04:28 UTC (rev 61985) @@ -36,7 +36,7 @@ {tr}The path to a podcast player is required.{/tr} {/if} </div> - </li> + </li> {/section} {if $nonums != 'y'}</ol>{else}</ul>{/if} Modified: trunk/templates/modules/mod-messages_unread_messages.tpl =================================================================== --- trunk/templates/modules/mod-messages_unread_messages.tpl 2017-04-01 00:22:13 UTC (rev 61984) +++ trunk/templates/modules/mod-messages_unread_messages.tpl 2017-04-01 01:04:28 UTC (rev 61985) @@ -2,13 +2,17 @@ {if isset($modUnread)} {tikimodule error=$module_params.error|default:null title=$tpl_module_title name="messages_unread_messages" flip=$module_params.flip|default:null decorations=$module_params.decorations|default:null nobox=$module_params.nobox notitle=$module_params.notitle|default:null} -{if $modUnread > 0} - <a class="linkmodule" href="messu-mailbox.php">{icon name='information' istyle="float:left"} - <span class="highlight">{tr}You have{/tr} {$modUnread} {if $modUnread !== '1'}{tr}new messages{/tr}{else}{tr}new message{/tr}{/if}.</span> -{else} - <a class="linkmodule" href="messu-mailbox.php"> - {tr}You have 0 new messages{/tr} -{/if} -</a> + {if $modUnread > 0} + <a class="linkmodule" href="messu-mailbox.php"> + {icon name='information' istyle="float:left"} + <span class="highlight"> + {tr}You have{/tr} {$modUnread} {if $modUnread !== '1'}{tr}new messages{/tr}{else}{tr}new message{/tr}{/if}. + </span> + </a> + {else} + <a class="linkmodule" href="messu-mailbox.php"> + {tr}You have 0 new messages{/tr} + </a> + {/if} {/tikimodule} {/if} Modified: trunk/templates/modules/mod-quickadmin.tpl =================================================================== --- trunk/templates/modules/mod-quickadmin.tpl 2017-04-01 00:22:13 UTC (rev 61984) +++ trunk/templates/modules/mod-quickadmin.tpl 2017-04-01 01:04:28 UTC (rev 61985) @@ -102,7 +102,7 @@ </a> </li> <li> - <a href="tiki-plugins.php"> + <a href="tiki-plugins.php"> {icon name="plugin"} {tr}Plugin approval{/tr} </a> </li> Modified: trunk/templates/modules/mod-search.tpl =================================================================== --- trunk/templates/modules/mod-search.tpl 2017-04-01 00:22:13 UTC (rev 61984) +++ trunk/templates/modules/mod-search.tpl 2017-04-01 01:04:28 UTC (rev 61985) @@ -6,13 +6,12 @@ <form class="form-inline" id="search-module-form{$search_mod_usage_counter}" method="get" action="{$smod_params.search_action}"{if $smod_params.use_autocomplete eq 'y'} onsubmit="return submitSearch{$search_mod_usage_counter}()"{/if}> <div class="form-group" style="position: relative;"> <div class="{if $smod_params.compact eq "y"}btn-group{else}input-group input-group-sm{/if}" style="margin-left:-7px;margin-right:-7px;"> - <input style="float:left;{if $smod_params.compact eq "y"}width:72%;border-bottom-right-radius:0;border-top-right-radius: 0;{/if}" placeholder="{tr}Find{/tr}" class="form-control" id="search_mod_input_{$search_mod_usage_counter}" name="{if $smod_params.search_action eq 'tiki-searchindex.php'}filter~content{else}find{/if}" {if !empty($smod_params.input_size)}size="{$smod_params.input_size}" style="width: auto"{/if} type="text" accesskey="s" value="{$smod_params.input_value|escape}" /> - {* </div> *} - {if $smod_params.show_object_filter eq 'y'} - <label class="control-label" for="filterType"> - {tr}in{/tr} - </label> - <div class="form-group"> + <input style="float:left;{if $smod_params.compact eq "y"}width:72%;border-bottom-right-radius:0;border-top-right-radius: 0;{/if}" placeholder="{tr}Find{/tr}" class="form-control" id="search_mod_input_{$search_mod_usage_counter}" name="{if $smod_params.search_action eq 'tiki-searchindex.php'}filter~content{else}find{/if}" {if !empty($smod_params.input_size)}size="{$smod_params.input_size}" style="width: auto"{/if} type="text" accesskey="s" value="{$smod_params.input_value|escape}"> + {if $smod_params.show_object_filter eq 'y'} + <label class="control-label" for="filterType"> + {tr}in{/tr} + </label> + <div class="form-group"> {if $smod_params.search_action eq 'tiki-searchindex.php'} <select id="filterType" name="filter~type" class="form-control" {*style="width:{$smod_params.select_size}em;"*}> <option value="">{tr}Entire Site{/tr}</option> @@ -45,86 +44,89 @@ </select> {/if} - </div> - {elseif !empty($prefs.search_default_where)} - {if is_array($prefs.search_default_where)} - {foreach from=$prefs.search_default_where item=t} - <input type="hidden" name="{if $smod_params.search_action eq 'tiki-searchindex.php'}filter~type[]{else}where[]{/if}" value="{$t|escape}" /> - {/foreach} - {else} - <input type="hidden" name="{if $smod_params.search_action eq 'tiki-searchindex.php'}filter~type{else}where{/if}" value="{$prefs.search_default_where|escape}" /> + </div> + {elseif !empty($prefs.search_default_where)} + {if is_array($prefs.search_default_where)} + {foreach from=$prefs.search_default_where item=t} + <input type="hidden" name="{if $smod_params.search_action eq 'tiki-searchindex.php'}filter~type[]{else}where[]{/if}" value="{$t|escape}" /> + {/foreach} + {else} + <input type="hidden" name="{if $smod_params.search_action eq 'tiki-searchindex.php'}filter~type{else}where{/if}" value="{$prefs.search_default_where|escape}" /> + {/if} {/if} - {/if} {if $smod_params.compact eq "y"} - <button type="submit" class="btn btn-default search_mod_magnifier"> - {icon name="search"} - </button> - </div> + <button type="submit" class="btn btn-default search_mod_magnifier"> + {icon name="search"} + </button> + </div> <div class="btn-group search_mod_buttons box" style="display:none;position:absolute;left:2.5em;top:2.5em;z-index:2;white-space:nowrap;"> {else} <div class="input-group-btn btn-group"> {/if} - {foreach $smod_params.additional_filters as $key => $filter} - <input type="hidden" name="filter~{$key|escape}" value="{$filter|escape}"/> - {/foreach} - {if $smod_params.show_search_button eq 'y'} - <input type = "submit" class="btn btn-default btn-sm tips{if $smod_params.default_button eq 'search'} btn-primary button_default{/if}{if $smod_params.compact eq "y"} bottom{else} btn-xs{/if}" - name = "search" value = "{$smod_params.search_submit|escape}" - title="{tr}Search{/tr}|{tr}Search for text throughout the site.{/tr}" - {if $smod_params.compact eq "y"}data-placement="bottom"{/if} - onclick = "$('#search-module-form{$search_mod_usage_counter}').attr('action', '{$smod_params.search_action|escape:javascript}').attr('page_selected','');" - /> - {/if} - {if $smod_params.show_go_button eq 'y'} - <input type = "submit" class="btn btn-default btn-sm tips{if $smod_params.compact eq "y"} bottom{else} btn-xs{/if}{if $smod_params.default_button eq 'go'} btn-primary button_default{/if}" - name = "go" value = "{$smod_params.go_submit|escape}" - title="{tr}Go{/tr}|{tr}Go directly to a page, or search in page titles if exact match is not found.{/tr}" - {if $smod_params.compact eq "y"}data-placement="bottom"{/if} - onclick = "$('#search-module-form{$search_mod_usage_counter}').attr('action', '{$smod_params.go_action|escape:javascript}').attr('page_selected',''); - {if $smod_params.search_action eq 'tiki-searchindex.php'} - $('#search-module-form{$search_mod_usage_counter} input[name=\'filter~content\']').attr('name', 'find'); - {/if}" - /> - <input type="hidden" name="exact_match" value="" /> - {/if} - {if $smod_params.show_edit_button eq 'y' and $tiki_p_edit eq 'y'} - <input type = "submit" class = "btn btn-default btn-sm tips{if $smod_params.compact eq "y"} bottom{else} btn-xs{/if}{if $smod_params.default_button eq 'edit'} btn-primary button_default{/if}" - name = "edit" value = "{$smod_params.edit_submit|escape}" - title="{tr}Edit{/tr}|{tr}Edit existing page or create a new one.{/tr}" - {if $smod_params.compact eq "y"}data-placement="bottom"{/if} - onclick = "$('#search-module-form{$search_mod_usage_counter} input[name!={if $smod_params.search_action eq 'tiki-searchindex.php'}\'filter~content\'{else}\'find\'{/if}]').attr('name', ''); - $('#search-module-form{$search_mod_usage_counter} input[name={if $smod_params.search_action eq 'tiki-searchindex.php'}\'filter~content\'{else}\'find\'{/if}]').attr('name', 'page'); - $('#search-module-form{$search_mod_usage_counter}').attr('action', '{$smod_params.edit_action|escape:javascript}').attr('page_selected','');" - /> - {/if} - </div></div> + {foreach $smod_params.additional_filters as $key => $filter} + <input type="hidden" name="filter~{$key|escape}" value="{$filter|escape}"/> + {/foreach} + {if $smod_params.show_search_button eq 'y'} + <input type = "submit" class="btn btn-default btn-sm tips{if $smod_params.default_button eq 'search'} btn-primary button_default{/if}{if $smod_params.compact eq "y"} bottom{else} btn-xs{/if}" + name = "search" value = "{$smod_params.search_submit|escape}" + title="{tr}Search{/tr}|{tr}Search for text throughout the site.{/tr}" + {if $smod_params.compact eq "y"}data-placement="bottom"{/if} + onclick = "$('#search-module-form{$search_mod_usage_counter}').attr('action', '{$smod_params.search_action|escape:javascript}').attr('page_selected','');" + /> + {/if} + {if $smod_params.show_go_button eq 'y'} + <input type = "submit" class="btn btn-default btn-sm tips{if $smod_params.compact eq "y"} bottom{else} btn-xs{/if}{if $smod_params.default_button eq 'go'} btn-primary button_default{/if}" + name = "go" value = "{$smod_params.go_submit|escape}" + title="{tr}Go{/tr}|{tr}Go directly to a page, or search in page titles if exact match is not found.{/tr}" + {if $smod_params.compact eq "y"}data-placement="bottom"{/if} + onclick = "$('#search-module-form{$search_mod_usage_counter}').attr('action', '{$smod_params.go_action|escape:javascript}').attr('page_selected',''); + {if $smod_params.search_action eq 'tiki-searchindex.php'} + $('#search-module-form{$search_mod_usage_counter} input[name=\'filter~content\']').attr('name', 'find'); + {/if} + " + > + <input type="hidden" name="exact_match" value="" /> + {/if} + {if $smod_params.show_edit_button eq 'y' and $tiki_p_edit eq 'y'} + <input type = "submit" class = "btn btn-default btn-sm tips{if $smod_params.compact eq "y"} bottom{else} btn-xs{/if}{if $smod_params.default_button eq 'edit'} btn-primary button_default{/if}" + name = "edit" value = "{$smod_params.edit_submit|escape}" + title="{tr}Edit{/tr}|{tr}Edit existing page or create a new one.{/tr}" + {if $smod_params.compact eq "y"}data-placement="bottom"{/if} + onclick = "$('#search-module-form{$search_mod_usage_counter} input[name!={if $smod_params.search_action eq 'tiki-searchindex.php'}\'filter~content\'{else}\'find\'{/if}]').attr('name', ''); + $('#search-module-form{$search_mod_usage_counter} input[name={if $smod_params.search_action eq 'tiki-searchindex.php'}\'filter~content\'{else}\'find\'{/if}]').attr('name', 'page'); + $('#search-module-form{$search_mod_usage_counter}').attr('action', '{$smod_params.edit_action|escape:javascript}').attr('page_selected',''); + " + > + {/if} + </div> + </div> - {if $smod_params.tiki_search neq 'y'} - {if $smod_params.advanced_search_option eq 'y'} - <div class="checkbox" style="padding-left: 6px; padding-right: 6px; display: inline-block;"> - <label for="boolean"><input type="checkbox" name="boolean" id="boolean"{if $smod_params.advanced_search eq "y"} checked="checked"{/if} /> {tr}Advanced{/tr} - {if $smod_params.advanced_search_help eq 'y'} - <a href="{bootstrap_modal controller=search action=help}">{icon name='help'} {tr}Search Help{/tr}</a> - {/if} + {if $smod_params.tiki_search neq 'y'} + {if $smod_params.advanced_search_option eq 'y'} + <div class="checkbox" style="padding-left: 6px; padding-right: 6px; display: inline-block;"> + <label for="boolean"><input type="checkbox" name="boolean" id="boolean"{if $smod_params.advanced_search eq "y"} checked="checked"{/if} /> {tr}Advanced{/tr} + {if $smod_params.advanced_search_help eq 'y'} + <a href="{bootstrap_modal controller=search action=help}">{icon name='help'} {tr}Search Help{/tr}</a> + {/if} - </label> - </div> - {else} - {if $smod_params.advanced_search eq "y"}<input type="hidden" name="boolean" value="on" />{/if} - {/if} - <input type="hidden" name="boolean_last" value="{$smod_params.advanced_search}" /> - + </label> + </div> + {else} + {if $smod_params.advanced_search eq "y"}<input type="hidden" name="boolean" value="on" />{/if} {/if} + <input type="hidden" name="boolean_last" value="{$smod_params.advanced_search}" /> + {/if} - {if $smod_params.compact eq "y"} - {jq} + + {if $smod_params.compact eq "y"} + {jq} $(".search_mod_magnifier").mouseover( function () { $(".search_mod_buttons", $(this).parent().parent()) .show('fast') @@ -138,10 +140,10 @@ .keydown( function () { $(".search_mod_magnifier", $(this).parent()).mouseover();} ); - {/jq} - {else} - </div> - {/if} + {/jq} + {else} + </div> + {/if} </form> {jq notonready=true} function submitSearch{{$search_mod_usage_counter}}() { Modified: trunk/templates/modules/mod-svnup.tpl =================================================================== --- trunk/templates/modules/mod-svnup.tpl 2017-04-01 00:22:13 UTC (rev 61984) +++ trunk/templates/modules/mod-svnup.tpl 2017-04-01 01:04:28 UTC (rev 61985) @@ -5,10 +5,10 @@ <div class="cvsup">{tr}Last update from SVN{/tr} ({$tiki_version}): {$lastup|tiki_long_datetime} {/if} {if !empty($svnrev)} - - REV {$svnrev} + - REV {$svnrev} {/if} {if !empty($lastup) or !empty($svnrev)} - </div> + </div> {/if} {/tikimodule} {/strip} Modified: trunk/templates/multilike.tpl =================================================================== --- trunk/templates/multilike.tpl 2017-04-01 00:22:13 UTC (rev 61984) +++ trunk/templates/multilike.tpl 2017-04-01 01:04:28 UTC (rev 61985) @@ -1,6 +1,6 @@ {if $show_in_popup} -<a role="button" class="btn btn-default btn-multilike" data-target="#ml{$type}{$object}" data-placement="{$popup_placement}">Like</a> -<div class="screen hide">{* screen/hide the multilike inline, so that it only shows in the popup *} + <a role="button" class="btn btn-default btn-multilike" data-target="#ml{$type}{$object}" data-placement="{$popup_placement}">Like</a> + <div class="screen hide">{* screen/hide the multilike inline, so that it only shows in the popup *} {/if} <div id="ml{$type}{$object}" class="multilike"> {if $show_likes} @@ -30,15 +30,16 @@ <div class="title">{$choice_label}</div> {foreach $buttons as $button} <a class="{if $multilike_many eq 'y'}multilike_many{else}multilike_group{/if}" - data-relation="{$button.relation}" - data-relation_prefix="{$relation_prefix}" - data-target_type="{$type}" - data-user="{$user}" - data-target_id="{$object}" - {if $uses_values} - title="Worth {$button.value} Points" - {/if} - href="#"}> + data-relation="{$button.relation}" + data-relation_prefix="{$relation_prefix}" + data-target_type="{$type}" + data-user="{$user}" + data-target_id="{$object}" + {if $uses_values} + title="Worth {$button.value} Points" + {/if} + href="#"} + > {if $button.selected eq '0'} <i class="fa fa-thumbs-o-up"></i> {else} @@ -54,15 +55,15 @@ </div> </div> {if $show_in_popup} -</div> -{jq} - $('a.btn-multilike').click(function(){ - $(this).popover({ - content: $($(this).data('target')), - placement: $(this).data('placement'), - html: true + </div> + {jq} + $('a.btn-multilike').click(function(){ + $(this).popover({ + content: $($(this).data('target')), + placement: $(this).data('placement'), + html: true + }); + $(this).popover("toggle"); }); - $(this).popover("toggle"); - }); -{/jq} -{/if} \ No newline at end of file + {/jq} +{/if} Modified: trunk/templates/permission_link.tpl =================================================================== --- trunk/templates/permission_link.tpl 2017-04-01 00:22:13 UTC (rev 61984) +++ trunk/templates/permission_link.tpl 2017-04-01 01:04:28 UTC (rev 61985) @@ -2,7 +2,7 @@ <a class="tips {if $permission_link.active}tips bg-warning{/if}{if !empty($permission_link.addclass)} {$permission_link.addclass}{/if}" href="{$permission_link.url|escape}"{if $permission_link.active} title=":{tr}Individual permissions{/tr}"{/if}> {icon name="permission"} {$permission_link.label|escape} {if $permission_link.count} - <span class="badge">{$permission_link.count|escape}</span> + <span class="badge">{$permission_link.count|escape}</span> {/if} </a> {elseif $permission_link.mode eq 'button'} @@ -9,7 +9,7 @@ <a class="{if $permission_link.active and $permission_link.type ne 'file gallery'}btn btn-warning{else}btn btn-default{/if}{if !empty($permission_link.addclass)} {$permission_link.addclass}{/if}" href="{$permission_link.url|escape}"> {$permission_link.label|escape} {if $permission_link.count} - <span class="badge">{$permission_link.count|escape}</span> + <span class="badge">{$permission_link.count|escape}</span> {/if} </a> {elseif $permission_link.mode eq 'button_link'} @@ -17,7 +17,7 @@ {icon name="permission"} {$permission_link.label|escape} {if $permission_link.count} - <span class="badge">{$permission_link.count|escape}</span> + <span class="badge">{$permission_link.count|escape}</span> {/if} </a> {elseif $permission_link.mode eq 'link'} @@ -24,7 +24,7 @@ <a class="link{if !empty($permission_link.addclass)} {$permission_link.addclass}{/if}" href="{$permission_link.url|escape}"> {$permission_link.label|escape} {if $permission_link.count} - <span class="badge">{$permission_link.count|escape}</span> + <span class="badge">{$permission_link.count|escape}</span> {/if} </a> {elseif $permission_link.mode eq 'icon'} @@ -33,7 +33,7 @@ {icon name="permission"} <span class="sr-only">{$permission_link.label|escape}</span> {if $permission_link.count} - <span class="badge">{$permission_link.count|escape}</span> + <span class="badge">{$permission_link.count|escape}</span> {/if} </a> {/strip} @@ -42,7 +42,7 @@ {icon name="permission"} <span class="sr-only">{$permission_link.label|escape}</span> {if $permission_link.count} - <span class="badge">{$permission_link.count|escape}</span> + <span class="badge">{$permission_link.count|escape}</span> {/if} </a> {/if} Modified: trunk/templates/plugin/edit.tpl =================================================================== --- trunk/templates/plugin/edit.tpl 2017-04-01 00:22:13 UTC (rev 61984) +++ trunk/templates/plugin/edit.tpl 2017-04-01 01:04:28 UTC (rev 61985) @@ -50,7 +50,7 @@ {if empty($param.separator)} {object_selector type=$param.selector_type _simplevalue=$val _simplename=$name|escape _simpleid=$inputId _parent=$param.parent _parentkey=$param.parentkey} {else} - {object_selector_multi type=$param.selector_type _simplevalue=$val _simplename=$name|escape _simpleid=$inputId _separator=$param.separator _parent=$param.parent _parentkey=$param.parentkey _sort=$param.sort_order} + {object_selector_multi type=$param.selector_type _simplevalue=$val _simplename=$name|escape _simpleid=$inputId _separator=$param.separator _parent=$param.parent _parentkey=$param.parentkey _sort=$param.sort_order} {/if} {else} <input value="{$val}" class="form-control{$groupClass}" id="{$inputId}" type="text" name="params[{$name|escape}]"{$dataAttribute}> @@ -112,29 +112,29 @@ </div> {if $type eq 'module'} - {jq}$("#param_module_input").change(function () { - - $(this).parents(".modal-content").load( - $.service("plugin", "edit", { - area_id: "{{$area_id}}", - type: "{{$type}}", - index: {{$index}}, - page: "{{$pageName}}", - pluginArgs: {{$pluginArgsJSON}}, - bodyContent: "{{$bodyContent}}", - edit_icon: "{{$edit_icon}}", - selectedMod: $(this).val(), - modal: 1 - }), - function () { - $(this).tikiModal(); - if (jqueryTiki.chosen) { - $(this).applyChosen(); + {jq} + $("#param_module_input").change(function () { + $(this).parents(".modal-content").load( + $.service("plugin", "edit", { + area_id: "{{$area_id}}", + type: "{{$type}}", + index: {{$index}}, + page: "{{$pageName}}", + pluginArgs: {{$pluginArgsJSON}}, + bodyContent: "{{$bodyContent}}", + edit_icon: "{{$edit_icon}}", + selectedMod: $(this).val(), + modal: 1 + }), + function () { + $(this).tikiModal(); + if (jqueryTiki.chosen) { + $(this).applyChosen(); + } } - } - ).tikiModal(tr("Loading...")); - - });{/jq} + ).tikiModal(tr("Loading...")); + }); + {/jq} {/if} </form> Modified: trunk/templates/tiki-admin_actionlog.tpl =================================================================== --- trunk/templates/tiki-admin_actionlog.tpl 2017-04-01 00:22:13 UTC (rev 61984) +++ trunk/templates/tiki-admin_actionlog.tpl 2017-04-01 01:04:28 UTC (rev 61985) @@ -168,12 +168,12 @@ </fieldset> <input type="hidden" name="max" value="{$maxRecords}"> <span class="input_submit_container"> - <input type="submit" class="btn btn-default btn-sm" name="list" value="{tr}Report{/tr}"></td> - </span> + <input type="submit" class="btn btn-default btn-sm" name="list" value="{tr}Report{/tr}"> + </span> {if $tiki_p_admin eq 'y'} <span class="input_submit_container"> - <input type="submit" class="btn btn-default btn-sm" name="export" value="{tr}Export{/tr}"> - </span> + <input type="submit" class="btn btn-default btn-sm" name="export" value="{tr}Export{/tr}"> + </span> {/if} {/if} @@ -181,25 +181,25 @@ {if isset($actionlogs)} <h2 id="List">{tr}List{/tr}</h2> - {if $selectedUsers} - — - {tr}User:{/tr} - {foreach key=ix item=auser from=$users} - {if $selectedUsers[$ix] eq 'y'} {$auser|username}{/if} - {/foreach} - {/if} + {if $selectedUsers} + — + {tr}User:{/tr} + {foreach key=ix item=auser from=$users} + {if $selectedUsers[$ix] eq 'y'} {$auser|username}{/if} + {/foreach} + {/if} - {if $selectedGroups} - — - {tr}Group:{/tr} - {foreach key=ix item=group from=$groups} - {if $selectedGroups[$group] eq 'y'} {$group|escape}{/if} - {/foreach} - {/if} + {if $selectedGroups} + — + {tr}Group:{/tr} + {foreach key=ix item=group from=$groups} + {if $selectedGroups[$group] eq 'y'} {$group|escape}{/if} + {/foreach} + {/if} - {if $reportCategory} - — {tr}Category:{/tr} {$reportCateg} - {/if} + {if $reportCategory} + — {tr}Category:{/tr} {$reportCateg} + {/if} {if $maxRecords gt 0} {if $cant gt $maxRecords} {self_link max=-1}{tr}All{/tr}{/self_link} @@ -274,8 +274,9 @@ {foreach from=$actionlogs item=actionlog} <tr> {if $prefs.feature_banning eq 'y'} - <td class="checkbox-cell"><input type="checkbox" name="checked[]" - value="{$actionlog.actionId}"></td> + <td class="checkbox-cell"> + <input type="checkbox" name="checked[]" value="{$actionlog.actionId}"> + </td> {/if} <td class="username">{if $actionlog.user}{$actionlog.user|username}{else}{tr}Anonymous{/tr}{/if}</td> <td class="date">{$actionlog.lastModif|tiki_short_datetime}</td> @@ -817,13 +818,13 @@ {if $tiki_p_admin eq 'y'} <td class="checkbox-cell"> <input type="checkbox" name="{$actionlog.code}" - {if $actionlog.status eq 'y' or $actionlog.status eq 'v'}checked="checked"{/if}> + {if $actionlog.status eq 'y' or $actionlog.status eq 'v'}checked="checked"{/if}> </td> {/if} {if $tiki_p_admin eq 'y' or $actionlog.status eq 'y' or $actionlog.status eq 'v'} <td class="checkbox-cell"> <input type="checkbox" name="v_{$actionlog.code}" - {if $actionlog.status eq 'v'}checked="checked"{/if}> + {if $actionlog.status eq 'v'}checked="checked"{/if}> </td> <td class="text text-center">{tr}{$actionlog.action}{/tr}</td> <td class="text text-center">{tr}{$actionlog.objectType}{/tr}</td> @@ -832,8 +833,8 @@ {/foreach} </tbody> </table> + {*</div>*} </div> - {*</div>*} <div class="form-group"> <div class="col-sm-1 col-sm-offset-11"> <input type="submit" class="btn btn-default btn-sm" name="save" value="{tr}Set{/tr}"> Modified: trunk/templates/tiki-admin_categories.tpl =================================================================== --- trunk/templates/tiki-admin_categories.tpl 2017-04-01 00:22:13 UTC (rev 61984) +++ trunk/templates/tiki-admin_categories.tpl 2017-04-01 01:04:28 UTC (rev 61985) @@ -495,7 +495,7 @@ {/section} </select> <span class="input-group-btn"> - <input type="submit" class="btn btn-default" name="addtracker" value="{tr}Add{/tr}"> + <input type="submit" class="btn btn-default" name="addtracker" value="{tr}Add{/tr}"> </span> </div> </div> Modified: trunk/templates/tiki-admin_forums.tpl =================================================================== --- trunk/templates/tiki-admin_forums.tpl 2017-04-01 00:22:13 UTC (rev 61984) +++ trunk/templates/tiki-admin_forums.tpl 2017-04-01 01:04:28 UTC (rev 61985) @@ -39,7 +39,7 @@ {/if} <form method='post' id="admin_forums"> <div id="{$ts.tableid}-div" class="{if $js === 'y'}table-responsive{/if} ts-wrapperdiv" {if $ts.enabled}style="visibility:hidden;"{/if}> - <table id="{$ts.tableid}" class="table table-striped table-hover" data-count="{$cant|escape}"> + <table id="{$ts.tableid}" class="table table-striped table-hover" data-count="{$cant|escape}"> {$numbercol = 0} <thead> <tr> @@ -621,4 +621,4 @@ {/if} {/tab} {/if} -{/tabset} \ No newline at end of file +{/tabset} Modified: trunk/templates/tiki-admin_menu_options.tpl =================================================================== --- trunk/templates/tiki-admin_menu_options.tpl 2017-04-01 00:22:13 UTC (rev 61984) +++ trunk/templates/tiki-admin_menu_options.tpl 2017-04-01 01:04:28 UTC (rev 61985) @@ -10,12 +10,14 @@ {icon name="edit"} {tr}Edit This Menu{/tr} </a> <a class="btn btn-default" href="{bootstrap_modal controller=menu action=export_menu_options menuId=$menuId}" - title="{tr}Export menu options{/tr}"> + title="{tr}Export menu options{/tr}" + > {icon name="export"} {tr}Export{/tr} </a> <a class="btn btn-default no-ajax" - href="{bootstrap_modal controller=menu action=import_menu_options menuId=$menuId}" - title="{tr}Import menu options{/tr}"> + href="{bootstrap_modal controller=menu action=import_menu_options menuId=$menuId}" + title="{tr}Import menu options{/tr}" + > {icon name="import"} {tr}Import{/tr} </a> {/if} @@ -77,7 +79,7 @@ <tr> <td class="checkbox-cell"> <input type="checkbox" name="checked[]" value="{$channels[user].optionId|escape}" - {if $smarty.request.checked and in_array($channels[user].optionId,$smarty.request.checked)}checked="checked"{/if}> + {if $smarty.request.checked and in_array($channels[user].optionId,$smarty.request.checked)}checked="checked"{/if}> </td> <td class="id">{$channels[user].optionId}</td> <td class="id">{$channels[user].position}</td> @@ -84,28 +86,34 @@ <td class="text"> <a href="tiki-admin_menu_options.php?menuId={$menuId}&offset={$offset}&sort_mode={$sort_mode}&optionId={$channels[user].optionId}&maxRecords={$maxRecords}{if !empty($nbRecords)}&nbRecords={$nbRecords}{/if}" - class="tips" - title=":{tr}Edit{/tr}">{$channels[user].name|escape}</a> - <span class="help-block"> - {if $channels[user].url} - {tr}URL:{/tr} - <a href="{$channels[user].sefurl|escape}" - class="link tips" target="_blank" - title=":{$channels[user].canonic|escape}">{$channels[user].canonic|truncate:40:' ...'|escape}</a> - {/if} - {if $channels[user].section} - <br> - {tr}Sections:{/tr} {$channels[user].section}{/if} - {if $channels[user].perm} - <br> - {tr}Permissions:{/tr} {$channels[user].perm}{/if} - {if $channels[user].groupname} - <br> - {tr}Groups:{/tr} {$channels[user].groupname|escape}{/if} - {if $channels[user].class} - <br> - {tr}Class:{/tr} {$channels[user].class|escape}{/if} - </span> + class="tips" title=":{tr}Edit{/tr}" + > + {$channels[user].name|escape} + </a> + <span class="help-block"> + {if $channels[user].url} + {tr}URL:{/tr} + <a href="{$channels[user].sefurl|escape}" class="link tips" target="_blank" title=":{$channels[user].canonic|escape}" > + {$channels[user].canonic|truncate:40:' ...'|escape} + </a> + {/if} + {if $channels[user].section} + <br> + {tr}Sections:{/tr} {$channels[user].section} + {/if} + {if $channels[user].perm} + <br> + {tr}Permissions:{/tr} {$channels[user].perm} + {/if} + {if $channels[user].groupname} + <br> + {tr}Groups:{/tr} {$channels[user].groupname|escape} + {/if} + {if $channels[user].class} + <br> + {tr}Class:{/tr} {$channels[user].class|escape} + {/if} + </span> </td> <td class="text">{$channels[user].type_description}</td> @@ -159,8 +167,7 @@ {if $channels} <div align="left"> {tr}Perform action with checked:{/tr} - <input type="image" name="delsel" src='img/icons/cross.png' alt="{tr}Delete{/tr}" - title="{tr}Delete{/tr}"> + <input type="image" name="delsel" src='img/icons/cross.png' alt="{tr}Delete{/tr}" title="{tr}Delete{/tr}"> </div> {/if} </form> @@ -185,7 +192,7 @@ <a href="#" onclick="flip('weburls');return false;">{tr}Show Quick URLs{/tr}</a> </div> <div id="weburls" style="display:none;position:absolute;right:-10px;top:-50px;z-index:1;" - class="panel panel-default"> + class="panel panel-default"> <div class="panel-heading"> <h3 class="panel-title" id="urltop">{tr}Some useful URLs{/tr}</h3> <div style="text-align: right;"> @@ -380,8 +387,7 @@ <input type="hidden" name="optionId" value="{$optionId|escape}"> <input type="hidden" name="menuId" value="{$menuId|escape}"> <input type="hidden" name="offset" value="{$offset|escape}"> - {if !empty($nbRecords)}<input type="hidden" name="nbRecords" - value="{$nbRecords|escape}">{/if} + {if !empty($nbRecords)}<input type="hidden" name="nbRecords" value="{$nbRecords|escape}">{/if} <div class="form form-horizontal"> <div class="form-group"> <label class="control-label col-md-3" for="menu_name">{tr}Name:{/tr}</label> @@ -425,8 +431,7 @@ <label class="control-label col-md-3" for="position">{tr}Position:{/tr}</label> <div class="col-md-9"> - <input type="text" name="position" id="position" value="{$position|escape}" - class="form-control"> + <input type="text" name="position" id="position" value="{$position|escape}" class="form-control"> </div> </div> <div class="form-group"> @@ -450,8 +455,7 @@ <label class="control-label col-md-3" for="menu_section">{tr}Sections:{/tr}</label> <div class="col-md-9"> - <input id="menu_section" type="text" name="section" value="{$section|escape}" - class="form-control"><br> + <input id="menu_section" type="text" name="section" value="{$section|escape}" class="form-control"><br> {autocomplete element="#menu_section" type="array" options="source:prefNames,multiple:true,multipleSeparator:','"}{* note, multiple doesn't work in jquery-ui 1.8 *} <div class="help-block">{tr}Separate multiple feature/preferences with a comma ( , ) for an AND or a vertical bar ( | ) for an OR.{/tr}</div> </div> @@ -469,8 +473,7 @@ <label class="control-label col-md-3" for="menu_class">{tr}Class:{/tr}</label> <div class="col-md-9"> - <input id="menu_class" type="text" name="class" value="{$class|escape}" - class="form-control"><br> + <input id="menu_class" type="text" name="class" value="{$class|escape}" class="form-control"><br> <div class="help-block">{tr}Input an HTML class value for the menu option. Separate with a space for multiple classes.{/tr}</div> </div> @@ -519,8 +522,7 @@ </div> <div class="checkbox"> <label for="preview_css"> - <input type="checkbox" id="preview_css" name="preview_css" - onchange="this.form.submit()"{if $preview_css eq 'y'} checked="checked"{/if}> + <input type="checkbox" id="preview_css" name="preview_css" onchange="this.form.submit()"{if $preview_css eq 'y'} checked="checked"{/if}> CSS</label> </div> </form> Modified: trunk/templates/tiki-admin_newsletters.tpl =================================================================== --- trunk/templates/tiki-admin_newsletters.tpl 2017-04-01 00:22:13 UTC (rev 61984) +++ trunk/templates/tiki-admin_newsletters.tpl 2017-04-01 01:04:28 UTC (rev 61985) @@ -2,7 +2,7 @@ {title help="Newsletters"}{tr}Admin newsletters{/tr}{/title} <div class="t_navbar btn-group form-group"> - {button href="tiki-admin_newsletters.php?cookietab=2" _icon_name="create" _text="{tr}Create{/tr}"} + {button href="tiki-admin_newsletters.php?cookietab=2" _icon_name="create" _text="{tr}Create{/tr}"} <a role="link" href="tiki-newsletters.php" class="btn btn-link" title="{tr}List{/tr}">{icon name="list"} {tr}List{/tr}</a> <a role="link" href="tiki-send_newsletters.php" class="btn btn-link" title="{tr}Send{/tr}">{icon name="envelope"} {tr}Send{/tr}</a> {* {button href="tiki-newsletters.php" _class="btn btn-default" _icon_name="list" _text="{tr}List{/tr}"} Modified: trunk/templates/tiki-admin_schedulers.tpl =================================================================== --- trunk/templates/tiki-admin_schedulers.tpl 2017-04-01 00:22:13 UTC (rev 61984) +++ trunk/templates/tiki-admin_schedulers.tpl 2017-04-01 01:04:28 UTC (rev 61985) @@ -57,8 +57,11 @@ <tr> <td class="scheduler_name"> <a class="link tips" - href="tiki-admin_schedulers.php?scheduler={$schedulers[scheduler].id}{if $prefs.feature_tabs ne 'y'}#2{/if}" - title="{$scheduler_name}:{tr}Edit scheduler settings{/tr}">{$scheduler_name}</a> + href="tiki-admin_schedulers.php?scheduler={$schedulers[scheduler].id}{if $prefs.feature_tabs ne 'y'}#2{/if}" + title="{$scheduler_name}:{tr}Edit scheduler settings{/tr}" + > + {$scheduler_name} + </a> </td> <td class="scheduler_description"> {$schedulers[scheduler].description|escape} @@ -135,12 +138,12 @@ </div> </div> <form class="form form-horizontal" action="tiki-admin_schedulers.php" method="post" - enctype="multipart/form-data" name="RegForm" autocomplete="off"> + enctype="multipart/form-data" name="RegForm" autocomplete="off"> <div class="form-group"> <label class="col-sm-3 col-md-2 control-label" for="scheduler_name">{tr}Name{/tr}</label> <div class="col-sm-7 col-md-6"> <input type="text" id='scheduler_name' class="form-control" name='scheduler_name' - value="{$schedulerinfo.name|escape}"> + value="{$schedulerinfo.name|escape}"> </div> </div> <div class="form-group"> @@ -147,7 +150,7 @@ <label class="col-sm-3 col-md-2 control-label" for="scheduler_description">{tr}Description{/tr}</label> <div class="col-sm-7 col-md-6"> <input type="text" id='scheduler_description' class="form-control" name='scheduler_description' - value="{$schedulerinfo.description|escape}"> + value="{$schedulerinfo.description|escape}"> </div> </div> <div class="form-group"> @@ -168,7 +171,7 @@ <label class="col-sm-3 col-md-2 control-label" for="scheduler_time">{tr}Run Time{/tr}</label> <div class="col-sm-7 col-md-6"> <input type="text" id='scheduler_time' class="form-control" name='scheduler_time' - value="{$schedulerinfo.run_time|escape}"> + value="{$schedulerinfo.run_time|escape}"> </div> </div> <div class="form-group"> @@ -185,7 +188,7 @@ <label class="col-sm-3 col-md-2 control-la... [truncated message content] |
From: <li...@us...> - 2017-04-09 03:19:07
|
Revision: 62162 http://sourceforge.net/p/tikiwiki/code/62162 Author: lindonb Date: 2017-04-09 03:19:05 +0000 (Sun, 09 Apr 2017) Log Message: ----------- [REF] messages: add ticket parameters to links with timeout Modified Paths: -------------- trunk/templates/messu-read.tpl trunk/templates/messu-read_archive.tpl trunk/templates/messu-read_sent.tpl Modified: trunk/templates/messu-read.tpl =================================================================== --- trunk/templates/messu-read.tpl 2017-04-09 02:39:01 UTC (rev 62161) +++ trunk/templates/messu-read.tpl 2017-04-09 03:19:05 UTC (rev 62162) @@ -24,9 +24,9 @@ </div> <div class="col-xs-4 col-sm-2"> {if $msg.isFlagged eq 'y'} - <a class="btn btn-link timeout" href="messu-read.php?offset={$offset}&action=isFlagged&actionval=n&msgId={$msgId}&sort_mode={$sort_mode}&find={$find|escape:"url"}&flag={$flag}&priority={$priority}&flagval={$flagval}">{tr}<i class="fa fa-flag" aria-hidden="true"></i>{/tr}</a> + <a class="btn btn-link timeout" href="messu-read.php?offset={$offset}&action=isFlagged&actionval=n&msgId={$msgId}&sort_mode={$sort_mode}&find={$find|escape:"url"}&flag={$flag}&priority={$priority}&flagval={$flagval}&ticket={$ticket}&daconfirm=y">{tr}<i class="fa fa-flag" aria-hidden="true"></i>{/tr}</a> {else} - <a class="btn btn-link timeout" href="messu-read.php?offset={$offset}&action=isFlagged&actionval=y&msgId={$msgId}&sort_mode={$sort_mode}&find={$find|escape:"url"}&flag={$flag}&priority={$priority}&flagval={$flagval}">{tr}<i class="fa fa-flag-o" aria-hidden="true"></i>{/tr}</a> + <a class="btn btn-link timeout" href="messu-read.php?offset={$offset}&action=isFlagged&actionval=y&msgId={$msgId}&sort_mode={$sort_mode}&find={$find|escape:"url"}&flag={$flag}&priority={$priority}&flagval={$flagval}&ticket={$ticket}&daconfirm=y">{tr}<i class="fa fa-flag-o" aria-hidden="true"></i>{/tr}</a> {/if} </div> </div> Modified: trunk/templates/messu-read_archive.tpl =================================================================== --- trunk/templates/messu-read_archive.tpl 2017-04-09 02:39:01 UTC (rev 62161) +++ trunk/templates/messu-read_archive.tpl 2017-04-09 03:19:05 UTC (rev 62162) @@ -25,9 +25,9 @@ </div> <div class="col-xs-4 col-sm-2"> {if $msg.isFlagged eq 'y'} - <a class="btn btn-link timeout" href="messu-read_archive.php?offset={$offset}&action=isFlagged&actionval=n&msgId={$msgId}&sort_mode={$sort_mode}&find={$find|escape:"url"}&flag={$flag}&priority={$priority}&flagval={$flagval}">{tr}<i class="fa fa-flag" aria-hidden="true"></i>{/tr}</a> + <a class="btn btn-link timeout" href="messu-read_archive.php?offset={$offset}&action=isFlagged&actionval=n&msgId={$msgId}&sort_mode={$sort_mode}&find={$find|escape:"url"}&flag={$flag}&priority={$priority}&flagval={$flagval}&ticket={$ticket}&daconfirm=y">{tr}<i class="fa fa-flag" aria-hidden="true"></i>{/tr}</a> {else} - <a class="btn btn-link timeout" href="messu-read_archive.php?offset={$offset}&action=isFlagged&actionval=y&msgId={$msgId}&sort_mode={$sort_mode}&find={$find|escape:"url"}&flag={$flag|escape:"url"}&priority={$priority}&flagval={$flagval}">{tr}<i class="fa fa-flag-o" aria-hidden="true"></i>{/tr}</a> + <a class="btn btn-link timeout" href="messu-read_archive.php?offset={$offset}&action=isFlagged&actionval=y&msgId={$msgId}&sort_mode={$sort_mode}&find={$find|escape:"url"}&flag={$flag|escape:"url"}&priority={$priority}&flagval={$flagval}&ticket={$ticket}&daconfirm=y">{tr}<i class="fa fa-flag-o" aria-hidden="true"></i>{/tr}</a> {/if} </div> </div> Modified: trunk/templates/messu-read_sent.tpl =================================================================== --- trunk/templates/messu-read_sent.tpl 2017-04-09 02:39:01 UTC (rev 62161) +++ trunk/templates/messu-read_sent.tpl 2017-04-09 03:19:05 UTC (rev 62162) @@ -25,9 +25,9 @@ </div> <div class="col-xs-4 col-sm-2"> {if $msg.isFlagged eq 'y'} - <a class="btn btn-link timeout" href="messu-read_sent.php?offset={$offset}&action=isFlagged&actionval=n&msgId={$msgId}&sort_mode={$sort_mode}&find={$find|escape:"url"}&flag={$flag}&priority={$priority}&flagval={$flagval}">{tr}<i class="fa fa-flag" aria-hidden="true"></i>{/tr}</a> + <a class="btn btn-link timeout" href="messu-read_sent.php?offset={$offset}&action=isFlagged&actionval=n&msgId={$msgId}&sort_mode={$sort_mode}&find={$find|escape:"url"}&flag={$flag}&priority={$priority}&flagval={$flagval}&ticket={$ticket}&daconfirm=y">{tr}<i class="fa fa-flag" aria-hidden="true"></i>{/tr}</a> {else} - <a class="btn btn-link timeout" href="messu-read_sent.php?offset={$offset}&action=isFlagged&actionval=y&msgId={$msgId}&sort_mode={$sort_mode}&find={$find|escape:"url"}&flag={$flag}&priority={$priority}&flagval={$flagval}">{tr}<i class="fa fa-flag-o" aria-hidden="true"></i>{/tr}</a> + <a class="btn btn-link timeout" href="messu-read_sent.php?offset={$offset}&action=isFlagged&actionval=y&msgId={$msgId}&sort_mode={$sort_mode}&find={$find|escape:"url"}&flag={$flag}&priority={$priority}&flagval={$flagval}&ticket={$ticket}&daconfirm=y">{tr}<i class="fa fa-flag-o" aria-hidden="true"></i>{/tr}</a> {/if} </div> </div> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <li...@us...> - 2017-04-19 01:00:48
|
Revision: 62265 http://sourceforge.net/p/tikiwiki/code/62265 Author: lindonb Date: 2017-04-19 01:00:45 +0000 (Wed, 19 Apr 2017) Log Message: ----------- [REF] replace usage of include_ticket.tpl file with smarty ticket function Modified Paths: -------------- trunk/templates/admin/include_ads.tpl trunk/templates/admin/include_blogs.tpl trunk/templates/admin/include_calendar.tpl trunk/templates/admin/include_category.tpl trunk/templates/admin/include_comments.tpl trunk/templates/admin/include_community.tpl trunk/templates/admin/include_copyright.tpl trunk/templates/admin/include_directory.tpl trunk/templates/admin/include_faqs.tpl trunk/templates/admin/include_fgal.tpl trunk/templates/admin/include_forums.tpl trunk/templates/admin/include_freetags.tpl trunk/templates/admin/include_i18n.tpl trunk/templates/admin/include_intertiki.tpl trunk/templates/admin/include_look.tpl trunk/templates/admin/include_maps.tpl trunk/templates/admin/include_messages.tpl trunk/templates/admin/include_module.tpl trunk/templates/admin/include_payment.tpl trunk/templates/admin/include_polls.tpl trunk/templates/admin/include_print.tpl trunk/templates/admin/include_profiles.tpl trunk/templates/admin/include_rating.tpl trunk/templates/admin/include_rss.tpl trunk/templates/admin/include_search.tpl trunk/templates/admin/include_sefurl.tpl trunk/templates/admin/include_semantic.tpl trunk/templates/admin/include_socialnetworks.tpl trunk/templates/admin/include_stats.tpl trunk/templates/admin/include_trackers.tpl trunk/templates/admin/include_user.tpl trunk/templates/admin/include_video.tpl trunk/templates/admin/include_webmail.tpl trunk/templates/admin/include_webservices.tpl trunk/templates/admin/include_wikiatt.tpl trunk/templates/admin/include_workspace.tpl trunk/templates/admin/include_wysiwyg.tpl trunk/templates/error.tpl trunk/templates/messu-archive.tpl trunk/templates/messu-broadcast.tpl trunk/templates/messu-compose.tpl trunk/templates/messu-mailbox.tpl trunk/templates/messu-read.tpl trunk/templates/messu-read_archive.tpl trunk/templates/messu-read_sent.tpl trunk/templates/messu-sent.tpl trunk/templates/plugin/edit.tpl trunk/templates/tiki-accounting_account_form.tpl trunk/templates/tiki-accounting_books.tpl trunk/templates/tiki-accounting_entry.tpl trunk/templates/tiki-accounting_export.tpl trunk/templates/tiki-accounting_stack.tpl Modified: trunk/templates/admin/include_ads.tpl =================================================================== --- trunk/templates/admin/include_ads.tpl 2017-04-18 21:22:01 UTC (rev 62264) +++ trunk/templates/admin/include_ads.tpl 2017-04-19 01:00:45 UTC (rev 62265) @@ -1,6 +1,6 @@ {* $Id$ *} <form action="tiki-admin.php?page=ads" onreset="return(confirm("{tr}Cancel Edit{/tr}"))" class="admin form-horizontal" method="post"> - {include file='access/include_ticket.tpl'} + {ticket} <div class="row"> <div class="form-group col-lg-12 clearfix"> <a role="link" class="btn btn-link tips" href="tiki-list_banners.php" title=":{tr}Banners listing{/tr}"> Modified: trunk/templates/admin/include_blogs.tpl =================================================================== --- trunk/templates/admin/include_blogs.tpl 2017-04-18 21:22:01 UTC (rev 62264) +++ trunk/templates/admin/include_blogs.tpl 2017-04-19 01:00:45 UTC (rev 62265) @@ -1,6 +1,6 @@ {* $Id$ *} <form role="form" class="form-horizontal" action="tiki-admin.php?page=blogs" method="post"> - {include file='access/include_ticket.tpl'} + {ticket} <div class="t_navbar margin-bottom-md clearfix"> <a role="button" class="btn btn-link tips" href="tiki-list_blogs.php" title=":{tr}Blogs listing{/tr}"> {icon name="list"} {tr}Blogs{/tr} Modified: trunk/templates/admin/include_calendar.tpl =================================================================== --- trunk/templates/admin/include_calendar.tpl 2017-04-18 21:22:01 UTC (rev 62264) +++ trunk/templates/admin/include_calendar.tpl 2017-04-19 01:00:45 UTC (rev 62265) @@ -1,5 +1,5 @@ <form class="form-horizontal" action="tiki-admin.php?page=calendar" method="post"> - {include file='access/include_ticket.tpl'} + {ticket} <div class="t_navbar margin-bottom-md clearfix"> <a role="link" class="btn btn-link tips" href="tiki-admin_calendars.php" title=":{tr}Calendars listing{/tr}"> {icon name="list"} {tr}Calendars{/tr} Modified: trunk/templates/admin/include_category.tpl =================================================================== --- trunk/templates/admin/include_category.tpl 2017-04-18 21:22:01 UTC (rev 62264) +++ trunk/templates/admin/include_category.tpl 2017-04-19 01:00:45 UTC (rev 62265) @@ -1,6 +1,6 @@ {* $Id$ *} <form class="form-horizontal" action="tiki-admin.php?page=category" method="post"> - {include file='access/include_ticket.tpl'} + {ticket} <div class="row"> <div class="form-group col-lg-12 clearfix"> <a role="link" class="btn btn-link tips" href="tiki-browse_categories.php" title=":{tr}Categories listing{/tr}"> Modified: trunk/templates/admin/include_comments.tpl =================================================================== --- trunk/templates/admin/include_comments.tpl 2017-04-18 21:22:01 UTC (rev 62264) +++ trunk/templates/admin/include_comments.tpl 2017-04-19 01:00:45 UTC (rev 62265) @@ -1,6 +1,6 @@ {* $Id$ *} <form class="form-horizontal" action="tiki-admin.php?page=comments" method="post"> - {include file='access/include_ticket.tpl'} + {ticket} <div class="row"> <div class="form-group col-lg-12"> <a role="link" href="tiki-list_comments.php" class="btn btn-link tips" title=":{tr}Comments listing{/tr}">{icon name="list"} {tr}Comments{/tr}</a> Modified: trunk/templates/admin/include_community.tpl =================================================================== --- trunk/templates/admin/include_community.tpl 2017-04-18 21:22:01 UTC (rev 62264) +++ trunk/templates/admin/include_community.tpl 2017-04-19 01:00:45 UTC (rev 62265) @@ -1,6 +1,6 @@ {* $Id$ *} <form class="form-horizontal" action="tiki-admin.php?page=community" method="post"> - {include file='access/include_ticket.tpl'} + {ticket} <div class="t_navbar margin-bottom-md"> {button href="tiki-admingroups.php" _class="btn-link tips" _type="text" _icon_name="group" _text="{tr}Groups{/tr}" _title=":{tr}Group Administration{/tr}"} {button href="tiki-adminusers.php" _class="btn-link tips" _type="text" _icon_name="user" _text="{tr}Users{/tr}" _title=":{tr}User Administration{/tr}"} Modified: trunk/templates/admin/include_copyright.tpl =================================================================== --- trunk/templates/admin/include_copyright.tpl 2017-04-18 21:22:01 UTC (rev 62264) +++ trunk/templates/admin/include_copyright.tpl 2017-04-19 01:00:45 UTC (rev 62265) @@ -1,7 +1,7 @@ {* $Id$ *} {remarksbox type="tip" title="{tr}Tip{/tr}"}{tr}Allows a copyright to be determined for various objects{/tr}.{/remarksbox} <form role="form" class="form-horizontal" action="tiki-admin.php?page=copyright" method="post"> - {include file='access/include_ticket.tpl'} + {ticket} <div class="t_navbar margin-bottom-md clearfix"> {include file='admin/include_apply_top.tpl'} </div> Modified: trunk/templates/admin/include_directory.tpl =================================================================== --- trunk/templates/admin/include_directory.tpl 2017-04-18 21:22:01 UTC (rev 62264) +++ trunk/templates/admin/include_directory.tpl 2017-04-19 01:00:45 UTC (rev 62265) @@ -1,5 +1,5 @@ <form class="form-horizontal" action="tiki-admin.php?page=directory" method="post"> - {include file='access/include_ticket.tpl'} + {ticket} <div class="row"> <div class="form-group col-lg-12 clearfix"> <a role="link" class="btn btn-link tips" href="tiki-directory_admin.php" title=":{tr}Directories listing{/tr}"> Modified: trunk/templates/admin/include_faqs.tpl =================================================================== --- trunk/templates/admin/include_faqs.tpl 2017-04-18 21:22:01 UTC (rev 62264) +++ trunk/templates/admin/include_faqs.tpl 2017-04-19 01:00:45 UTC (rev 62265) @@ -1,6 +1,6 @@ {* $Id$ *} <form role="form" class="form-horizontal" action="tiki-admin.php?page=faqs" method="post"> - {include file='access/include_ticket.tpl'} + {ticket} <div class="t_navbar margin-bottom-md clearfix"> <a role="link" class="btn btn-link tips" href="tiki-list_faqs.php" title=":{tr}FAQ listing{/tr}"> {icon name="list"} {tr}FAQs{/tr} Modified: trunk/templates/admin/include_fgal.tpl =================================================================== --- trunk/templates/admin/include_fgal.tpl 2017-04-18 21:22:01 UTC (rev 62264) +++ trunk/templates/admin/include_fgal.tpl 2017-04-19 01:00:45 UTC (rev 62265) @@ -8,7 +8,7 @@ {/remarksbox} <form class="form-horizontal" action="tiki-admin.php?page=fgal" method="post"> - {include file='access/include_ticket.tpl'} + {ticket} <div class="row"> <div class="form-group col-lg-12 clearfix"> Modified: trunk/templates/admin/include_forums.tpl =================================================================== --- trunk/templates/admin/include_forums.tpl 2017-04-18 21:22:01 UTC (rev 62264) +++ trunk/templates/admin/include_forums.tpl 2017-04-19 01:00:45 UTC (rev 62265) @@ -1,6 +1,6 @@ {* $Id$ *} <form class="form-horizontal" method="post" action="tiki-admin.php?page=forums"> - {include file='access/include_ticket.tpl'} + {ticket} <div class="t_navbar margin-bottom-md clearfix"> <a role="button" class="btn btn-link tips" href="tiki-admin_forums.php" title=":{tr}Forums listing{/tr}"> {icon name="list"} {tr}Forums{/tr} Modified: trunk/templates/admin/include_freetags.tpl =================================================================== --- trunk/templates/admin/include_freetags.tpl 2017-04-18 21:22:01 UTC (rev 62264) +++ trunk/templates/admin/include_freetags.tpl 2017-04-19 01:00:45 UTC (rev 62265) @@ -1,5 +1,5 @@ <form class="form-horizontal" action="tiki-admin.php?page=freetags" method="post"> - {include file='access/include_ticket.tpl'} + {ticket} <div class="t_navbar margin-bottom-md"> <a role="link" class="btn btn-link tips" href="tiki-browse_freetags.php" title="{tr}Tags listing{/tr}"> {icon name="list"} {tr}Browse Tags{/tr} Modified: trunk/templates/admin/include_i18n.tpl =================================================================== --- trunk/templates/admin/include_i18n.tpl 2017-04-18 21:22:01 UTC (rev 62264) +++ trunk/templates/admin/include_i18n.tpl 2017-04-19 01:00:45 UTC (rev 62265) @@ -11,7 +11,7 @@ } {/jq} <form role="form" class="form-horizontal" action="tiki-admin.php?page=i18n" method="post"> - {include file='access/include_ticket.tpl'} + {ticket} <input type="hidden" name="i18nsetup" /> <div class="t_navbar margin-bottom-md clearfix"> {if $tiki_p_edit_languages eq 'y'} Modified: trunk/templates/admin/include_intertiki.tpl =================================================================== --- trunk/templates/admin/include_intertiki.tpl 2017-04-18 21:22:01 UTC (rev 62264) +++ trunk/templates/admin/include_intertiki.tpl 2017-04-19 01:00:45 UTC (rev 62265) @@ -1,6 +1,6 @@ {* $Id$ *} <form action="tiki-admin.php?page=intertiki" method="post" name="intertiki" class="form-horizontal"> - {include file='access/include_ticket.tpl'} + {ticket} {include file='admin/include_apply_top.tpl'} {tabset name="admin_interwiki"} {tab name="{tr}Intertiki Client{/tr}"} Modified: trunk/templates/admin/include_look.tpl =================================================================== --- trunk/templates/admin/include_look.tpl 2017-04-18 21:22:01 UTC (rev 62264) +++ trunk/templates/admin/include_look.tpl 2017-04-19 01:00:45 UTC (rev 62265) @@ -1,6 +1,6 @@ {* $Id$ *} <form action="tiki-admin.php?page=look" id="look" name="look" class="form-horizontal labelColumns" class="admin" method="post"> - {include file='access/include_ticket.tpl'} + {ticket} <div class="clearfix margin-bottom-md"> {if $prefs.feature_theme_control eq y} {button _text="{tr}Theme Control{/tr}" href="tiki-theme_control.php" _class="btn-sm tikihelp" } Modified: trunk/templates/admin/include_maps.tpl =================================================================== --- trunk/templates/admin/include_maps.tpl 2017-04-18 21:22:01 UTC (rev 62264) +++ trunk/templates/admin/include_maps.tpl 2017-04-19 01:00:45 UTC (rev 62265) @@ -1,5 +1,5 @@ <form class="form-horizontal" action="tiki-admin.php?page=maps" method="post" role="form"> - {include file='access/include_ticket.tpl'} + {ticket} <div class="row"> <div class="form-group col-lg-12 clearfix"> Modified: trunk/templates/admin/include_messages.tpl =================================================================== --- trunk/templates/admin/include_messages.tpl 2017-04-18 21:22:01 UTC (rev 62264) +++ trunk/templates/admin/include_messages.tpl 2017-04-19 01:00:45 UTC (rev 62265) @@ -1,7 +1,7 @@ {* $Id$ *} <form class="form-horizontal" action="tiki-admin.php?page=messages" method="post" name="messages"> - {include file='access/include_ticket.tpl'} + {ticket} <div class="row"> <div class="form-group col-lg-12 clearfix"> Modified: trunk/templates/admin/include_module.tpl =================================================================== --- trunk/templates/admin/include_module.tpl 2017-04-18 21:22:01 UTC (rev 62264) +++ trunk/templates/admin/include_module.tpl 2017-04-19 01:00:45 UTC (rev 62265) @@ -4,7 +4,7 @@ {/remarksbox} <form class="form-horizontal" action="tiki-admin.php?page=module" method="post"> - {include file='access/include_ticket.tpl'} + {ticket} <input type="hidden" name="modulesetup" /> <div class="row"> Modified: trunk/templates/admin/include_payment.tpl =================================================================== --- trunk/templates/admin/include_payment.tpl 2017-04-18 21:22:01 UTC (rev 62264) +++ trunk/templates/admin/include_payment.tpl 2017-04-19 01:00:45 UTC (rev 62265) @@ -1,6 +1,6 @@ {* $Id$ *} <form class="form-horizontal" action="tiki-admin.php?page=payment" method="post"> - {include file='access/include_ticket.tpl'} + {ticket} <div class="row"> <div class="form-group col-lg-12 clearfix"> <a role="link" class="btn btn-link" href="tiki-payment.php" title="{tr}List{/tr}"> Modified: trunk/templates/admin/include_polls.tpl =================================================================== --- trunk/templates/admin/include_polls.tpl 2017-04-18 21:22:01 UTC (rev 62264) +++ trunk/templates/admin/include_polls.tpl 2017-04-19 01:00:45 UTC (rev 62265) @@ -1,5 +1,5 @@ <form class="form-horizontal" method="post" action="tiki-admin.php?page=polls"> - {include file='access/include_ticket.tpl'} + {ticket} <div class="row"> <div class="form-group col-lg-12 clearfix"> {if $prefs.feature_polls eq "y" and $tiki_p_admin_polls eq "y"} Modified: trunk/templates/admin/include_print.tpl =================================================================== --- trunk/templates/admin/include_print.tpl 2017-04-18 21:22:01 UTC (rev 62264) +++ trunk/templates/admin/include_print.tpl 2017-04-19 01:00:45 UTC (rev 62265) @@ -1,6 +1,6 @@ {* $Id$ *} <form class="form-horizontal" action="tiki-admin.php?page=print" class="admin" method="post"> - {include file='access/include_ticket.tpl'} + {ticket} {include file='admin/include_apply_top.tpl'} <fieldset> <legend>{tr}PDF settings{/tr}</legend> Modified: trunk/templates/admin/include_profiles.tpl =================================================================== --- trunk/templates/admin/include_profiles.tpl 2017-04-18 21:22:01 UTC (rev 62264) +++ trunk/templates/admin/include_profiles.tpl 2017-04-19 01:00:45 UTC (rev 62265) @@ -263,7 +263,7 @@ {/remarksbox} {/if} <form method="get" action="tiki-admin.php?page=profiles"> - {include file='access/include_ticket.tpl'} + {ticket} <h4>{tr}Find profiles{/tr} <small>{tr}Search by name, types and repository{/tr}</small></h4> <div class="row"> <div class="col-sm-6"> @@ -390,7 +390,7 @@ {tab name="{tr}Export{/tr}"} <br> <form class="form-horizontal" action="tiki-admin.php?page=profiles" method="post" role="form"> - {include file='access/include_ticket.tpl'} + {ticket} <input type="hidden" name="redirect" value=0> <fieldset id="export_to_yaml"> <legend>{tr}Export YAML{/tr}</legend> @@ -521,7 +521,7 @@ {/foreach} </table> <form class="form-horizontal" action="tiki-admin.php?page=profiles" method="post"> - {include file='access/include_ticket.tpl'} + {ticket} {preference name=profile_unapproved} {preference name=profile_sources} {preference name=profile_channels} @@ -532,7 +532,7 @@ </fieldset> <fieldset><legend>{tr}Profile tester{/tr}</legend> <form class="form-horizontal" action="tiki-admin.php?page=profiles" method="post"> - {include file='access/include_ticket.tpl'} + {ticket} <input type="hidden" name="redirect" value=0> {remarksbox type="warning" title="{tr}Warning{/tr}"} {tr}Paste or type wiki markup and YAML (with or without the {literal}{CODE}{/literal} tags) into the text area below{/tr}<br> Modified: trunk/templates/admin/include_rating.tpl =================================================================== --- trunk/templates/admin/include_rating.tpl 2017-04-18 21:22:01 UTC (rev 62264) +++ trunk/templates/admin/include_rating.tpl 2017-04-19 01:00:45 UTC (rev 62265) @@ -1,7 +1,7 @@ {* $Id$ *} <form class="admin form-horizontal" id="performance" name="performance" action="tiki-admin.php?page=rating" method="post"> - {include file='access/include_ticket.tpl'} + {ticket} <div class="row"> <div class="form-group col-lg-12 clearfix"> {include file='admin/include_apply_top.tpl'} @@ -83,7 +83,7 @@ <div id="rating_advanced_childcontainer"> {foreach from=$configurations item=config} <form class="config" method="post" action=""> - {include file='access/include_ticket.tpl'} + {ticket} <fieldset> <legend>{$config.name|escape} <small>(ID: {$config.ratingConfigId|escape}, Search Field: <em>adv_rating_{$config.ratingConfigId|escape}</em>)</small></legend> <input type="hidden" name="config" value="{$config.ratingConfigId|escape}"> @@ -125,7 +125,7 @@ </form><br> {/foreach} <form method="post" action=""> - {include file='access/include_ticket.tpl'} + {ticket} <fieldset> <legend>{tr}Create new{/tr}</legend> <label class="control-label col-sm-4" for="rating_config_new"> Modified: trunk/templates/admin/include_rss.tpl =================================================================== --- trunk/templates/admin/include_rss.tpl 2017-04-18 21:22:01 UTC (rev 62264) +++ trunk/templates/admin/include_rss.tpl 2017-04-19 01:00:45 UTC (rev 62265) @@ -2,7 +2,7 @@ {tr}Use this page to configure the feeds generated by Tiki. To syndicate feeds from other sites, use <a class="alert-link" href="tiki-admin_rssmodules.php" title="{tr}External Feeds{/tr}">{tr}External Feeds{/tr}</a>.{/tr} {/remarksbox} <form class="form-horizontal" action="tiki-admin.php?page=rss" method="post"> - {include file='access/include_ticket.tpl'} + {ticket} <div class="t_navbar margin-bottom-md clearfix"> <a role="button" class="btn btn-link" href="tiki-admin_rssmodules.php" title="{tr}List{/tr}"> {icon name="list"} {tr}External Feeds{/tr} Modified: trunk/templates/admin/include_search.tpl =================================================================== --- trunk/templates/admin/include_search.tpl 2017-04-18 21:22:01 UTC (rev 62264) +++ trunk/templates/admin/include_search.tpl 2017-04-19 01:00:45 UTC (rev 62265) @@ -14,7 +14,7 @@ <form class="form-horizontal" action="tiki-admin.php?page=search" method="post"> - {include file='access/include_ticket.tpl'} + {ticket} <div class="row"> <div class="form-group col-lg-12 clearfix"> Modified: trunk/templates/admin/include_sefurl.tpl =================================================================== --- trunk/templates/admin/include_sefurl.tpl 2017-04-18 21:22:01 UTC (rev 62264) +++ trunk/templates/admin/include_sefurl.tpl 2017-04-19 01:00:45 UTC (rev 62265) @@ -3,7 +3,7 @@ {tr}See also{/tr} <a class="alert-link" href="tiki-admin.php?page=metatags">{tr}Meta tags{/tr}</a>. {/remarksbox} <form class="admin form-horizontal" method="post" action="tiki-admin.php?page=sefurl" role="form" class="form"> - {include file='access/include_ticket.tpl'} + {ticket} <div class="t_navbar clearfix"> {include file='admin/include_apply_top.tpl'} </div> Modified: trunk/templates/admin/include_semantic.tpl =================================================================== --- trunk/templates/admin/include_semantic.tpl 2017-04-18 21:22:01 UTC (rev 62264) +++ trunk/templates/admin/include_semantic.tpl 2017-04-19 01:00:45 UTC (rev 62265) @@ -1,5 +1,5 @@ <form class="form-horizontal" action="tiki-admin.php?page=semantic" method="post"> - {include file='access/include_ticket.tpl'} + {ticket} <div class="row"> <div class="form-group col-lg-12 clearfix"> {include file='admin/include_apply_top.tpl'} @@ -18,7 +18,7 @@ <td> <legend>{tr}Known types{/tr}</legend> <form method="post" action="{$smarty.server.REQUEST_URI|escape}"> - {include file='access/include_ticket.tpl'} + {ticket} <table class="table"> <tr> @@ -45,7 +45,7 @@ {if $selected_token} <form method="post" action="{$smarty.server.REQUEST_URI}"> - {include file='access/include_ticket.tpl'} + {ticket} <div>{$save_message|escape}</div> <div> <label for="token">{tr}Token{/tr} :</label> @@ -83,7 +83,7 @@ <td>{$token|escape}</td> <td> <form method="post" action="{$smarty.server.REQUEST_URI}"> - {include file='access/include_ticket.tpl'} + {ticket} <div> <input type="hidden" name="select[]" value="{$token|escape}"> <input type="hidden" name="token" value="{$token|escape}"> @@ -99,7 +99,7 @@ </table> {if $rename} <form method="post" action="{$smarty.server.REQUEST_URI}"> - {include file='access/include_ticket.tpl'} + {ticket} <div> <label for="token">{tr}Token{/tr} :</label> <input id="token" type="text" name="token" value="{$rename|escape}"> Modified: trunk/templates/admin/include_socialnetworks.tpl =================================================================== --- trunk/templates/admin/include_socialnetworks.tpl 2017-04-18 21:22:01 UTC (rev 62264) +++ trunk/templates/admin/include_socialnetworks.tpl 2017-04-19 01:00:45 UTC (rev 62265) @@ -1,5 +1,5 @@ <form class="form-horizontal" action="tiki-admin.php?page=socialnetworks" method="post"> - {include file='access/include_ticket.tpl'} + {ticket} <div class="row"> <div class="form-group col-lg-12 clearfix"> Modified: trunk/templates/admin/include_stats.tpl =================================================================== --- trunk/templates/admin/include_stats.tpl 2017-04-18 21:22:01 UTC (rev 62264) +++ trunk/templates/admin/include_stats.tpl 2017-04-19 01:00:45 UTC (rev 62265) @@ -3,7 +3,7 @@ {/remarksbox} <form class="admin form-horizontal" action="tiki-admin.php?page=stats" method="post"> - {include file='access/include_ticket.tpl'} + {ticket} <div class="row"> <div class="form-group col-lg-12 clearfix"> {include file='admin/include_apply_top.tpl'} Modified: trunk/templates/admin/include_trackers.tpl =================================================================== --- trunk/templates/admin/include_trackers.tpl 2017-04-18 21:22:01 UTC (rev 62264) +++ trunk/templates/admin/include_trackers.tpl 2017-04-19 01:00:45 UTC (rev 62265) @@ -1,5 +1,5 @@ <form class="form-horizontal" action="tiki-admin.php?page=trackers" method="post"> - {include file='access/include_ticket.tpl'} + {ticket} <div class="row"> <div class="form-group col-lg-12 clearfix"> @@ -130,7 +130,7 @@ <div class="table"> {if $attachements} <form action="tiki-admin.php?page=trackers" method="post"> - {include file='access/include_ticket.tpl'} + {ticket} <input type="text" name="find" value="{$find|escape}"> <input type="submit" class="btn btn-default btn-sm timeout" name="action" value="{tr}Find{/tr}"> </form> @@ -199,7 +199,7 @@ <tr> <td> <form action="tiki-admin.php?page=trackers" method="post"> - {include file='access/include_ticket.tpl'} + {ticket} <input type="hidden" name="all2db" value="1"> <input type="submit" class="btn btn-default btn-sm timeout" name="action" value="{tr}Change all to db{/tr}"> </form> @@ -206,7 +206,7 @@ </td> <td> <form action="tiki-admin.php?page=trackers" method="post"> - {include file='access/include_ticket.tpl'} + {ticket} <input type="hidden" name="all2file" value="1"> <input type="submit" class="btn btn-default btn-sm timeout" name="action" value="{tr}Change all to file{/tr}"> </form> Modified: trunk/templates/admin/include_user.tpl =================================================================== --- trunk/templates/admin/include_user.tpl 2017-04-18 21:22:01 UTC (rev 62264) +++ trunk/templates/admin/include_user.tpl 2017-04-19 01:00:45 UTC (rev 62265) @@ -1,6 +1,6 @@ {* $Id$ *} <form class="form-horizontal" action="tiki-admin.php?page=user" class="admin" method="post"> - {include file='access/include_ticket.tpl'} + {ticket} <div class="form-group col-lg-12 clearfix"> {include file='admin/include_apply_top.tpl'} </div> Modified: trunk/templates/admin/include_video.tpl =================================================================== --- trunk/templates/admin/include_video.tpl 2017-04-18 21:22:01 UTC (rev 62264) +++ trunk/templates/admin/include_video.tpl 2017-04-19 01:00:45 UTC (rev 62265) @@ -1,5 +1,5 @@ <form class="form-horizontal" action="tiki-admin.php?page=video" method="post"> - {include file='access/include_ticket.tpl'} + {ticket} {tabset name="admin_video"} Modified: trunk/templates/admin/include_webmail.tpl =================================================================== --- trunk/templates/admin/include_webmail.tpl 2017-04-18 21:22:01 UTC (rev 62264) +++ trunk/templates/admin/include_webmail.tpl 2017-04-19 01:00:45 UTC (rev 62265) @@ -1,5 +1,5 @@ <form class="form-horizontal" action="tiki-admin.php?page=webmail" method="post"> - {include file='access/include_ticket.tpl'} + {ticket} <div class="row"> <div class="form-group col-lg-12 clearfix"> <a role="button" class="btn btn-link" href="tiki-webmail.php" title="{tr}Webmail{/tr}"> Modified: trunk/templates/admin/include_webservices.tpl =================================================================== --- trunk/templates/admin/include_webservices.tpl 2017-04-18 21:22:01 UTC (rev 62264) +++ trunk/templates/admin/include_webservices.tpl 2017-04-19 01:00:45 UTC (rev 62265) @@ -1,6 +1,6 @@ {* $ID:$ *} <form method="post" action="tiki-admin.php?page=webservices" class="form-horizontal"> - {include file='access/include_ticket.tpl'} + {ticket} <div class="row"> <div class="form-group col-lg-12 clearfix"> Modified: trunk/templates/admin/include_wikiatt.tpl =================================================================== --- trunk/templates/admin/include_wikiatt.tpl 2017-04-18 21:22:01 UTC (rev 62264) +++ trunk/templates/admin/include_wikiatt.tpl 2017-04-19 01:00:45 UTC (rev 62265) @@ -1,7 +1,7 @@ <fieldset class="table"> <legend>{tr}Wiki attachments{/tr}</legend> <form action="tiki-admin.php?page=wikiatt" method="post"> - {include file='access/include_ticket.tpl'} + {ticket} <input type="text" name="find" value="{$find|escape}"> <input type="submit" class="btn btn-default btn-sm timeout" name="action" value="{tr}Find{/tr}"> </form> @@ -49,7 +49,7 @@ <tr> <td> <form action="tiki-admin.php?page=wikiatt" method="post"> - {include file='access/include_ticket.tpl'} + {ticket} <input type="hidden" name="all2db" value="1"> <input type="submit" class="btn btn-default btn-sm timeout" name="action" value="{tr}Change all to db{/tr}"> </form> @@ -56,7 +56,7 @@ </td> <td> <form action="tiki-admin.php?page=wikiatt" method="post"> - {include file='access/include_ticket.tpl'} + {ticket} <input type="hidden" name="all2file" value="1"> <input type="submit" class="btn btn-default btn-sm timeout" name="action" value="{tr}Change all to file{/tr}"> </form> Modified: trunk/templates/admin/include_workspace.tpl =================================================================== --- trunk/templates/admin/include_workspace.tpl 2017-04-18 21:22:01 UTC (rev 62264) +++ trunk/templates/admin/include_workspace.tpl 2017-04-19 01:00:45 UTC (rev 62265) @@ -1,6 +1,6 @@ {* $Id$ *} <form class="form-horizontal" action="tiki-admin.php?page=workspace" method="post"> - {include file='access/include_ticket.tpl'} + {ticket} <div class="clearfix margin-bottom-md"> {if $prefs.workspace_ui eq "y"} <a class="btn btn-default btn-sm" href="{service controller=workspace action=list_templates}" title="{tr}List{/tr}"> Modified: trunk/templates/admin/include_wysiwyg.tpl =================================================================== --- trunk/templates/admin/include_wysiwyg.tpl 2017-04-18 21:22:01 UTC (rev 62264) +++ trunk/templates/admin/include_wysiwyg.tpl 2017-04-19 01:00:45 UTC (rev 62265) @@ -1,7 +1,7 @@ {* $Id$ *} {remarksbox type="tip" title="{tr}Tip{/tr}"}{tr}WYSIWYG means What You See Is What You Get, and is handled in Tiki by <a class="alert-link" href="http://ckeditor.com/">CKEditor</a>{/tr}.{/remarksbox} <form class="form-horizontal" action="tiki-admin.php?page=wysiwyg" method="post"> - {include file='access/include_ticket.tpl'} + {ticket} <div class="t_navbar margin-bottom-md"> <a role="button" class="btn btn-link" href="tiki-admin_toolbars.php" title="{tr}Toolbars{/tr}"> {icon name="settings"} {tr}Toolbars{/tr} Modified: trunk/templates/error.tpl =================================================================== --- trunk/templates/error.tpl 2017-04-18 21:22:01 UTC (rev 62264) +++ trunk/templates/error.tpl 2017-04-19 01:00:45 UTC (rev 62265) @@ -81,7 +81,7 @@ {if !empty($required_preferences)} {remarksbox type='note' title="{tr}Settings{/tr}" close="n"} <form method="post" action="tiki-admin.php" role="form" class="form"> - {include file='access/include_ticket.tpl'} + {ticket} {foreach from=$required_preferences item=pref} {preference name=$pref} {/foreach} Modified: trunk/templates/messu-archive.tpl =================================================================== --- trunk/templates/messu-archive.tpl 2017-04-18 21:22:01 UTC (rev 62264) +++ trunk/templates/messu-archive.tpl 2017-04-19 01:00:45 UTC (rev 62265) @@ -45,7 +45,7 @@ <form action="messu-archive.php" method="post" name="form_messu_archive"> - {include file='access/include_ticket.tpl'} + {ticket} <div class="form-group"> <input type="hidden" name="offset" value="{$offset|escape}"> <input type="hidden" name="find" value="{$find|escape}"> Modified: trunk/templates/messu-broadcast.tpl =================================================================== --- trunk/templates/messu-broadcast.tpl 2017-04-18 21:22:01 UTC (rev 62264) +++ trunk/templates/messu-broadcast.tpl 2017-04-19 01:00:45 UTC (rev 62265) @@ -16,7 +16,7 @@ {if $preview eq '1'} <br> <form method="post"> - {include file='access/include_ticket.tpl'} + {ticket} <input type="hidden" name="groupbr" value="{$groupbr|escape}"> <input type="hidden" name="priority" value="{$priority|escape}"> <input type="hidden" name="replyto_hash" value="{$replyto_hash|escape}"> @@ -30,7 +30,7 @@ {if $sent ne '1' and $preview ne '1'} <form class="form-horizontal" role="form" action="messu-broadcast.php" method="post"> - {include file='access/include_ticket.tpl'} + {ticket} <div class="form-group"> <label class="col-sm-2 control-label" for="broadcast-group">{tr}Group{/tr}</label> <div class="col-sm-10"> Modified: trunk/templates/messu-compose.tpl =================================================================== --- trunk/templates/messu-compose.tpl 2017-04-18 21:22:01 UTC (rev 62264) +++ trunk/templates/messu-compose.tpl 2017-04-19 01:00:45 UTC (rev 62265) @@ -30,7 +30,7 @@ {jq}$(".username").tiki("autocomplete", "username", {multiple: true, multipleSeparator: ";"});{/jq} {/if} <form action="messu-compose.php" method="post" class="form-horizontal" role="form"> - {include file='access/include_ticket.tpl'} + {ticket} <div class="form-group"> <label class="col-sm-2 control-label" for="mess-composeto">{tr}To{/tr} {help url="Inter-User+Messages#Composing_messages" desc="{tr}To: Multiple addresses can be separated with a semicolon (';') or comma (','){/tr}"} Modified: trunk/templates/messu-mailbox.tpl =================================================================== --- trunk/templates/messu-mailbox.tpl 2017-04-18 21:22:01 UTC (rev 62264) +++ trunk/templates/messu-mailbox.tpl 2017-04-19 01:00:45 UTC (rev 62265) @@ -44,7 +44,7 @@ <form class="form-inline" action="messu-mailbox.php" method="post" name="form_messu_mailbox"> - {include file='access/include_ticket.tpl'} + {ticket} <input type="hidden" name="offset" value="{$offset|escape}"> <input type="hidden" name="find" value="{$find|escape}"> <input type="hidden" name="sort_mode" value="{$sort_mode|escape}"> Modified: trunk/templates/messu-read.tpl =================================================================== --- trunk/templates/messu-read.tpl 2017-04-18 21:22:01 UTC (rev 62264) +++ trunk/templates/messu-read.tpl 2017-04-19 01:00:45 UTC (rev 62265) @@ -34,7 +34,7 @@ <div class="col-xs-8 col-sm-7" style="padding-top: 4px;"> <div class="col-xs-4 col-sm-3 col-sm-offset-3 col-lg-2 col-lg-offset-6"> <form method="post" action="messu-compose.php"> - {include file='access/include_ticket.tpl'} + {ticket} <input type="hidden" name="offset" value="{$offset|escape}"> <input type="hidden" name="msgId" value="{$msgId|escape}"> <input type="hidden" name="find" value="{$find|escape}"> @@ -51,7 +51,7 @@ </div> <div class="col-xs-4 col-sm-3 col-lg-2"> <form method="post" action="messu-compose.php"> - {include file='access/include_ticket.tpl'} + {ticket} <input type="hidden" name="offset" value="{$offset|escape}"> <input type="hidden" name="find" value="{$find|escape}"> <input type="hidden" name="msgId" value="{$msgId|escape}"> @@ -73,7 +73,7 @@ </div> <div class="col-xs-4 col-sm-3 col-lg-2"> <form method="post" action="messu-read.php"> - {include file='access/include_ticket.tpl'} + {ticket} <input type="hidden" name="offset" value="{$offset|escape}"> <input type="hidden" name="find" value="{$find|escape}"> <input type="hidden" name="sort_mode" value="{$sort_mode|escape}"> Modified: trunk/templates/messu-read_archive.tpl =================================================================== --- trunk/templates/messu-read_archive.tpl 2017-04-18 21:22:01 UTC (rev 62264) +++ trunk/templates/messu-read_archive.tpl 2017-04-19 01:00:45 UTC (rev 62265) @@ -34,7 +34,7 @@ </div> <div class="col-xs-3 col-xs-offset-4 col-md-2 col-md-offset-5" style="padding-top: 4px;"> <form method="post" action="messu-read_archive.php"> - {include file='access/include_ticket.tpl'} + {ticket} <input type="hidden" name="offset" value="{$offset|escape}"> <input type="hidden" name="find" value="{$find|escape}"> <input type="hidden" name="sort_mode" value="{$sort_mode|escape}"> Modified: trunk/templates/messu-read_sent.tpl =================================================================== --- trunk/templates/messu-read_sent.tpl 2017-04-18 21:22:01 UTC (rev 62264) +++ trunk/templates/messu-read_sent.tpl 2017-04-19 01:00:45 UTC (rev 62265) @@ -34,7 +34,7 @@ </div> <div class="col-xs-3 col-xs-offset-4 col-md-2 col-md-offset-5" style="padding-top: 4px;"> <form method="post" action="messu-read_sent.php"> - {include file='access/include_ticket.tpl'} + {ticket} <input type="hidden" name="offset" value="{$offset|escape}"> <input type="hidden" name="find" value="{$find|escape}"> <input type="hidden" name="sort_mode" value="{$sort_mode|escape}"> Modified: trunk/templates/messu-sent.tpl =================================================================== --- trunk/templates/messu-sent.tpl 2017-04-18 21:22:01 UTC (rev 62264) +++ trunk/templates/messu-sent.tpl 2017-04-19 01:00:45 UTC (rev 62265) @@ -44,7 +44,7 @@ </form> <form action="messu-sent.php" method="post" name="form_messu_sent"> - {include file='access/include_ticket.tpl'} + {ticket} <div class="form-group"> <input type="hidden" name="offset" value="{$offset|escape}"> <input type="hidden" name="find" value="{$find|escape}"> Modified: trunk/templates/plugin/edit.tpl =================================================================== --- trunk/templates/plugin/edit.tpl 2017-04-18 21:22:01 UTC (rev 62264) +++ trunk/templates/plugin/edit.tpl 2017-04-19 01:00:45 UTC (rev 62265) @@ -80,7 +80,7 @@ {/function} <div class="form-horizontal" id="plugin_params"> <form action="{service controller='plugin' action='edit'}" method="post"> - {include file='access/include_ticket.tpl'} + {ticket} {foreach $info.params as $name => $param} <div class="form-group{if $param.advanced} advanced{/if}" id="param_{$name|escape}"> {plugin_edit_row param=$param name=$name info=$info pluginArgs=$pluginArgs} Modified: trunk/templates/tiki-accounting_account_form.tpl =================================================================== --- trunk/templates/tiki-accounting_account_form.tpl 2017-04-18 21:22:01 UTC (rev 62264) +++ trunk/templates/tiki-accounting_account_form.tpl 2017-04-19 01:00:45 UTC (rev 62265) @@ -15,7 +15,7 @@ {/if} <div id="account_form"> <form method="post" action="tiki-accounting_account.php"> - {include file='access/include_ticket.tpl'} + {ticket} <input type="hidden" name="action" value="{$action}"> <input type="hidden" name="bookId" value="{$bookId}"> <input type="hidden" name="accountId" value="{$account.accountId}"> Modified: trunk/templates/tiki-accounting_books.tpl =================================================================== --- trunk/templates/tiki-accounting_books.tpl 2017-04-18 21:22:01 UTC (rev 62264) +++ trunk/templates/tiki-accounting_books.tpl 2017-04-19 01:00:45 UTC (rev 62265) @@ -42,7 +42,7 @@ <h2>{tr}Create a book{/tr}</h2> <div id="createbookform"> <form action="tiki-accounting_books.php" method="post"> - {include file='access/include_ticket.tpl'} + {ticket} <input type="hidden" name="action" value="create"> <input type="hidden" name="bookClosed" id="bookClosed" value="n"> <h1>{tr}Create a book{/tr}</h1> Modified: trunk/templates/tiki-accounting_entry.tpl =================================================================== --- trunk/templates/tiki-accounting_entry.tpl 2017-04-18 21:22:01 UTC (rev 62264) +++ trunk/templates/tiki-accounting_entry.tpl 2017-04-19 01:00:45 UTC (rev 62265) @@ -67,7 +67,7 @@ </div> <div id="mask" style="float:left;"> <form method="post" action="tiki-accounting_entry.php"> - {include file='access/include_ticket.tpl'} + {ticket} {if $firstid}<input type="hidden" name="firstid" value="{$firstid}">{/if} {if $statementId}<input type="hidden" name="statementId" value="{$statementId}">{/if} <input type="hidden" name="bookId" value="{$bookId}"> Modified: trunk/templates/tiki-accounting_export.tpl =================================================================== --- trunk/templates/tiki-accounting_export.tpl 2017-04-18 21:22:01 UTC (rev 62264) +++ trunk/templates/tiki-accounting_export.tpl 2017-04-19 01:00:45 UTC (rev 62265) @@ -4,7 +4,7 @@ {/title} <div id="export"> <form action="tiki-accounting_export.php" method="post"> - {include file='access/include_ticket.tpl'} + {ticket} <input type="hidden" name="action" value="export"> <input type="hidden" name="what" value="{$what}"> <input type="hidden" name="bookId" value="{$bookId}"> Modified: trunk/templates/tiki-accounting_stack.tpl =================================================================== --- trunk/templates/tiki-accounting_stack.tpl 2017-04-18 21:22:01 UTC (rev 62264) +++ trunk/templates/tiki-accounting_stack.tpl 2017-04-19 01:00:45 UTC (rev 62265) @@ -69,7 +69,7 @@ </div> <div id="mask" style="float:left;{if $hideform==1} display: none;{/if}"> <form method="post" action="tiki-accounting_stack.php"> - {include file='access/include_ticket.tpl'} + {ticket} {if $firstid}<input type="hidden" name="firstid" value="{$firstid}">{/if} {if $statementId}<input type="hidden" name="statementId" value="{$statementId}">{/if} <input type="hidden" name="bookId" value="{$bookId}"> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <li...@us...> - 2017-04-19 01:28:31
|
Revision: 62268 http://sourceforge.net/p/tikiwiki/code/62268 Author: lindonb Date: 2017-04-19 01:28:29 +0000 (Wed, 19 Apr 2017) Log Message: ----------- [REF] replace manual uses of ticket with smarty ticket function Modified Paths: -------------- trunk/templates/access/include_hidden.tpl trunk/templates/admin/admin_navbar.tpl trunk/templates/confirm.tpl trunk/templates/messu-read.tpl trunk/templates/messu-read_archive.tpl trunk/templates/messu-read_sent.tpl trunk/templates/tiki-accounting.tpl trunk/templates/tiki-accounting_account_form.tpl trunk/templates/tiki-accounting_account_list.tpl trunk/templates/tiki-accounting_account_view.tpl trunk/templates/tiki-accounting_books.tpl trunk/templates/tiki-accounting_entry.tpl trunk/templates/tiki-accounting_journal.tpl trunk/templates/tiki-accounting_stack.tpl trunk/templates/tiki-accounting_stacklist.tpl Modified: trunk/templates/access/include_hidden.tpl =================================================================== --- trunk/templates/access/include_hidden.tpl 2017-04-19 01:07:09 UTC (rev 62267) +++ trunk/templates/access/include_hidden.tpl 2017-04-19 01:28:29 UTC (rev 62268) @@ -10,7 +10,4 @@ {$encodedToList = json_encode($toList)} <input type='hidden' name='toList' value="{$encodedToList|escape}"> {/if} -{if !empty($ticket)} - <input type="hidden" name="ticket" value="{$ticket|escape:'url'}"> -{/if} -<input type="hidden" name="daconfirm" value="y"> \ No newline at end of file +{ticket} \ No newline at end of file Modified: trunk/templates/admin/admin_navbar.tpl =================================================================== --- trunk/templates/admin/admin_navbar.tpl 2017-04-19 01:07:09 UTC (rev 62267) +++ trunk/templates/admin/admin_navbar.tpl 2017-04-19 01:28:29 UTC (rev 62268) @@ -147,8 +147,7 @@ <input class="btn btn-primary" type="submit" title="{tr}Apply Changes{/tr}" value="{tr}Apply{/tr}"> </div> <input type="hidden" name="lm_criteria" value="{$lm_criteria|escape}"> - <input type="hidden" name="daconfirm" value="y"> - <input type="hidden" name="ticket" value="{$ticket|escape:'url'}"> + {ticket} </form> </div> {jq} Modified: trunk/templates/confirm.tpl =================================================================== --- trunk/templates/confirm.tpl 2017-04-19 01:07:09 UTC (rev 62267) +++ trunk/templates/confirm.tpl 2017-04-19 01:28:29 UTC (rev 62268) @@ -11,7 +11,8 @@ <div class="panel-body"> <form id='confirm' action="{$confirmaction|escape}" method="post"> <div> - {query _type='form_input' _keepall='y' ticket="{$ticket|escape:'url'}" daconfirm='y'} + {query _type='form_input' _keepall='y'} + {ticket} {button href="#" _onclick="javascript:document.forms['confirm'].submit();return false;" _text="{tr}Click here to confirm your action{/tr}" _ajax="n"} {button href="#" _onclick="javascript:history.back(); return false;" _text="{tr}Go back{/tr}" _ajax="n"} {button href=$prefs.tikiIndex _text="{tr}Return to home page{/tr}"} Modified: trunk/templates/messu-read.tpl =================================================================== --- trunk/templates/messu-read.tpl 2017-04-19 01:07:09 UTC (rev 62267) +++ trunk/templates/messu-read.tpl 2017-04-19 01:28:29 UTC (rev 62268) @@ -24,9 +24,9 @@ </div> <div class="col-xs-4 col-sm-2"> {if $msg.isFlagged eq 'y'} - <a class="btn btn-link timeout" href="messu-read.php?offset={$offset}&action=isFlagged&actionval=n&msgId={$msgId}&sort_mode={$sort_mode}&find={$find|escape:"url"}&flag={$flag}&priority={$priority}&flagval={$flagval}&ticket={$ticket|escape:'url'}&daconfirm=y">{tr}<i class="fa fa-flag" aria-hidden="true"></i>{/tr}</a> + <a class="btn btn-link timeout" href="messu-read.php?offset={$offset}&action=isFlagged&actionval=n&msgId={$msgId}&sort_mode={$sort_mode}&find={$find|escape:"url"}&flag={$flag}&priority={$priority}&flagval={$flagval}{ticket mode=get}">{tr}<i class="fa fa-flag" aria-hidden="true"></i>{/tr}</a> {else} - <a class="btn btn-link timeout" href="messu-read.php?offset={$offset}&action=isFlagged&actionval=y&msgId={$msgId}&sort_mode={$sort_mode}&find={$find|escape:"url"}&flag={$flag}&priority={$priority}&flagval={$flagval}&ticket={$ticket|escape:'url'}&daconfirm=y">{tr}<i class="fa fa-flag-o" aria-hidden="true"></i>{/tr}</a> + <a class="btn btn-link timeout" href="messu-read.php?offset={$offset}&action=isFlagged&actionval=y&msgId={$msgId}&sort_mode={$sort_mode}&find={$find|escape:"url"}&flag={$flag}&priority={$priority}&flagval={$flagval}{ticket mode=get}">{tr}<i class="fa fa-flag-o" aria-hidden="true"></i>{/tr}</a> {/if} </div> </div> Modified: trunk/templates/messu-read_archive.tpl =================================================================== --- trunk/templates/messu-read_archive.tpl 2017-04-19 01:07:09 UTC (rev 62267) +++ trunk/templates/messu-read_archive.tpl 2017-04-19 01:28:29 UTC (rev 62268) @@ -25,9 +25,9 @@ </div> <div class="col-xs-4 col-sm-2"> {if $msg.isFlagged eq 'y'} - <a class="btn btn-link timeout" href="messu-read_archive.php?offset={$offset}&action=isFlagged&actionval=n&msgId={$msgId}&sort_mode={$sort_mode}&find={$find|escape:"url"}&flag={$flag}&priority={$priority}&flagval={$flagval}&ticket={$ticket|escape:'url'}&daconfirm=y">{tr}<i class="fa fa-flag" aria-hidden="true"></i>{/tr}</a> + <a class="btn btn-link timeout" href="messu-read_archive.php?offset={$offset}&action=isFlagged&actionval=n&msgId={$msgId}&sort_mode={$sort_mode}&find={$find|escape:"url"}&flag={$flag}&priority={$priority}&flagval={$flagval}{ticket mode=get}">{tr}<i class="fa fa-flag" aria-hidden="true"></i>{/tr}</a> {else} - <a class="btn btn-link timeout" href="messu-read_archive.php?offset={$offset}&action=isFlagged&actionval=y&msgId={$msgId}&sort_mode={$sort_mode}&find={$find|escape:"url"}&flag={$flag|escape:"url"}&priority={$priority}&flagval={$flagval}&ticket={$ticket|escape:'url'}&daconfirm=y">{tr}<i class="fa fa-flag-o" aria-hidden="true"></i>{/tr}</a> + <a class="btn btn-link timeout" href="messu-read_archive.php?offset={$offset}&action=isFlagged&actionval=y&msgId={$msgId}&sort_mode={$sort_mode}&find={$find|escape:"url"}&flag={$flag|escape:"url"}&priority={$priority}&flagval={$flagval}{ticket mode=get}">{tr}<i class="fa fa-flag-o" aria-hidden="true"></i>{/tr}</a> {/if} </div> </div> Modified: trunk/templates/messu-read_sent.tpl =================================================================== --- trunk/templates/messu-read_sent.tpl 2017-04-19 01:07:09 UTC (rev 62267) +++ trunk/templates/messu-read_sent.tpl 2017-04-19 01:28:29 UTC (rev 62268) @@ -25,9 +25,9 @@ </div> <div class="col-xs-4 col-sm-2"> {if $msg.isFlagged eq 'y'} - <a class="btn btn-link timeout" href="messu-read_sent.php?offset={$offset}&action=isFlagged&actionval=n&msgId={$msgId}&sort_mode={$sort_mode}&find={$find|escape:"url"}&flag={$flag}&priority={$priority}&flagval={$flagval}&ticket={$ticket|escape:'url'}&daconfirm=y">{tr}<i class="fa fa-flag" aria-hidden="true"></i>{/tr}</a> + <a class="btn btn-link timeout" href="messu-read_sent.php?offset={$offset}&action=isFlagged&actionval=n&msgId={$msgId}&sort_mode={$sort_mode}&find={$find|escape:"url"}&flag={$flag}&priority={$priority}&flagval={$flagval}{ticket mode=get}">{tr}<i class="fa fa-flag" aria-hidden="true"></i>{/tr}</a> {else} - <a class="btn btn-link timeout" href="messu-read_sent.php?offset={$offset}&action=isFlagged&actionval=y&msgId={$msgId}&sort_mode={$sort_mode}&find={$find|escape:"url"}&flag={$flag}&priority={$priority}&flagval={$flagval}&ticket={$ticket|escape:'url'}&daconfirm=y">{tr}<i class="fa fa-flag-o" aria-hidden="true"></i>{/tr}</a> + <a class="btn btn-link timeout" href="messu-read_sent.php?offset={$offset}&action=isFlagged&actionval=y&msgId={$msgId}&sort_mode={$sort_mode}&find={$find|escape:"url"}&flag={$flag}&priority={$priority}&flagval={$flagval}{ticket mode=get}">{tr}<i class="fa fa-flag-o" aria-hidden="true"></i>{/tr}</a> {/if} </div> </div> Modified: trunk/templates/tiki-accounting.tpl =================================================================== --- trunk/templates/tiki-accounting.tpl 2017-04-19 01:07:09 UTC (rev 62267) +++ trunk/templates/tiki-accounting.tpl 2017-04-19 01:28:29 UTC (rev 62268) @@ -32,9 +32,9 @@ <div class="box"> <h3 class="boxtitle">{tr}Tasks{/tr}</h3> <div class="box-data" style="width: 500px"> - {if $canBook}{button href="tiki-accounting_entry.php?bookId=$bookId&ticket={$ticket|escape:"url"}&daconfirm=y" _class="timeout" _text="{tr}Book new entries{/tr}"}<br> - {button href="tiki-accounting_stack.php?bookId=$bookId&hideform=1&ticket={$ticket|escape:"url"}&daconfirm=y" _class="timeout" _text="{tr}Confirm stack entries{/tr}"}<br>{/if} - {if $canStack}{button href="tiki-accounting_stack.php?bookId=$bookId&ticket={$ticket|escape:"url"}&daconfirm=y" _class="timeout" _text="{tr}Book into Stack{/tr}"}<br>{/if} + {if $canBook}{button href="tiki-accounting_entry.php?bookId={$bookId}{ticket mode=get}" _class="timeout" _text="{tr}Book new entries{/tr}"}<br> + {button href="tiki-accounting_stack.php?bookId={$bookId}&hideform=1{ticket mode=get}" _class="timeout" _text="{tr}Confirm stack entries{/tr}"}<br>{/if} + {if $canStack}{button href="tiki-accounting_stack.php?bookId={$bookId}{ticket mode=get}" _class="timeout" _text="{tr}Book into Stack{/tr}"}<br>{/if} </div> </div> {/tab} @@ -51,7 +51,7 @@ <h2>{tr}Journal{/tr}</h2> <div style="max-height: 80%; overflow: scroll;"> {if $journalLimit!=0} - {button href="tiki-accounting.php?bookId=$bookId&cookietab=4&journalLimit=0&ticket={$ticket|escape:"url"}&daconfirm=y" text="{tr}Fetch all{/tr}"} + {button href="tiki-accounting.php?bookId={$bookId}&cookietab=4&journalLimit=0{ticket mode=get}" text="{tr}Fetch all{/tr}"} {/if} {include file="tiki-accounting_journal.tpl"} </div> Modified: trunk/templates/tiki-accounting_account_form.tpl =================================================================== --- trunk/templates/tiki-accounting_account_form.tpl 2017-04-19 01:07:09 UTC (rev 62267) +++ trunk/templates/tiki-accounting_account_form.tpl 2017-04-19 01:28:29 UTC (rev 62268) @@ -34,7 +34,7 @@ <input type="radio" name="accountLocked" id="accountUnlocked" {if $account.accountLocked!=1}checked="checked"{/if} value="0">{tr}No{/tr}<br> <input type="submit" class="btn btn-default btn-sm timeout" name="submit" value="{if $action=='new'}{tr}Create account{/tr}{else}{tr}Modify account{/tr}{/if}"> {if $account.changeable==1 && $action=="edit"} - {button href="tiki-accounting_account.php?bookId={$bookId}&accountId={$accountId}&action=delete&ticket={$ticket|escape:"url"}&daconfirm=y" _class="timeout" _text="{tr}Delete this account{/tr}"} + {button href="tiki-accounting_account.php?bookId={$bookId}&accountId={$accountId}&action=delete{ticket mode=get}" _class="timeout" _text="{tr}Delete this account{/tr}"} {/if} {button href="tiki-accounting.php?bookId=$bookId" _text="{tr}Back to book page{/tr}"} </fieldset> Modified: trunk/templates/tiki-accounting_account_list.tpl =================================================================== --- trunk/templates/tiki-accounting_account_list.tpl 2017-04-19 01:07:09 UTC (rev 62267) +++ trunk/templates/tiki-accounting_account_list.tpl 2017-04-19 01:28:29 UTC (rev 62268) @@ -37,10 +37,10 @@ <td>{$a.accountTax}</td> {if $tiki_p_acct_manage_accounts=='y'} <td style="width:64px;"> - <a class="icon timeout" href="tiki-accounting_account.php?bookId={$bookId}&accountId={$a.accountId}&action=edit&ticket={$ticket|escape:"url"}&daconfirm=y"> + <a class="icon timeout" href="tiki-accounting_account.php?bookId={$bookId}&accountId={$a.accountId}&action=edit{ticket mode=get}"> {icon name="edit" alt="{tr}edit account{/tr}"} </a> - <a class="icon timeout" href="tiki-accounting_account.php?bookId={$bookId}&accountId={$a.accountId}&action=lock&ticket={$ticket|escape:"url"}&daconfirm=y"> + <a class="icon timeout" href="tiki-accounting_account.php?bookId={$bookId}&accountId={$a.accountId}&action=lock{ticket mode=get}"> {if $a.accountLocked==1} {icon name="unlock" alt="{tr}unlock account{/tr}" _confirm="{tr}Are you sure you want to unlock this account?{/tr}"} {else} @@ -47,7 +47,7 @@ {icon name="lock" alt="{tr}lock account{/tr}" _confirm="{tr}Are you sure you want to lock this account?{/tr}"} {/if} </a> - <a class="icon timeout" href="tiki-accounting_account.php?bookId={$bookId}&accountId={$a.accountId}&action=delete&ticket={$ticket|escape:"url"}&daconfirm=y"> + <a class="icon timeout" href="tiki-accounting_account.php?bookId={$bookId}&accountId={$a.accountId}&action=delete{ticket mode=get}"> {icon name="remove" alt="{tr}delete account{/tr}" _confirm="{tr}Are you sure, you want to delete this account{/tr}"} </a> </td> @@ -55,7 +55,7 @@ </tr> {/foreach} </table> -{button type="submit" href="tiki-accounting_account.php?action=new&bookId={$bookId|escape}&ticket={$ticket|escape:'url'}&daconfirm=y" _text="{tr}Create a new account{/tr}"} +{button type="submit" href="tiki-accounting_account.php?action=new&bookId={$bookId|escape}{ticket mode=get}" _text="{tr}Create a new account{/tr}"} <a class="icon" href="tiki-accounting_export.php?action=print&bookId={$bookId}&what=accounts" target="new"> {icon name="print" alt="{tr}printable version{/tr}"} </a> Modified: trunk/templates/tiki-accounting_account_view.tpl =================================================================== --- trunk/templates/tiki-accounting_account_view.tpl 2017-04-19 01:07:09 UTC (rev 62267) +++ trunk/templates/tiki-accounting_account_view.tpl 2017-04-19 01:28:29 UTC (rev 62268) @@ -35,8 +35,8 @@ </div> {button href="tiki-accounting.php?bookId=$bookId" _text="Back to book page"} {if $tiki_p_acct_manage_accounts=='y'} - {button href="tiki-accounting_account.php?action=edit&bookId=$bookId&accountId={$account.accountId}&ticket={$ticket|escape:"url"}&daconfirm=y" _class="timeout" _text="{tr}Edit this account{/tr}"} - {if $account.changeable==1}{button _class="timeout" href="tiki-accounting_account.php?action=delete&bookId=$bookId&accountId={$account.accountId}&ticket={$ticket|escape:"url"}&daconfirm=y" _text="{tr}Delete this account{/tr}"}{/if} + {button href="tiki-accounting_account.php?action=edit&bookId=$bookId&accountId={$account.accountId}{ticket mode=get}" _class="timeout" _text="{tr}Edit this account{/tr}"} + {if $account.changeable==1}{button _class="timeout" href="tiki-accounting_account.php?action=delete&bookId=$bookId&accountId={$account.accountId}{ticket mode=get}" _text="{tr}Delete this account{/tr}"}{/if} {/if} </div> {if isset($journal)} Modified: trunk/templates/tiki-accounting_books.tpl =================================================================== --- trunk/templates/tiki-accounting_books.tpl 2017-04-19 01:07:09 UTC (rev 62267) +++ trunk/templates/tiki-accounting_books.tpl 2017-04-19 01:28:29 UTC (rev 62268) @@ -26,7 +26,7 @@ <td> {if $element.bookClosed=='y'}{tr}closed{/tr}{else}{tr}open{/tr} {if $canCreate} - <a class="icon timeout" href="tiki-accounting_books.php?action=close&bookId={$element.bookId}&ticket={$ticket|escape:'url'}&daconfirm=y"> + <a class="icon timeout" href="tiki-accounting_books.php?action=close&bookId={$element.bookId}{ticket mode=get}"> {icon name="file-archive" _confirm="{tr}Are you sure, you want to close this book{/tr}" alt="{tr}close book{/tr}"} </a> {/if} Modified: trunk/templates/tiki-accounting_entry.tpl =================================================================== --- trunk/templates/tiki-accounting_entry.tpl 2017-04-19 01:07:09 UTC (rev 62267) +++ trunk/templates/tiki-accounting_entry.tpl 2017-04-19 01:28:29 UTC (rev 62268) @@ -53,8 +53,8 @@ <tr class="{cycle values="odd,even"} tips" {popup caption="{tr}Notes{/tr}" text=$a.accountNotes}> <td class="accompactlist"> {if $tiki_p_account_manage=='y'} - <a class="timeout" href="tiki-accounting_account.php?bookId={$bookId}&action=edit&accountId={$a.accountId}&ticket={$ticket|escape:"url"}&daconfirm=y"><img src="img/icons/edit.gif" alt="edit"></a> - <a class="timeout" href="tiki-accounting_account.php?bookId={$bookId}&action=delete&accountId={$a.accountId}&ticket={$ticket|escape:"url"}&daconfirm=y"><img src="img/icons/del.gif" alt="delete"></a> + <a class="timeout" href="tiki-accounting_account.php?bookId={$bookId}&action=edit&accountId={$a.accountId}{ticket mode=get}"><img src="img/icons/edit.gif" alt="edit"></a> + <a class="timeout" href="tiki-accounting_account.php?bookId={$bookId}&action=delete&accountId={$a.accountId}{ticket mode=get}"><img src="img/icons/del.gif" alt="delete"></a> {/if} <a href="javascript:setAccount({$a.accountId})">{$a.accountId}</a> </td> Modified: trunk/templates/tiki-accounting_journal.tpl =================================================================== --- trunk/templates/tiki-accounting_journal.tpl 2017-04-19 01:07:09 UTC (rev 62267) +++ trunk/templates/tiki-accounting_journal.tpl 2017-04-19 01:28:29 UTC (rev 62268) @@ -40,7 +40,7 @@ <td rowspan="{$j.maxcount}"> {if $j.journalCancelled==1} {else} - <a class="icon timeout" href="tiki-accounting_cancel.php?bookId={$bookId}&journalId={$j.journalId}&ticket={$ticket|escape:"url"}&daconfirm=y"> + <a class="icon timeout" href="tiki-accounting_cancel.php?bookId={$bookId}&journalId={$j.journalId}{ticket mode=get}"> {icon name="remove" alt="{tr}cancel this transaction{/tr}" _confirm="{tr}Are you sure you want to cancel this transaction{/tr}"} </a> {/if} Modified: trunk/templates/tiki-accounting_stack.tpl =================================================================== --- trunk/templates/tiki-accounting_stack.tpl 2017-04-19 01:07:09 UTC (rev 62267) +++ trunk/templates/tiki-accounting_stack.tpl 2017-04-19 01:28:29 UTC (rev 62268) @@ -55,8 +55,8 @@ <tr class="{cycle values="odd,even"} tips" {popup caption="{tr}Notes{/tr}" text=$a.accountNotes}> <td class="accompactlist"> {if $tiki_p_account_manage=='y'} - <a class="timeout" href="tiki-accounting_account.php?bookId={$bookId}&action=edit&accountId={$a.accountId}&ticket={$ticket|escape:"url"}&daconfirm=y"><img src="img/icons/edit.gif" alt="edit"></a> - <a class="timeout" href="tiki-accounting_account.php?bookId={$bookId}&action=delete&accountId={$a.accountId}&ticket={$ticket|escape:"url"}&daconfirm=y"><img src="img/icons/del.gif" alt="delete"></a> + <a class="timeout" href="tiki-accounting_account.php?bookId={$bookId}&action=edit&accountId={$a.accountId}{ticket mode=get}"><img src="img/icons/edit.gif" alt="edit"></a> + <a class="timeout" href="tiki-accounting_account.php?bookId={$bookId}&action=delete&accountId={$a.accountId}{ticket mode=get}"><img src="img/icons/del.gif" alt="delete"></a> {/if} <a href="javascript:setAccount({$a.accountId})">{$a.accountId}</a> </td> Modified: trunk/templates/tiki-accounting_stacklist.tpl =================================================================== --- trunk/templates/tiki-accounting_stacklist.tpl 2017-04-19 01:07:09 UTC (rev 62267) +++ trunk/templates/tiki-accounting_stacklist.tpl 2017-04-19 01:28:29 UTC (rev 62268) @@ -51,11 +51,11 @@ <td class="journal">{if $i<$j.creditcount}{$j.credit[$i].stackItemText|escape}{/if} </td> {if $smarty.section.posts.first} <td rowspan="{$s.maxcount}"> - <a class="icon timeout" href="tiki-accounting_stack.php?action=delete&bookId={$bookId}&stackId={$s.stackId}&ticket={$ticket|escape:"url"}&daconfirm=y"> + <a class="icon timeout" href="tiki-accounting_stack.php?action=delete&bookId={$bookId}&stackId={$s.stackId}{ticket mode=get}"> {icon name="remove" alt="{tr}delete this transaction from the stack{/tr}" _confirm="{tr}Are you sure you want to delete this transaction from stack?{/tr}"} </a><br> {if $canBook} - <a class="icon timeout" href="tiki-accounting_stack.php?action=confirm&bookId={$bookId}&stackId={$s.stackId}&ticket={$ticket|escape:"url"}&daconfirm=y"> + <a class="icon timeout" href="tiki-accounting_stack.php?action=confirm&bookId={$bookId}&stackId={$s.stackId}{ticket mode=get}"> {icon name="help" alt="{tr}confirm this transaction{/tr}" _confirm="{tr}Are you sure you want to confirm this transaction?{/tr}"} </a><br> {/if} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <chi...@us...> - 2017-06-11 07:32:31
|
Revision: 62957 http://sourceforge.net/p/tikiwiki/code/62957 Author: chibaguy Date: 2017-06-11 07:32:29 +0000 (Sun, 11 Jun 2017) Log Message: ----------- [MRG][FIX] Missing classes for article topic and custom image added to enable styling and positioning. [from revision 62956, branch 17] Revision Links: -------------- http://sourceforge.net/p/tikiwiki/code/62956 Modified Paths: -------------- trunk/templates/article.tpl trunk/templates/tiki-view_articles.tpl Modified: trunk/templates/article.tpl =================================================================== --- trunk/templates/article.tpl 2017-06-11 07:18:42 UTC (rev 62956) +++ trunk/templates/article.tpl 2017-06-11 07:32:29 UTC (rev 62957) @@ -69,7 +69,7 @@ {* display own article image *} <img alt="{$smarty.capture.imgTitle}" - {*class=""*} + class="article-image custom-image" src="article_image.php?image_type={if isset($preview) and $imageIsChanged eq 'y'}preview&id={$previewId}{elseif isset($preview) and $subId}submission&id={$subId}{else}article&id={$articleId}{if $image_x > 0}&width={$image_x}{/if}{/if}" {$style=''} {if $image_y > 0}{$style=$style|cat:"max-height:"|cat:$image_y|cat:"px;"}{/if} style="max-width: 100%; height: auto; {$style}" @@ -83,6 +83,7 @@ <img {* {if $big_image}class="cboxElement"{/if} *} alt="{tr}{$topicName}{/tr}" + class="article-image topic-image" src="article_image.php?image_type=topic&id={$topicId}" > {else} Modified: trunk/templates/tiki-view_articles.tpl =================================================================== --- trunk/templates/tiki-view_articles.tpl 2017-06-11 07:18:42 UTC (rev 62956) +++ trunk/templates/tiki-view_articles.tpl 2017-06-11 07:32:29 UTC (rev 62957) @@ -192,7 +192,7 @@ href="{$smarty.capture.href}" {if $listpages[ix].isfloat eq 'y'} style="margin-right:20px; float:left;"{/if} title="{if $listpages[ix].show_image_caption and $listpages[ix].image_caption}{$listpages[ix].image_caption|escape}{elseif $listpages[ix].topicName}{tr}{$listpages[ix].topicName}{/tr}{else}{tr}Read More{/tr}{/if}"> {$style=''} - <img class="img-thumbnail media-object" + <img class="img-thumbnail media-object article-image custom-image" alt="{if $listpages[ix].show_image_caption and $listpages[ix].image_caption}{$listpages[ix].image_caption|escape}{elseif $listpages[ix].topicName}{tr}{$listpages[ix].topicName}{/tr}{/if}" {strip}src="article_image.php?image_type=article&id={$listpages[ix].articleId} {if $listpages[ix].list_image_x > 0 and ($largefirstimage neq 'y' or not $smarty.section.ix.first)} @@ -216,7 +216,7 @@ {if isset($topics[$listpages[ix].topicId].image_size) and $topics[$listpages[ix].topicId].image_size > 0} <a href="{$smarty.capture.href}" {if $listpages[ix].isfloat eq 'y'} style="margin-right:20px; float:left;"{/if} title="{if $listpages[ix].show_image_caption and $listpages[ix].image_caption}{$listpages[ix].image_caption|escape}{else}{tr}{$listpages[ix].topicName}{/tr}{/if}"> - <img class="media-object img-thumbnail" + <img class="media-object img-thumbnail article-image topic-image" alt="{if $listpages[ix].show_image_caption and $listpages[ix].image_caption}{$listpages[ix].image_caption|escape}{else}{tr}{$listpages[ix].topicName}{/tr}{/if}" src="article_image.php?image_type=topic&id={$listpages[ix].topicId}"> </a> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rob...@us...> - 2017-07-25 15:23:28
|
Revision: 63339 http://sourceforge.net/p/tikiwiki/code/63339 Author: robertokir Date: 2017-07-25 15:23:26 +0000 (Tue, 25 Jul 2017) Log Message: ----------- [DOC] Use standard Smarty syntax for Information icon in rename and delete wiki pages. Modified Paths: -------------- trunk/templates/tiki-rename_page.tpl trunk/templates/wiki/remove_pages.tpl Modified: trunk/templates/tiki-rename_page.tpl =================================================================== --- trunk/templates/tiki-rename_page.tpl 2017-07-25 14:54:38 UTC (rev 63338) +++ trunk/templates/tiki-rename_page.tpl 2017-07-25 15:23:26 UTC (rev 63339) @@ -32,7 +32,7 @@ {if $prefs.feature_semantic eq 'y' and $prefs.feature_wiki_1like_redirection eq 'y' and $prefs.feature_wiki_pagealias eq 'y'} <input type='checkbox' id='semantic_alias' name='semantic_alias' value='y'> {tr}Redirect original page{/tr} <a tabindex="0" target="_blank" data-toggle="popover" data-trigger="hover" title="{tr}301 Redirect - \"moved permanently\" HTTP response status code{/tr}" data-content="{tr}Create an SEO-friendly, automatic redirect from old page name to new page name (ex.: for search engines or users that may have bookmarked the page){/tr}"> - <span class="fa fa-info-circle fa-fw "></span> + {icon name='information'} </a> {/if} </div> Modified: trunk/templates/wiki/remove_pages.tpl =================================================================== --- trunk/templates/wiki/remove_pages.tpl 2017-07-25 14:54:38 UTC (rev 63338) +++ trunk/templates/wiki/remove_pages.tpl 2017-07-25 15:23:26 UTC (rev 63339) @@ -27,7 +27,10 @@ <div class="checkbox" id="div_checkbox_redirect" style="display:{$div_checkbox_redirect_display};"> <label> <input type='checkbox' id='create_redirect' name='create_redirect' value='y' onclick="$('#div_redirect').toggle();return true;" > {tr}Create redirect{/tr} - <i class="fa fa-info-circle" data-toggle="tooltip" title="{tr}Create a 301 Redirect (\"moved permanently\") to specified page{/tr}." data-content="{tr}Create an SEO-friendly, automatic redirect from the page being deleted to the designated new page (ex.: for search engines or users that may have bookmarked the page being deleted){/tr}"></i> + <a tabindex="0" target="_blank" data-toggle="popover" data-trigger="hover" title="{tr}Create a 301 Redirect (\"moved permanently\") to specified page.{/tr} {tr}An SEO-friendly, automatic redirect from the page being deleted to the designated new page (ex.: for search engines or users that may have bookmarked the page being deleted){/tr}"> + {icon name='information'} + </a> + <!-- <i class="fa fa-info-circle" data-toggle="tooltip" title="{tr}Create a 301 Redirect (\"moved permanently\") to specified page{/tr}." data-content="{tr}Create an SEO-friendly, automatic redirect from the page being deleted to the designated new page (ex.: for search engines or users that may have bookmarked the page being deleted){/tr}"></i> --> </label> </div> <div id="div_redirect" class="form-group" style="display:none;"> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ch...@us...> - 2017-08-11 17:11:52
|
Revision: 63529 http://sourceforge.net/p/tikiwiki/code/63529 Author: chealer Date: 2017-08-11 17:11:50 +0000 (Fri, 11 Aug 2017) Log Message: ----------- [REF] Optimize categbar Modified Paths: -------------- trunk/templates/tiki-browse_gallery.tpl trunk/templates/tiki-calendar.tpl trunk/templates/tiki-list_file_gallery.tpl trunk/templates/tiki-view_forum.tpl trunk/templates/tiki-view_tracker.tpl trunk/templates/tiki-view_tracker_item.tpl Modified: trunk/templates/tiki-browse_gallery.tpl =================================================================== --- trunk/templates/tiki-browse_gallery.tpl 2017-08-11 17:02:30 UTC (rev 63528) +++ trunk/templates/tiki-browse_gallery.tpl 2017-08-11 17:11:50 UTC (rev 63529) @@ -82,16 +82,14 @@ {/if} </div> +{if $user and $prefs.feature_user_watches eq 'y' and $category_watched eq 'y'} <div class="categbar"> - {if $user and $prefs.feature_user_watches eq 'y'} - {if $category_watched eq 'y'} - {tr}Watched by categories:{/tr} - {section name=i loop=$watching_categories} - <a href="tiki-browse_categories.php?parentId={$watching_categories[i].categId}">{$watching_categories[i].name|escape}</a> - {/section} - {/if} - {/if} + {tr}Watched by categories:{/tr} + {section name=i loop=$watching_categories} + <a href="tiki-browse_categories.php?parentId={$watching_categories[i].categId}">{$watching_categories[i].name|escape}</a> + {/section} </div> +{/if} {if $advice} <div class="highlight simplebox">{tr}{$advice}{/tr}</div> Modified: trunk/templates/tiki-calendar.tpl =================================================================== --- trunk/templates/tiki-calendar.tpl 2017-08-11 17:02:30 UTC (rev 63528) +++ trunk/templates/tiki-calendar.tpl 2017-08-11 17:11:50 UTC (rev 63529) @@ -110,18 +110,16 @@ + {if $user and $prefs.feature_user_watches eq 'y' and isset($category_watched) and $category_watched eq 'y'} <div class="categbar"> - {if $user and $prefs.feature_user_watches eq 'y'} - {if isset($category_watched) and $category_watched eq 'y'} - {tr}Watched by categories:{/tr} - {section name=i loop=$watching_categories} - {assign var=thiswatchingcateg value=$watching_categories[i].categId} - {button href="tiki-browse_categories.php?parentId=$thiswatchingcateg" _text=$watching_categories[i].name|escape} - - {/section} - {/if} - {/if} + {tr}Watched by categories:{/tr} + {section name=i loop=$watching_categories} + {assign var=thiswatchingcateg value=$watching_categories[i].categId} + {button href="tiki-browse_categories.php?parentId=$thiswatchingcateg" _text=$watching_categories[i].name|escape} + + {/section} </div> + {/if} {if count($listcals) >= 1} <form class="modal-content" id="filtercal" method="get" action="{$myurl}" name="f" style="display:none;"> Modified: trunk/templates/tiki-list_file_gallery.tpl =================================================================== --- trunk/templates/tiki-list_file_gallery.tpl 2017-08-11 17:02:30 UTC (rev 63528) +++ trunk/templates/tiki-list_file_gallery.tpl 2017-08-11 17:11:50 UTC (rev 63529) @@ -200,14 +200,12 @@ {/remarksbox} {/if} -{if $user and $prefs.feature_user_watches eq 'y'} +{if $user and $prefs.feature_user_watches eq 'y' and isset($category_watched) && $category_watched eq 'y'} <div class="categbar"> - {if isset($category_watched) && $category_watched eq 'y'} - {tr}Watched by categories:{/tr} - {section name=i loop=$watching_categories} - {button _keepall='y' _text=$watching_categories[i].name|escape href="tiki-browse_categories.php" parentId=$watching_categories[i].categId} - {/section} - {/if} + {tr}Watched by categories:{/tr} + {section name=i loop=$watching_categories} + {button _keepall='y' _text=$watching_categories[i].name|escape href="tiki-browse_categories.php" parentId=$watching_categories[i].categId} + {/section} </div> {/if} Modified: trunk/templates/tiki-view_forum.tpl =================================================================== --- trunk/templates/tiki-view_forum.tpl 2017-08-11 17:02:30 UTC (rev 63528) +++ trunk/templates/tiki-view_forum.tpl 2017-08-11 17:11:50 UTC (rev 63529) @@ -106,17 +106,15 @@ </ul> {if $js == 'n'}</li></ul>{/if} </div> - <div class="categbar"> - {if $user and $prefs.feature_user_watches eq 'y'} - {if isset($category_watched) and $category_watched eq 'y'} - {tr}Watched by categories:{/tr} - {section name=i loop=$watching_categories} - <a href="tiki-browse_categories.php?parentId={$watching_categories[i].categId}">{$watching_categories[i].name|escape}</a> - - {/section} - {/if} - {/if} - </div> + {if $user and $prefs.feature_user_watches eq 'y' and isset($category_watched) and $category_watched eq 'y'} + <div class="categbar"> + {tr}Watched by categories:{/tr} + {section name=i loop=$watching_categories} + <a href="tiki-browse_categories.php?parentId={$watching_categories[i].categId}">{$watching_categories[i].name|escape}</a> + + {/section} + </div> + {/if} </div> <div class="breadcrumb"> <a class="link" href="{if $prefs.feature_sefurl eq 'y'}forums{else}tiki-forums.php{/if}">{tr}Forums{/tr}</a> Modified: trunk/templates/tiki-view_tracker.tpl =================================================================== --- trunk/templates/tiki-view_tracker.tpl 2017-08-11 17:02:30 UTC (rev 63528) +++ trunk/templates/tiki-view_tracker.tpl 2017-08-11 17:11:50 UTC (rev 63529) @@ -110,16 +110,14 @@ </div> </div> -<div class="categbar"> - {if $user and $prefs.feature_user_watches eq 'y'} - {if $category_watched eq 'y'} - {tr}Watched by categories:{/tr} - {section name=i loop=$watching_categories} - <a href="tiki-browse_categories.php?parentId={$watching_categories[i].categId}">{$watching_categories[i].name|escape}</a> - {/section} - {/if} - {/if} -</div> +{if $user and $prefs.feature_user_watches eq 'y' and $category_watched eq 'y'} + <div class="categbar"> + {tr}Watched by categories:{/tr} + {section name=i loop=$watching_categories} + <a href="tiki-browse_categories.php?parentId={$watching_categories[i].categId}">{$watching_categories[i].name|escape}</a> + {/section} + </div> +{/if} {if !empty($mail_msg)} <div class="wikitext">{$mail_msg}</div> Modified: trunk/templates/tiki-view_tracker_item.tpl =================================================================== --- trunk/templates/tiki-view_tracker_item.tpl 2017-08-11 17:02:30 UTC (rev 63528) +++ trunk/templates/tiki-view_tracker_item.tpl 2017-08-11 17:11:50 UTC (rev 63529) @@ -98,16 +98,14 @@ {/if} </div> + {if $user and $prefs.feature_user_watches eq 'y' and $category_watched eq 'y'} <div class="categbar"> - {if $user and $prefs.feature_user_watches eq 'y'} - {if $category_watched eq 'y'} - {tr}Watched by categories:{/tr} - {section name=i loop=$watching_categories} - <a href="tiki-browse_categories.php?parentId={$watching_categories[i].categId}">{$watching_categories[i].name|escape}</a> - {/section} - {/if} - {/if} + {tr}Watched by categories:{/tr} + {section name=i loop=$watching_categories} + <a href="tiki-browse_categories.php?parentId={$watching_categories[i].categId}">{$watching_categories[i].name|escape}</a> + {/section} </div> + {/if} {* ------- return/next/previous tab --- *} {if $canView} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jy...@us...> - 2017-09-08 01:31:23
|
Revision: 63773 http://sourceforge.net/p/tikiwiki/code/63773 Author: jyhem Date: 2017-09-08 01:31:20 +0000 (Fri, 08 Sep 2017) Log Message: ----------- [bp/r63772][FIX] Restore functionality of dynamically dsplaying appropriate available fields depending on the article type Modified Paths: -------------- trunk/templates/tiki-edit_article.tpl trunk/templates/tiki-edit_submission.tpl Modified: trunk/templates/tiki-edit_article.tpl =================================================================== --- trunk/templates/tiki-edit_article.tpl 2017-09-08 01:28:24 UTC (rev 63772) +++ trunk/templates/tiki-edit_article.tpl 2017-09-08 01:31:20 UTC (rev 63773) @@ -43,7 +43,7 @@ {textarea _simple="y" name="heading" class="form-control" rows="5" id="subheading" comments="y"}{$heading}{/textarea} {/if} </div> - <div id='heading_only' class="form-group margin-side-0{if $types.$type.heading_only eq 'y'} hidden{/if}"> + <div id='heading_only' class="form-group margin-side-0" {if $types.$type.heading_only eq 'y'}style="display: none;"{/if}> <label for="body">{tr}Body{/tr}</label> {textarea name="body" id="body"}{$body}{/textarea} </div> @@ -117,7 +117,7 @@ <div class="form-group clearfix"> <label for="type" class="control-label col-md-4">{tr}Type{/tr}</label> <div class="col-md-6"> - <select name="type" class="form-control"> + <select id='articletype' name="type" onchange='javascript:chgArtType();' class="form-control"> {foreach $types as $typei => $prop} <option value="{$typei|escape}" {if $type eq $typei}selected="selected"{/if}>{tr}{$typei|escape}{/tr}</option> {/foreach} Modified: trunk/templates/tiki-edit_submission.tpl =================================================================== --- trunk/templates/tiki-edit_submission.tpl 2017-09-08 01:28:24 UTC (rev 63772) +++ trunk/templates/tiki-edit_submission.tpl 2017-09-08 01:31:20 UTC (rev 63773) @@ -224,7 +224,7 @@ {/if} </div> </div> - <div id='heading_only' class="form-group margin-side-0{if $types.$type.heading_only eq 'y'} hidden{/if}"> + <div class="form-group" id='heading_only' {if $types.$type.heading_only eq 'y'}style="display: none;"{/if}> <label class="col-sm-3 control-label">{tr}Body{/tr}</label> <div class="col-sm-7"> {textarea name="body" id="body"}{$body}{/textarea} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ch...@us...> - 2017-09-08 19:38:20
|
Revision: 63783 http://sourceforge.net/p/tikiwiki/code/63783 Author: chealer Date: 2017-09-08 19:38:17 +0000 (Fri, 08 Sep 2017) Log Message: ----------- [REF] Optimize/simplify Modified Paths: -------------- trunk/templates/browse_file_gallery.tpl Added Paths: ----------- trunk/templates/file_properties_table.tpl Modified: trunk/templates/browse_file_gallery.tpl =================================================================== --- trunk/templates/browse_file_gallery.tpl 2017-09-08 18:08:40 UTC (rev 63782) +++ trunk/templates/browse_file_gallery.tpl 2017-09-08 19:38:17 UTC (rev 63783) @@ -31,79 +31,6 @@ {* show files and subgals in browsing view *} {if 1} {assign var=nb_over_infos value=0} - {if $view neq 'page'} - {$capturename = 'over_infos'} - {else} - {$capturename = 'page_infos'} - {/if} - {capture name=$capturename} - {strip} - <div {if $view neq 'page'}class='opaque'{/if}> - <div class='box-title'> - {if $view neq 'page'} - {tr}Properties{/tr} - {/if} - </div> - <div class='box-data'> - <table> - {foreach item=prop key=propname from=$fgal_listing_conf} - {if isset($item.key)} - {assign var=propkey value=$item.key} - {else} - {assign var=propkey value="show_$propname"} - {/if} - {if isset($files[changes].$propname)} - {if $propname == 'share' && isset($files[changes].share.data)} - {$email = []} - {foreach item=tmp_prop key=tmp_propname from=$files[changes].share.data} - {$email[]=$tmp_prop.email} - {/foreach} - {assign var=propval value=$email|implode:','} - {else} - {assign var=propval value=$files[changes].$propname} - {/if} - {/if} - {* Format property values *} - {if $propname eq 'created' or $propname eq 'lastModif' or $propname eq 'lastDownload'} - {assign var=propval value=$propval|tiki_long_date} - {elseif $propname eq 'last_user' or $propname eq 'author' or $propname eq 'creator'} - {assign var=propval value=$propval|username} - {elseif $propname eq 'size'} - {assign var=propval value=$propval|kbsize:true} - {elseif $propname eq 'description'} - {assign var=propval value=$propval|nl2br} - {/if} - - {if isset($gal_info.$propkey) - and $propval neq '' - and ($propname neq 'name' or $view eq 'page') - and ($gal_info.$propkey eq 'a' or $gal_info.$propkey eq 'o' - or ($view eq 'page' and ($gal_info.$propkey neq 'n' or $propname eq 'name')) - ) - } - <tr> - <td class="pull-right"> - <b>{$fgal_listing_conf.$propname.name}</b> - </td> - <td style="padding-left:5px"> - <span class="pull-left">{$propval}</span> - </td> - </tr> - {assign var=nb_over_infos value=$nb_over_infos+1} - {/if} - {/foreach} - </table> - </div> - </div> - {/strip} - {/capture} - - {if $nb_over_infos gt 0 and !empty($smarty.capture.over_infos)} - {assign var=over_infos value=$smarty.capture.over_infos} - {else} - {assign var=over_infos value=''} - {/if} - {* build link *} {capture assign=link} {strip} @@ -186,8 +113,18 @@ data-box="shadowbox[gallery];type=flash" {/if} {/if} - {if $over_infos neq ''} - {popup fullhtml="1" text=$over_infos} + {capture assign='popupContents'} + <div class='opaque'> + <div class='box-title'> + {tr}Properties{/tr} + </div> + <div class='box-data'> + {include file='file_properties_table.tpl'} + </div> + </div> + {/capture} + {if $popupContents neq ''} + {popup fullhtml="1" text=$popupContents} {else} title="{if $files[changes].name neq ''}{$files[changes].name|escape}{/if}{if $files[changes].description neq ''} - {$files[changes].description|escape}{/if}" {/if}> @@ -291,7 +228,9 @@ {* property table in page file view *} {if $view eq 'page'} <div style="float:left"> - {$smarty.capture.page_infos}<br> + <div class='box-data'> + {include file='file_properties_table.tpl'} + </div> </div> <br clear="all"> <div> Copied: trunk/templates/file_properties_table.tpl (from rev 63769, trunk/templates/file_selector.tpl) =================================================================== --- trunk/templates/file_properties_table.tpl (rev 0) +++ trunk/templates/file_properties_table.tpl 2017-09-08 19:38:17 UTC (rev 63783) @@ -0,0 +1,51 @@ +{* $Id$ *} +{strip} +<table> + {foreach item=prop key=propname from=$fgal_listing_conf} + {if isset($item.key)} + {assign var=propkey value=$item.key} + {else} + {assign var=propkey value="show_$propname"} + {/if} + {if isset($files[changes].$propname)} + {if $propname == 'share' && isset($files[changes].share.data)} + {$email = []} + {foreach item=tmp_prop key=tmp_propname from=$files[changes].share.data} + {$email[]=$tmp_prop.email} + {/foreach} + {assign var=propval value=$email|implode:','} + {else} + {assign var=propval value=$files[changes].$propname} + {/if} + {/if} + {* Format property values *} + {if $propname eq 'created' or $propname eq 'lastModif' or $propname eq 'lastDownload'} + {assign var=propval value=$propval|tiki_long_date} + {elseif $propname eq 'last_user' or $propname eq 'author' or $propname eq 'creator'} + {assign var=propval value=$propval|username} + {elseif $propname eq 'size'} + {assign var=propval value=$propval|kbsize:true} + {elseif $propname eq 'description'} + {assign var=propval value=$propval|nl2br} + {/if} + + {if isset($gal_info.$propkey) + and $propval neq '' + and ($propname neq 'name' or $view eq 'page') + and ($gal_info.$propkey eq 'a' or $gal_info.$propkey eq 'o' + or ($view eq 'page' and ($gal_info.$propkey neq 'n' or $propname eq 'name')) + ) + } + <tr> + <td class="pull-right"> + <b>{$fgal_listing_conf.$propname.name}</b> + </td> + <td style="padding-left:5px"> + <span class="pull-left">{$propval}</span> + </td> + </tr> + {assign var=nb_over_infos value=$nb_over_infos+1} + {/if} + {/foreach} +</table> +{/strip} \ No newline at end of file Property changes on: trunk/templates/file_properties_table.tpl ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ch...@us...> - 2017-09-08 22:29:43
|
Revision: 63788 http://sourceforge.net/p/tikiwiki/code/63788 Author: chealer Date: 2017-09-08 22:29:40 +0000 (Fri, 08 Sep 2017) Log Message: ----------- [REF] Split fgal_thumbnailframe.tpl from browse_file_gallery.tpl [REF] Use foreach $files as $file instead of section Modified Paths: -------------- trunk/templates/browse_file_gallery.tpl trunk/templates/fgal_context_menu.tpl trunk/templates/file_properties_table.tpl trunk/templates/list_file_gallery_content.tpl Added Paths: ----------- trunk/templates/fgal_thumbnailframe.tpl Modified: trunk/templates/browse_file_gallery.tpl =================================================================== --- trunk/templates/browse_file_gallery.tpl 2017-09-08 21:12:26 UTC (rev 63787) +++ trunk/templates/browse_file_gallery.tpl 2017-09-08 22:29:40 UTC (rev 63788) @@ -13,16 +13,16 @@ {/jq} <div id="thumbnails"{* style="float:left"*}> - {section name=changes loop=$files} + {foreach $files as $file} {* Checkboxes *} - {if $files[changes].isgal eq 1} + {if $file.isgal eq 1} {assign var=checkname value=$subgal_checkbox_name|default:'subgal'} {else} {assign var=checkname value=$file_checkbox_name|default:'file'} {/if} {if $prefs.fgal_checked neq 'n' and isset($smarty.request.$checkname) and $smarty.request.$checkname - and in_array($files[changes].id,$smarty.request.$checkname)} + and in_array($file.id,$smarty.request.$checkname)} {assign var=is_checked value='y'} {else} {assign var=is_checked value='n'} @@ -32,21 +32,21 @@ {* build link *} {capture assign=link} {strip} - {if $files[changes].isgal eq 1} - href="tiki-list_file_gallery.php?galleryId={$files[changes].id}{if !empty($filegals_manager)}&filegals_manager={$filegals_manager|escape}{/if}&view=browse" + {if $file.isgal eq 1} + href="tiki-list_file_gallery.php?galleryId={$file.id}{if !empty($filegals_manager)}&filegals_manager={$filegals_manager|escape}{/if}&view=browse" {else} {if !empty($filegals_manager)} - href="#" onclick="window.opener.insertAt('{$filegals_manager}','{$files[changes].wiki_syntax|escape}');checkClose();return false;" title="{tr}Click here to use the file{/tr}" + href="#" onclick="window.opener.insertAt('{$filegals_manager}','{$file.wiki_syntax|escape}');checkClose();return false;" title="{tr}Click here to use the file{/tr}" {elseif $tiki_p_download_files eq 'y'} {if $gal_info.type eq 'podcast' or $gal_info.type eq 'vidcast'} - href="{$prefs.fgal_podcast_dir}{$files[changes].path}" + href="{$prefs.fgal_podcast_dir}{$file.path}" {else} - href="{if $prefs.javascript_enabled eq 'y' && $files[changes].type|truncate:5:'':true eq 'image'} - {$files[changes].id|sefurl:preview} - {elseif $files[changes].type neq 'application/x-shockwave-flash'} - {$files[changes].id|sefurl:file} + href="{if $prefs.javascript_enabled eq 'y' && $file.type|truncate:5:'':true eq 'image'} + {$file.id|sefurl:preview} + {elseif $file.type neq 'application/x-shockwave-flash'} + {$file.id|sefurl:file} {else} - {$files[changes].id|sefurl:display} + {$file.id|sefurl:display} {/if}" {/if} {/if} @@ -62,7 +62,7 @@ <div class="thumbactions"> {if $prefs.fgal_checked neq 'n' and $tiki_p_admin_file_galleries eq 'y' and $view neq 'page'} <label style="float:left"> - <input type="checkbox" onclick="flip_thumbnail_status('{$checkname}_{$files[changes].id}')" name="{$checkname}[]" value="{$files[changes].id|escape}" {if $is_checked eq 'y'}checked="checked"{/if}> + <input type="checkbox" onclick="flip_thumbnail_status('{$checkname}_{$file.id}')" name="{$checkname}[]" value="{$file.id|escape}" {if $is_checked eq 'y'}checked="checked"{/if}> {if isset($checkbox_label)} {$checkbox_label} {/if} @@ -81,70 +81,9 @@ </div> {* thumbactions *} {/if} {/capture} - <div id="{$checkname}_{$files[changes].id}" class="{if $view eq 'page'}clearfix thumbnailcontener-heightauto{else}clearfix thumbnailcontener{if $is_checked eq 'y'} thumbnailcontenerchecked{/if}{if $files[changes].isgal eq 1} subgallery{/if}{/if}" style="{if $view eq 'browse'}float:left;{/if}{if $view neq 'page'}width:{$thumbnailcontener_size}px{/if}"> + <div id="{$checkname}_{$file.id}" class="{if $view eq 'page'}clearfix thumbnailcontener-heightauto{else}clearfix thumbnailcontener{if $is_checked eq 'y'} thumbnailcontenerchecked{/if}{if $file.isgal eq 1} subgallery{/if}{/if}" style="{if $view eq 'browse'}float:left;{/if}{if $view neq 'page'}width:{$thumbnailcontener_size}px{/if}"> <div class="thumbnail" style="float:left; {if $view neq 'page'}width:{$thumbnailcontener_size}px{/if}"> - <div class="thumbnailframe" style="width:100%;height:{if $view != 'page'}{$thumbnailcontener_size}px{else}100%{/if}{if $show_infos neq 'y'};margin-bottom:4px{/if}"> - <div class="thumbimage"> - <div class="thumbimagesub">{assign var=key_type value=$files[changes].type} - {$imagetypes = 'n'} - {if $files[changes].isgal eq 1} - <a {$link}> - {if empty($files[changes].icon_fileId)} - {icon name="admin_fgal" size=3} - {else} - <img src="{$files[changes].icon_fileId|sefurl:thumbnail}"> - {/if} - </a> - {else} - {if $key_type eq 'image/png' or $key_type eq 'image/jpeg' - or $key_type eq 'image/jpg' or $key_type eq 'image/gif' - or $filetype eq 'image/x-ms-bmp'} - {$imagetypes = 'y'} - {/if} - <a {$link} - {if $prefs.feature_shadowbox eq 'y' && empty($filegals_manager)} - {if $imagetypes eq 'y' } - data-box="box[g]" - {elseif $key_type eq 'text/html'} - data-box="shadowbox[gallery];type=iframe" - {elseif $key_type eq 'application/x-shockwave-flash'} - data-box="shadowbox[gallery];type=flash" - {/if} - {/if} - {capture assign='popupContents'} - <div class='opaque'> - <div class='box-title'> - {tr}Properties{/tr} - </div> - <div class='box-data'> - {include file='file_properties_table.tpl'} - </div> - </div> - {/capture} - {if $popupContents neq ''} - {popup fullhtml="1" text=$popupContents} - {else} - title="{if $files[changes].name neq ''}{$files[changes].name|escape}{/if}{if $files[changes].description neq ''} - {$files[changes].description|escape}{/if}" - {/if}> - {if $key_type neq 'image/svg' and $key_type neq 'image/svg+xml'} - {if $imagetypes eq 'y' or $prefs.theme_iconset eq 'legacy'} - {if $view eq 'page'} - <img src="tiki-download_file.php?fileId={$files[changes].id}&preview" style="width:{$maxWidth};max-width: 100%;"> - {else} - <img src="{$files[changes].id|sefurl:thumbnail}" style="max-height:{$thumbnailcontener_size}px"> - {/if} - {else} - {$files[changes].filename|iconify:$key_type:null:3} - {/if} - {else} - <object data="{$files[changes].id|sefurl:thumbnail}" style="width:{$thumbnail_size}px;height:{$thumbnailcontener_size}px;" type="{$key_type}"></object> - {/if} - </a> - {/if} - </div> - </div> - </div> - + {include file='fgal_thumbnailframe.tpl'} {if $show_infos eq 'y'} <div class="thumbinfos"> {if $view eq 'page'} @@ -164,14 +103,14 @@ or $propname eq 'name' ) } - {if isset($files[changes].$propname)} - {assign var=propval value=$files[changes].$propname|escape} + {if isset($file.$propname)} + {assign var=propval value=$file.$propname|escape} {/if} {* Format property values *} {if $propname eq 'id' or $propname eq 'name'} {if $propname eq 'name' and $propval eq '' and $gal_info.show_name eq 'n'} {* show the filename if only name should be displayed but is empty *} - {assign var=propval value=$files[changes].filename|truncate:$key_name_len} + {assign var=propval value=$file.filename|truncate:$key_name_len} {assign var=propval value="<a class='fgalname namealias' $link>$propval</a>"} {else} {assign var=propval value="<a class='fgalname' $link>$propval</a>"} @@ -193,9 +132,9 @@ <div class="thumbname"> <div class="thumbnamesub" style="width:{$thumbnail_size}px; overflow: hidden;{if $view eq 'page'}text-align:center{/if}"> {if $gal_info.show_name eq 'f' or ($gal_info.show_name eq 'a' - and $files[changes].name eq '')} - <a class="fgalname" {$link} title="{$files[changes].filename}" {if $view eq 'page'}style="text-align:center"{/if}> - {$files[changes].filename|truncate:$key_name_len} + and $file.name eq '')} + <a class="fgalname" {$link} title="{$file.filename}" {if $view eq 'page'}style="text-align:center"{/if}> + {$file.filename|truncate:$key_name_len} </a> {else} {$propval} @@ -233,7 +172,7 @@ </div> <br clear="all"> <div> - {include file='tiki-upload_file_progress.tpl' fileId=$files[changes].id name=$files[changes].filename} + {include file='tiki-upload_file_progress.tpl' fileId=$file.id name=$file.filename} </div> {if isset($metarray) and $metarray|count gt 0} <br> @@ -249,11 +188,11 @@ adjustThumbnails() {/jq} - {sectionelse} + {foreachelse} <div> <b>{tr}No records found{/tr}</b> </div> - {/section} + {/foreach} </div> Modified: trunk/templates/fgal_context_menu.tpl =================================================================== --- trunk/templates/fgal_context_menu.tpl 2017-09-08 21:12:26 UTC (rev 63787) +++ trunk/templates/fgal_context_menu.tpl 2017-09-08 22:29:40 UTC (rev 63788) @@ -1,22 +1,22 @@ {* $Id$ *} {strip} - {if $files[$changes].isgal eq 1} - {if $files[$changes].perms.tiki_p_view_file_gallery eq 'y'} - {self_link _icon_name='file-archive-open' _menu_text=$menu_text _menu_icon=$menu_icon galleryId=$files[$changes].id} + {if $file.isgal eq 1} + {if $file.perms.tiki_p_view_file_gallery eq 'y'} + {self_link _icon_name='file-archive-open' _menu_text=$menu_text _menu_icon=$menu_icon galleryId=$file.id} {tr}Browse{/tr} {/self_link} {/if} - {if $files[$changes].perms.tiki_p_create_file_galleries eq 'y'} - {self_link _icon_name='edit' _menu_text=$menu_text _menu_icon=$menu_icon edit_mode=1 galleryId=$files[$changes].id} + {if $file.perms.tiki_p_create_file_galleries eq 'y'} + {self_link _icon_name='edit' _menu_text=$menu_text _menu_icon=$menu_icon edit_mode=1 galleryId=$file.id} {tr}Properties{/tr} {/self_link} {/if} - {if $files[$changes].perms.tiki_p_upload_files eq 'y' - and ( $files[$changes].perms.tiki_p_admin_file_galleries eq 'y' or ($user and $files[$changes].user eq $user) - or $files[$changes].public eq 'y' )} - <a href="tiki-upload_file.php?galleryId={$files[$changes].id}{if !empty($filegals_manager)}&filegals_manager={$filegals_manager|escape}{/if}"> + {if $file.perms.tiki_p_upload_files eq 'y' + and ( $file.perms.tiki_p_admin_file_galleries eq 'y' or ($user and $file.user eq $user) + or $file.public eq 'y' )} + <a href="tiki-upload_file.php?galleryId={$file.id}{if !empty($filegals_manager)}&filegals_manager={$filegals_manager|escape}{/if}"> <div class="iconmenu"> {icon name='upload'} {tr}Upload{/tr} </div> @@ -23,24 +23,24 @@ </a> {/if} - {if $files[$changes].perms.tiki_p_assign_perm_file_gallery eq 'y'} + {if $file.perms.tiki_p_assign_perm_file_gallery eq 'y'} <div class="iconmenu"> - {if $files[$changes].public neq 'y'} - {permission_link mode=text type="file gallery" permType="file galleries" id=$files[$changes].id title=$files[$changes].name} + {if $file.public neq 'y'} + {permission_link mode=text type="file gallery" permType="file galleries" id=$file.id title=$file.name} {else} - {permission_link mode=text type="file gallery" permType="file galleries" id=$files[$changes].id title=$files[$changes].name} + {permission_link mode=text type="file gallery" permType="file galleries" id=$file.id title=$file.name} {/if} </div> {/if} {if $prefs.feature_webdav eq 'y'} - {assign var=virtual_path value=$files[$changes].id|virtual_path:'filegal'} + {assign var=virtual_path value=$file.id|virtual_path:'filegal'} <a style="behavior: url(#default#AnchorClick);" href="{$virtual_path}" folder="{$virtual_path}"> {icon name="file-archive-open"}{tr}Open as WebFolder{/tr} </a> {/if} - {if $files[$changes].perms.tiki_p_create_file_galleries eq 'y'} - {self_link _icon_name='remove' _menu_text=$menu_text _menu_icon=$menu_icon removegal=$files[$changes].id} + {if $file.perms.tiki_p_create_file_galleries eq 'y'} + {self_link _icon_name='remove' _menu_text=$menu_text _menu_icon=$menu_icon removegal=$file.id} {tr}Delete{/tr} {/self_link} {/if} @@ -49,7 +49,7 @@ {if $menu_text eq 'y' or $menu_icon eq 'y'} {* This form tag is needed when placed in a popup box through the popup function. If placed in a column, there is already a form tag around the whole table *} - <form class="upform" name="form{$files[$changes].fileId}" method="post" action="tiki-list_file_gallery.php?galleryId={$gal_info.galleryId}{if !empty($filegals_manager)}&filegals_manager={$filegals_manager|escape}{/if}{if $prefs.fgal_asynchronous_indexing eq 'y'}&fast{/if}" enctype="multipart/form-data"> + <form class="upform" name="form{$file.fileId}" method="post" action="tiki-list_file_gallery.php?galleryId={$gal_info.galleryId}{if !empty($filegals_manager)}&filegals_manager={$filegals_manager|escape}{/if}{if $prefs.fgal_asynchronous_indexing eq 'y'}&fast{/if}" enctype="multipart/form-data"> {/if} {if $menu_text neq 'y'} {* This is needed for the 'Upload New Version' action to be correctly displayed @@ -58,55 +58,55 @@ {/if} {/if} - {if $files[$changes].type|truncate:6:'':true eq 'image/' and $files[$changes].perms.tiki_p_download_files eq 'y'} - <a href="{$files[$changes].id|sefurl:display}"> + {if $file.type|truncate:6:'':true eq 'image/' and $file.perms.tiki_p_download_files eq 'y'} + <a href="{$file.id|sefurl:display}"> {icon name='view' _menu_text=$menu_text _menu_icon=$menu_icon alt="{tr}Display{/tr}"} </a> - {if $files[$changes].perms.tiki_p_upload_files eq 'y' and $prefs.feature_draw eq 'y'} + {if $file.perms.tiki_p_upload_files eq 'y' and $prefs.feature_draw eq 'y'} {if - $files[$changes].type eq 'image/svg+xml' or - $files[$changes].type eq 'image/jpeg' or - $files[$changes].type eq 'image/gif' or - $files[$changes].type eq 'image/png' or - $files[$changes].type eq 'image/tiff' + $file.type eq 'image/svg+xml' or + $file.type eq 'image/jpeg' or + $file.type eq 'image/gif' or + $file.type eq 'image/png' or + $file.type eq 'image/tiff' } - <a class="draw dialog" data-name="{$files[$changes].filename}" title="{tr}Edit: {/tr}{$files[$changes].filename}" href="tiki-edit_draw.php?fileId={$files[$changes].id}&galleryId={$files[$changes].galleryId}" data-fileid='{$files[$changes].id}' data-galleryid='{$files[$changes].galleryId}' onclick='$(document).trigger("hideCluetip"); return $(this).ajaxEditDraw();'> + <a class="draw dialog" data-name="{$file.filename}" title="{tr}Edit: {/tr}{$file.filename}" href="tiki-edit_draw.php?fileId={$file.id}&galleryId={$file.galleryId}" data-fileid='{$file.id}' data-galleryid='{$file.galleryId}' onclick='$(document).trigger("hideCluetip"); return $(this).ajaxEditDraw();'> {icon name='edit' _menu_text=$menu_text _menu_icon=$menu_icon alt="{tr}Edit{/tr}"} </a> {/if} {/if} - {elseif $files[$changes].type eq 'text/csv' and $prefs.feature_sheet eq 'y'} - <a href="tiki-view_sheets.php?fileId={$files[$changes].id}"> + {elseif $file.type eq 'text/csv' and $prefs.feature_sheet eq 'y'} + <a href="tiki-view_sheets.php?fileId={$file.id}"> {icon name='view' _menu_text=$menu_text _menu_icon=$menu_icon alt="{tr}Display{/tr}"} </a> - {elseif $prefs.fgal_viewerjs_feature eq 'y' and ($files[$changes].type eq 'application/pdf' or $files[$changes].type|strpos:'application/vnd.oasis.opendocument.' !== false)} - <a href="{$prefs.fgal_viewerjs_uri}#{$base_url}{$files[$changes].id|sefurl:display}"> + {elseif $prefs.fgal_viewerjs_feature eq 'y' and ($file.type eq 'application/pdf' or $file.type|strpos:'application/vnd.oasis.opendocument.' !== false)} + <a href="{$prefs.fgal_viewerjs_uri}#{$base_url}{$file.id|sefurl:display}"> {icon name='view' _menu_text=$menu_text _menu_icon=$menu_icon alt="{tr}Display{/tr}"} </a> - {elseif ($files[$changes].type eq 'application/vnd.oasis.opendocument.text' - or $files[$changes].type eq 'application/octet-stream') and $prefs.feature_docs eq 'y'} - <a href="tiki-edit_docs.php?fileId={$files[$changes].id}"> + {elseif ($file.type eq 'application/vnd.oasis.opendocument.text' + or $file.type eq 'application/octet-stream') and $prefs.feature_docs eq 'y'} + <a href="tiki-edit_docs.php?fileId={$file.id}"> {icon name='view' _menu_text=$menu_text _menu_icon=$menu_icon alt="{tr}Display{/tr}"} </a> - {if $files[$changes].perms.tiki_p_upload_files eq 'y'} - <a href="tiki-edit_docs.php?fileId={$files[$changes].id}&edit"> + {if $file.perms.tiki_p_upload_files eq 'y'} + <a href="tiki-edit_docs.php?fileId={$file.id}&edit"> {icon name='edit' _menu_text=$menu_text _menu_icon=$menu_icon alt="{tr}Edit{/tr}"} </a> {/if} - {elseif $prefs.h5p_enabled eq 'y' and $files[$changes].type eq 'application/zip' and preg_match('/\.h5p$/i', $files[$changes].filename)} - <a href="{service controller='h5p' action='embed' fileId=$files[$changes].id}"> + {elseif $prefs.h5p_enabled eq 'y' and $file.type eq 'application/zip' and preg_match('/\.h5p$/i', $file.filename)} + <a href="{service controller='h5p' action='embed' fileId=$file.id}"> {icon name='view' _menu_text=$menu_text _menu_icon=$menu_icon alt="{tr}Display{/tr}"} </a> {/if} - {if (isset($files[$changes].p_download_files) and $files[$changes].p_download_files eq 'y') - or (!isset($files[$changes].p_download_files) and $files[$changes].perms.tiki_p_download_files eq 'y')} + {if (isset($file.p_download_files) and $file.p_download_files eq 'y') + or (!isset($file.p_download_files) and $file.perms.tiki_p_download_files eq 'y')} {if $gal_info.type eq 'podcast' or $gal_info.type eq 'vidcast'} - <a href="{$download_path}{$files[$changes].path}"> + <a href="{$download_path}{$file.path}"> {else} - <a href="{$files[$changes].id|sefurl:file}"> + <a href="{$file.id|sefurl:file}"> {/if} - {if $prefs.feature_file_galleries_save_draft eq 'y' and $files[$changes].nbDraft gt 0} + {if $prefs.feature_file_galleries_save_draft eq 'y' and $file.nbDraft gt 0} {assign var=download_action_title value="{tr}Download current version{/tr}"} {else} {assign var=download_action_title value="{tr}Download{/tr}"} @@ -116,9 +116,9 @@ {/if} {if $gal_info.archives gt -1} - {if isset($files[$changes].nbArchives) and $files[$changes].nbArchives gt 0} - {assign var=nb_archives value=$files[$changes].nbArchives} - <a href="tiki-file_archives.php?fileId={$files[$changes].fileId}{if !empty($filegals_manager)}&filegals_manager={$filegals_manager|escape}{/if}"> + {if isset($file.nbArchives) and $file.nbArchives gt 0} + {assign var=nb_archives value=$file.nbArchives} + <a href="tiki-file_archives.php?fileId={$file.fileId}{if !empty($filegals_manager)}&filegals_manager={$filegals_manager|escape}{/if}"> {icon _menu_text=$menu_text _menu_icon=$menu_icon name='file-archive' alt="{tr}Archives{/tr} ($nb_archives)"} </a> {else} @@ -130,7 +130,7 @@ {/if} {if $prefs.feature_file_galleries_save_draft eq 'y'} - {if $files[$changes].nbDraft gt 0} + {if $file.nbDraft gt 0} {assign var=replace_action_title value="{tr}Replace draft{/tr}"} {else} {assign var=replace_action_title value="{tr}Upload draft{/tr}"} @@ -137,39 +137,39 @@ {/if} {/if} {* can edit if I am admin or the owner of the file or the locker of the file or if I have the perm to edit file on this gallery *} - {if $files[$changes].perms.tiki_p_admin_file_galleries eq 'y' - or ($files[$changes].lockedby and $files[$changes].lockedby eq $user) - or (!$files[$changes].lockedby and (($user and $user eq $files[$changes].user) - or $files[$changes].perms.tiki_p_edit_gallery_file eq 'y'))} - {if $files[$changes].archiveId == 0} - {if $prefs.feature_file_galleries_save_draft eq 'y' and $files[$changes].nbDraft gt 0} - {self_link _icon_name='ok' _menu_text=$menu_text _menu_icon=$menu_icon validate=$files[$changes].fileId galleryId=$files[$changes].galleryId} + {if $file.perms.tiki_p_admin_file_galleries eq 'y' + or ($file.lockedby and $file.lockedby eq $user) + or (!$file.lockedby and (($user and $user eq $file.user) + or $file.perms.tiki_p_edit_gallery_file eq 'y'))} + {if $file.archiveId == 0} + {if $prefs.feature_file_galleries_save_draft eq 'y' and $file.nbDraft gt 0} + {self_link _icon_name='ok' _menu_text=$menu_text _menu_icon=$menu_icon validate=$file.fileId galleryId=$file.galleryId} {tr}Validate your draft{/tr} {/self_link} - {self_link _icon_name='remove' _menu_text=$menu_text _menu_icon=$menu_icon draft=remove remove=$files[$changes].fileId galleryId=$files[$changes].galleryId} + {self_link _icon_name='remove' _menu_text=$menu_text _menu_icon=$menu_icon draft=remove remove=$file.fileId galleryId=$file.galleryId} {tr}Delete your draft{/tr} {/self_link} {/if} - {if $files[$changes].perms.tiki_p_admin_file_galleries eq 'y' or empty($files[$changes].locked) - or (isset($files[$changes].locked) and $files[$changes].locked and $files[$changes].lockedby eq $user) + {if $file.perms.tiki_p_admin_file_galleries eq 'y' or empty($file.locked) + or (isset($file.locked) and $file.locked and $file.lockedby eq $user) or $gal_info.lockable ne 'y'} - <a href="tiki-upload_file.php?galleryId={$files[$changes].galleryId}&fileId={$files[$changes].id}{if !empty($filegals_manager)}&filegals_manager={$filegals_manager|escape}{/if}"> + <a href="tiki-upload_file.php?galleryId={$file.galleryId}&fileId={$file.id}{if !empty($filegals_manager)}&filegals_manager={$filegals_manager|escape}{/if}"> {icon _menu_text=$menu_text _menu_icon=$menu_icon name='export' alt="{$replace_action_title}"} </a> {if $prefs.fgal_display_properties eq 'y'} - <a href="tiki-upload_file.php?galleryId={$files[$changes].galleryId}&fileId={$files[$changes].id}{if !empty($filegals_manager)}&filegals_manager={$filegals_manager|escape}{/if}"> + <a href="tiki-upload_file.php?galleryId={$file.galleryId}&fileId={$file.id}{if !empty($filegals_manager)}&filegals_manager={$filegals_manager|escape}{/if}"> {icon _menu_text=$menu_text _menu_icon=$menu_icon name='edit' alt="{tr}Edit properties{/tr}"} </a> {* using & causes an error for some reason - therefore using plain & *} - <a href="tiki-list_file_gallery.php?galleryId={$files[$changes].galleryId}&fileId={$files[$changes].id}&action=refresh_metadata{if isset($view)}&view={$view}{/if}"> + <a href="tiki-list_file_gallery.php?galleryId={$file.galleryId}&fileId={$file.id}&action=refresh_metadata{if isset($view)}&view={$view}{/if}"> {icon _menu_text=$menu_text _menu_icon=$menu_icon name='tag' alt="{tr}Refresh metadata{/tr}"} </a> {if $view != 'page'} {$pageoffset = $changes - $subcount + $offset} - <a href="tiki-list_file_gallery.php?galleryId={$files[$changes].galleryId}&offset={$pageoffset}&fileId={$files[$changes].id}&view=page"> + <a href="tiki-list_file_gallery.php?galleryId={$file.galleryId}&offset={$pageoffset}&fileId={$file.id}&view=page"> {icon _menu_text=$menu_text _menu_icon=$menu_icon name='textfile' alt="{tr}Page view{/tr}"} </a> {/if} @@ -176,27 +176,27 @@ {/if} {/if} - {if $gal_info.lockable eq 'y' and $files[$changes].isgal neq 1} - {if $files[$changes].lockedby} - {self_link _icon_name='unlock' _menu_text=$menu_text _menu_icon=$menu_icon lock='n' fileId=$files[$changes].fileId galleryId=$files[$changes].galleryId} + {if $gal_info.lockable eq 'y' and $file.isgal neq 1} + {if $file.lockedby} + {self_link _icon_name='unlock' _menu_text=$menu_text _menu_icon=$menu_icon lock='n' fileId=$file.fileId galleryId=$file.galleryId} {tr}Unlock{/tr} {/self_link} {else} - {if (isset($files[$changes].p_download_files) and $files[$changes].p_download_files eq 'y') - or (!isset($files[$changes].p_download_files) and $files[$changes].perms.tiki_p_download_files eq 'y')} + {if (isset($file.p_download_files) and $file.p_download_files eq 'y') + or (!isset($file.p_download_files) and $file.perms.tiki_p_download_files eq 'y')} {if $prefs.javascript_enabled eq 'y'} {* with javascript, the main page will be reloaded to lock the file and change it's lockedby informations *} - <a href="#" onclick="window.open('{$files[$changes].fileId|sefurl:file:with_next}lock=y'); document.location.href = '{self_link _type='absolute_uri' _tag='n' fileId=$files[$changes].fileId lock=y galleryId=$files[$changes].galleryId}{/self_link}'; return false;"> + <a href="#" onclick="window.open('{$file.fileId|sefurl:file:with_next}lock=y'); document.location.href = '{self_link _type='absolute_uri' _tag='n' fileId=$file.fileId lock=y galleryId=$file.galleryId}{/self_link}'; return false;"> {icon _menu_text=$menu_text _menu_icon=$menu_icon name='import' alt="{tr}Download and lock{/tr}"} </a> {else} {* without javascript, the lockedby information won't be refreshed until the user do it itself *} - <a href="{$files[$changes].fileId|sefurl:file:with_next}lock=y"> + <a href="{$file.fileId|sefurl:file:with_next}lock=y"> {icon _menu_text=$menu_text _menu_icon=$menu_icon name='import' alt="{tr}Download and lock{/tr}"} </a> {/if} {/if} - {self_link _icon_name='lock' _menu_text=$menu_text _menu_icon=$menu_icon lock='y' fileId=$files[$changes].fileId galleryId=$files[$changes].galleryId} + {self_link _icon_name='lock' _menu_text=$menu_text _menu_icon=$menu_icon lock='y' fileId=$file.fileId galleryId=$file.galleryId} {tr}Lock{/tr} {/self_link} {/if} @@ -205,7 +205,7 @@ {/if} {if $prefs.feature_webdav eq 'y'} - {assign var=virtual_path value=$files[$changes].fileId|virtual_path} + {assign var=virtual_path value=$file.fileId|virtual_path} {if $prefs.feature_file_galleries_save_draft eq 'y'} {self_link _icon_name="file-archive-open" _menu_text=$menu_text _menu_icon=$menu_icon _script="javascript:open_webdav('$virtual_path')" _noauto="y" _ajax="n"} @@ -219,21 +219,21 @@ {/if} {if $prefs.feature_share eq 'y' and $tiki_p_share eq 'y'} - <a href="tiki-share.php?url={$tikiroot}{$files[$changes].id|sefurl:file|escape:'url'}"> + <a href="tiki-share.php?url={$tikiroot}{$file.id|sefurl:file|escape:'url'}"> {icon _menu_text=$menu_text _menu_icon=$menu_icon name='share' alt="{tr}Share a link to this file{/tr}"} </a> {/if} {if $prefs.feature_tell_a_friend eq 'y' and $tiki_p_tell_a_friend eq 'y'} - <a href="tiki-tell_a_friend.php?url={$tikiroot}{$files[$changes].id|sefurl:file|escape:'url'}"> + <a href="tiki-tell_a_friend.php?url={$tikiroot}{$file.id|sefurl:file|escape:'url'}"> {icon _menu_text=$menu_text _menu_icon=$menu_icon name='envelope' alt="{tr}Email a link to this file{/tr}"} </a> {/if} - {if $files[$changes].perms.tiki_p_admin_file_galleries eq 'y' - or (!$files[$changes].lockedby and (($user and $user eq $files[$changes].user) - or ($files[$changes].perms.tiki_p_edit_gallery_file eq 'y' - and $files[$changes].perms.tiki_p_remove_files eq 'y')))} - <a href="tiki-list_file_gallery.php?remove={$files[$changes].fileId}&galleryId={$files[$changes].galleryId}"> + {if $file.perms.tiki_p_admin_file_galleries eq 'y' + or (!$file.lockedby and (($user and $user eq $file.user) + or ($file.perms.tiki_p_edit_gallery_file eq 'y' + and $file.perms.tiki_p_remove_files eq 'y')))} + <a href="tiki-list_file_gallery.php?remove={$file.fileId}&galleryId={$file.galleryId}"> {icon _menu_text=$menu_text _menu_icon=$menu_icon name='remove' alt="{tr}Delete{/tr}"} </a> {/if} Added: trunk/templates/fgal_thumbnailframe.tpl =================================================================== --- trunk/templates/fgal_thumbnailframe.tpl (rev 0) +++ trunk/templates/fgal_thumbnailframe.tpl 2017-09-08 22:29:40 UTC (rev 63788) @@ -0,0 +1,62 @@ +{* Id *} +<div class="thumbnailframe" style="width:100%;height:{if $view != 'page'}{$thumbnailcontener_size}px{else}100%{/if}{if $show_infos neq 'y'};margin-bottom:4px{/if}"> + <div class="thumbimage"> + <div class="thumbimagesub">{assign var=key_type value=$file.type} + {$imagetypes = 'n'} + {if $file.isgal eq 1} + <a {$link}> + {if empty($file.icon_fileId)} + {icon name="admin_fgal" size=3} + {else} + <img src="{$file.icon_fileId|sefurl:thumbnail}"> + {/if} + </a> + {else} + {if $key_type eq 'image/png' or $key_type eq 'image/jpeg' + or $key_type eq 'image/jpg' or $key_type eq 'image/gif' + or $filetype eq 'image/x-ms-bmp'} + {$imagetypes = 'y'} + {/if} + <a {$link} + {if $prefs.feature_shadowbox eq 'y' && empty($filegals_manager)} + {if $imagetypes eq 'y' } + data-box="box[g]" + {elseif $key_type eq 'text/html'} + data-box="shadowbox[gallery];type=iframe" + {elseif $key_type eq 'application/x-shockwave-flash'} + data-box="shadowbox[gallery];type=flash" + {/if} + {/if} + {capture assign='popupContents'} + <div class='opaque'> + <div class='box-title'> + {tr}Properties{/tr} + </div> + <div class='box-data'> + {include file='file_properties_table.tpl'} + </div> + </div> + {/capture} + {if $popupContents neq ''} + {popup fullhtml="1" text=$popupContents} + {else} + title="{if $file.name neq ''}{$file.name|escape}{/if}{if $file.description neq ''} - {$file.description|escape}{/if}" + {/if}> + {if $key_type neq 'image/svg' and $key_type neq 'image/svg+xml'} + {if $imagetypes eq 'y' or $prefs.theme_iconset eq 'legacy'} + {if $view eq 'page'} + <img src="tiki-download_file.php?fileId={$file.id}&preview" style="width:{$maxWidth};max-width: 100%;"> + {else} + <img src="{$file.id|sefurl:thumbnail}" style="max-height:{$thumbnailcontener_size}px"> + {/if} + {else} + {$file.filename|iconify:$key_type:null:3} + {/if} + {else} + <object data="{$file.id|sefurl:thumbnail}" style="width:{$thumbnail_size}px;height:{$thumbnailcontener_size}px;" type="{$key_type}"></object> + {/if} + </a> + {/if} + </div> + </div> +</div> \ No newline at end of file Property changes on: trunk/templates/fgal_thumbnailframe.tpl ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Modified: trunk/templates/file_properties_table.tpl =================================================================== --- trunk/templates/file_properties_table.tpl 2017-09-08 21:12:26 UTC (rev 63787) +++ trunk/templates/file_properties_table.tpl 2017-09-08 22:29:40 UTC (rev 63788) @@ -7,15 +7,15 @@ {else} {assign var=propkey value="show_$propname"} {/if} - {if isset($files[changes].$propname)} - {if $propname == 'share' && isset($files[changes].share.data)} + {if isset($file.$propname)} + {if $propname == 'share' && isset($file.share.data)} {$email = []} - {foreach item=tmp_prop key=tmp_propname from=$files[changes].share.data} + {foreach item=tmp_prop key=tmp_propname from=$file.share.data} {$email[]=$tmp_prop.email} {/foreach} {assign var=propval value=$email|implode:','} {else} - {assign var=propval value=$files[changes].$propname} + {assign var=propval value=$file.$propname} {/if} {/if} {* Format property values *} @@ -44,7 +44,6 @@ <span class="pull-left">{$propval}</span> </td> </tr> - {assign var=nb_over_infos value=$nb_over_infos+1} {/if} {/foreach} </table> Modified: trunk/templates/list_file_gallery_content.tpl =================================================================== --- trunk/templates/list_file_gallery_content.tpl 2017-09-08 21:12:26 UTC (rev 63787) +++ trunk/templates/list_file_gallery_content.tpl 2017-09-08 22:29:40 UTC (rev 63788) @@ -149,7 +149,8 @@ and (!isset($gal_info.show_action) or $gal_info.show_action eq 'y')} {capture name=over_actions} {strip} - {include file='fgal_context_menu.tpl' menu_icon=$prefs.use_context_menu_icon menu_text=$prefs.use_context_menu_text changes=$smarty.section.changes.index} + {$file=$files[changes]}{* For fgal_context_menu.tpl. Cannot be an include parameter, because "file" is a reserved name. *} + {include file='fgal_context_menu.tpl' menu_icon=$prefs.use_context_menu_icon menu_text=$prefs.use_context_menu_text} {/strip} {/capture} {/if} @@ -456,7 +457,8 @@ {if ( $prefs.use_context_menu_icon neq 'y' and $prefs.use_context_menu_text neq 'y' ) or (isset($gal_info.show_action) and $gal_info.show_action eq 'y') or $prefs.javascript_enabled neq 'y'} - <td>{include file='fgal_context_menu.tpl' changes=$smarty.section.changes.index}</td> + {$file=$files[changes]}{* For fgal_context_menu.tpl. Cannot be an include parameter, because "file" is a reserved name. *} + <td>{include file='fgal_context_menu.tpl'}</td> {/if} {if ( $other_columns neq '' or $other_columns_selected neq '' ) and $prefs.javascript_enabled eq 'y'} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ch...@us...> - 2017-09-08 23:13:49
|
Revision: 63791 http://sourceforge.net/p/tikiwiki/code/63791 Author: chealer Date: 2017-09-08 23:13:46 +0000 (Fri, 08 Sep 2017) Log Message: ----------- [REF] Split fgal_file_link_attributes.tpl from browse_file_gallery.tpl Modified Paths: -------------- trunk/templates/browse_file_gallery.tpl Added Paths: ----------- trunk/templates/fgal_file_link_attributes.tpl Modified: trunk/templates/browse_file_gallery.tpl =================================================================== --- trunk/templates/browse_file_gallery.tpl 2017-09-08 23:11:17 UTC (rev 63790) +++ trunk/templates/browse_file_gallery.tpl 2017-09-08 23:13:46 UTC (rev 63791) @@ -31,27 +31,7 @@ {* show files and subgals in browsing view *} {* build link *} {capture assign=link} - {strip} - {if $file.isgal eq 1} - href="tiki-list_file_gallery.php?galleryId={$file.id}{if !empty($filegals_manager)}&filegals_manager={$filegals_manager|escape}{/if}&view=browse" - {else} - {if !empty($filegals_manager)} - href="#" onclick="window.opener.insertAt('{$filegals_manager}','{$file.wiki_syntax|escape}');checkClose();return false;" title="{tr}Click here to use the file{/tr}" - {elseif $tiki_p_download_files eq 'y'} - {if $gal_info.type eq 'podcast' or $gal_info.type eq 'vidcast'} - href="{$prefs.fgal_podcast_dir}{$file.path}" - {else} - href="{if $prefs.javascript_enabled eq 'y' && $file.type|truncate:5:'':true eq 'image'} - {$file.id|sefurl:preview} - {elseif $file.type neq 'application/x-shockwave-flash'} - {$file.id|sefurl:file} - {else} - {$file.id|sefurl:display} - {/if}" - {/if} - {/if} - {/if} - {/strip} + {include 'fgal_file_link_attributes.tpl' log_tpl=false} {/capture} {math equation="x + 6" x=$thumbnail_size assign=thumbnailcontener_size} Added: trunk/templates/fgal_file_link_attributes.tpl =================================================================== --- trunk/templates/fgal_file_link_attributes.tpl (rev 0) +++ trunk/templates/fgal_file_link_attributes.tpl 2017-09-08 23:13:46 UTC (rev 63791) @@ -0,0 +1,21 @@ +{strip} + {if $file.isgal eq 1} + href="tiki-list_file_gallery.php?galleryId={$file.id}{if !empty($filegals_manager)}&filegals_manager={$filegals_manager|escape}{/if}&view=browse" + {else} + {if !empty($filegals_manager)} + href="#" onclick="window.opener.insertAt('{$filegals_manager}','{$file.wiki_syntax|escape}');checkClose();return false;" title="{tr}Click here to use the file{/tr}" + {elseif $tiki_p_download_files eq 'y'} + {if $gal_info.type eq 'podcast' or $gal_info.type eq 'vidcast'} + href="{$prefs.fgal_podcast_dir}{$file.path}" + {else} + href="{if $prefs.javascript_enabled eq 'y' && $file.type|truncate:5:'':true eq 'image'} + {$file.id|sefurl:preview} + {elseif $file.type neq 'application/x-shockwave-flash'} + {$file.id|sefurl:file} + {else} + {$file.id|sefurl:display} + {/if}" + {/if} + {/if} + {/if} +{/strip} \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jon...@us...> - 2017-09-26 11:22:12
|
Revision: 64016 http://sourceforge.net/p/tikiwiki/code/64016 Author: jonnybradley Date: 2017-09-26 11:22:09 +0000 (Tue, 26 Sep 2017) Log Message: ----------- [FIX] calendar: Various JS errors (more fixes still TODO) Modified Paths: -------------- trunk/templates/tiki-calendar.tpl trunk/templates/tiki-calendar_edit_item.tpl Modified: trunk/templates/tiki-calendar.tpl =================================================================== --- trunk/templates/tiki-calendar.tpl 2017-09-26 10:39:29 UTC (rev 64015) +++ trunk/templates/tiki-calendar.tpl 2017-09-26 11:22:09 UTC (rev 64016) @@ -248,7 +248,6 @@ $( "#calendar_dialog h1, #calendar_dialog .navbar", $dialog ).remove(); $( "#calendar_dialog .modal-title", $dialog ).html(event.title); $dialog.appendTo("body").modal({backdrop:"static"}); - $this.tikiModal(); } }); return false; Modified: trunk/templates/tiki-calendar_edit_item.tpl =================================================================== --- trunk/templates/tiki-calendar_edit_item.tpl 2017-09-26 10:39:29 UTC (rev 64015) +++ trunk/templates/tiki-calendar_edit_item.tpl 2017-09-26 11:22:09 UTC (rev 64016) @@ -456,7 +456,7 @@ {html_select_time prefix="duration_" display_seconds=false time=$calitem.duration|default:'01:00' minute_interval=$prefs.calendar_timespan} </div> <div class="col-md-2 time"> - <a href="#" id="durationBtn" class="btn btn-xs"> + <a href="#" id="durationBtn" class="btn btn-xs btn-default"> {tr}Show duration{/tr} </a> </div> @@ -535,8 +535,8 @@ times.end = new Date(times.start.getTime() + times.duration.getTime()); $("select[name=end_Hour]").val(fNum(times.end.getHours())).trigger("chosen:updated"); $("select[name=end_Minute]").val(fNum(times.end.getMinutes())).trigger("chosen:updated"); - $("#end").next() - .datepicker("setDate", $.datepicker.formatDate($("#end").next().datepicker("option", "dateFormat"), times.end)) + $("#end").nextAll("input[type=text]") + .datepicker("setDate", $.datepicker.formatDate($("#end").nextAll("input[type=text]").datepicker("option", "dateFormat"), times.end)) .datepicker("refresh"); $("#end").val(times.end.getTime() / 1000); $("#start").val(times.start.getTime() / 1000); @@ -548,8 +548,8 @@ if (e <= s) { $("select[name=start_Hour]").val(fNum(times.end.getHours())).trigger("chosen:updated"); $("select[name=start_Minute]").val(fNum(times.end.getMinutes())).trigger("chosen:updated"); - $("#start").next() - .datepicker("setDate", $.datepicker.formatDate($("#start").next().datepicker("option", "dateFormat"), times.end)) + $("#start").nextAll("input[type=text]") + .datepicker("setDate", $.datepicker.formatDate($("#start").nextAll("input[type=text]").datepicker("option", "dateFormat"), times.end)) .datepicker( "refresh" ); $("#start").val(times.end.getTime() / 1000); s = e; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jon...@us...> - 2017-10-29 17:22:00
|
Revision: 64425 http://sourceforge.net/p/tikiwiki/code/64425 Author: jonnybradley Date: 2017-10-29 17:21:58 +0000 (Sun, 29 Oct 2017) Log Message: ----------- [ENH] trackers: Add buttons to get to and from the tracker tabular formats management page Modified Paths: -------------- trunk/templates/tabular/manage.tpl trunk/templates/tiki-list_trackers.tpl Modified: trunk/templates/tabular/manage.tpl =================================================================== --- trunk/templates/tabular/manage.tpl 2017-10-29 17:06:03 UTC (rev 64424) +++ trunk/templates/tabular/manage.tpl 2017-10-29 17:21:58 UTC (rev 64425) @@ -9,6 +9,7 @@ {permission name=admin_trackers} <a class="btn btn-default" href="{service controller=tabular action=create}">{icon name=create} {tr}New{/tr}</a> {/permission} + <a class="btn btn-default" href={''|sefurl:'tracker'}>{icon name=trackers} {tr}Trackers{/tr}</a> </div> {/block} Modified: trunk/templates/tiki-list_trackers.tpl =================================================================== --- trunk/templates/tiki-list_trackers.tpl 2017-10-29 17:06:03 UTC (rev 64424) +++ trunk/templates/tiki-list_trackers.tpl 2017-10-29 17:21:58 UTC (rev 64425) @@ -39,9 +39,14 @@ {/if} </ul> </div> + {if $prefs.tracker_tabular_enabled eq 'y'} + <a class="btn btn-default" href="{service controller=tabular action=manage}"> + {icon name="list"} {tr}Manage Tabular Formats{/tr} + </a> + {/if} {if $prefs.tracker_remote_sync eq 'y'} <a class="btn btn-default" href="{service controller=tracker_sync action=clone_remote}"> - {icon name="copy"} {tr}Clone remote{/tr} + {icon name="copy"} {tr}Clone remote{/tr} </a> {/if} </div> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rob...@us...> - 2017-11-21 16:17:13
|
Revision: 64653 http://sourceforge.net/p/tikiwiki/code/64653 Author: robertokir Date: 2017-11-21 16:17:11 +0000 (Tue, 21 Nov 2017) Log Message: ----------- Move/rename the template, for better coherence after deletion of tiki-report_string_in_db.php. Added Paths: ----------- trunk/templates/admin/include_search_report_string_in_db.tpl Removed Paths: ------------- trunk/templates/tiki-report_string_in_db.tpl Copied: trunk/templates/admin/include_search_report_string_in_db.tpl (from rev 64652, trunk/templates/tiki-report_string_in_db.tpl) =================================================================== --- trunk/templates/admin/include_search_report_string_in_db.tpl (rev 0) +++ trunk/templates/admin/include_search_report_string_in_db.tpl 2017-11-21 16:17:11 UTC (rev 64653) @@ -0,0 +1,117 @@ +{* $Id$ *} +<h2 class="panel-title">Occurences of string in database</h2> +<input type="text" id="string_in_db_search" name="string_in_db_search" size="60" value="{$searchStringAgain|escape}" /> <input type="submit" class="btn btn-default btn-sm" value="Search" onClick="document.getElementById('redirect').value='0';"/> +<input type="hidden" id="redirect" name="redirect" value="1"> + +<hr/> +{if isset($errorMsg)} + <span id="error">{$errorMsg}</span> +{else} + {if isset($searchString)} + {remarksbox}{tr}Results for {/tr}<b>{$searchString|escape}</b> {tr}in all tables:{/tr}{/remarksbox} + <p> + + <input type="hidden" name="query" value="{$searchString}"> + <input type="hidden" id="table" name="table" value=""> + <input type="hidden" id="column" name="column" value=""> + + <table class="string_in_db_search table normal"> + <tr> + <th>{tr}Table{/tr}</th> + <th>{tr}Column{/tr}</th> + <th>{tr}Occurrences{/tr}</th> + </tr> + {$last = ''} + {foreach from=$searchResult item=res} + {$table = $res['table']} + <tr> + {if $last eq '' || $last neq $table} + {$span = $tableCount["$table"]} + <td rowspan="{$span}">{$table|escape}</td> + {/if} + <td><input type="submit" class="btn btn-link" value="{$res['column']|escape}" title="{tr}View occurrences{/tr}" onClick="document.getElementById('table').value='{$res['table']}'; document.getElementById('column').value='{$res['column']}'; document.getElementById('redirect').value='0'; document.getElementById('string_in_db_search').value='';"></td> + <td>{$res['occurrences']|escape}</td> + </tr> + {$last = $table} + {/foreach} + </table> + </p> + {/if} + + {if isset($tableHeaders)} + {remarksbox}{tr}Results for {/tr}<b>{$searchStringAgain|escape}</b> {tr}in table {/tr} <b>{$tableName}</b>:{/remarksbox} + <table class="table"> + <tr> + {foreach from=$tableHeaders item=hdr} + <th>{$hdr}</th> + {/foreach} + </tr> + + {foreach from=$tableData item=row} + <tr> + {foreach from=$row key=column item=val} + {$value = $val|truncate:30|escape} + {if $tableName=='tiki_pages' && ($column=='pageName' || $column=='pageSlug' || $column=='data' || $column=='description') && $val} + <td><a href=tiki-index.php?page={$row['pageName']|escape} title="{tr}View page{/tr}" target="_blank">{$value}</a></td> + <!-- TODO:<td>{object_link type='wiki page' id={$row['pageName']|escape} class="link tips" title="{$val|escape}:{tr}View page{/tr}"}</td> --> + {elseif $tableName=='tiki_blog_posts' && ($column=='data' || $column=='title')} + <td><a href=tiki-view_blog_post.php?postId={$row['postId']} class="link tips" title="{$row['title']|escape}:{tr}View blog post{/tr}" target="_blank">{$value}</a></td> + {elseif $tableName=='tiki_files' && ($column=='name' || $column=='description' || $column=='filename')} + <td><a href=tiki-download_file.php?fileId={$row['fileId']}&display class="link tips" title="{$row['name']|escape}:{tr}View file{/tr}" target="_blank">{$value}</a></td> + {elseif $tableName=='tiki_file_galleries' && $column=='name'} + <td><a href=tiki-list_file_gallery.php?galleryId={$row['galleryId']} class="link tips" title="{$val|escape}:{tr}View gallery{/tr}" target="_blank">{$value}</a></td> + {elseif $tableName=='tiki_categories' && ($column=='name'|| $column=='description')} + <td><a href=tiki-admin_categories.php?parentId={$row['parentId']}&categId={$row['categId']} class="link tips" title="{$row['name']|escape}:{tr}View category{/tr}" target="_blank">{$value}</a></td> + {elseif $tableName=='tiki_articles' && ($column=='title'|| $column=='heading')} + <td><a href=tiki-read_article.php?articleId={$row['articleId']} class="link tips" title="{$row['title']|escape}:{tr}View article{/tr}" target="_blank">{$value}</a></td> + {elseif $tableName=='tiki_forums' && ($column=='name'|| $column=='description')} + <td><a href=tiki-view_forum.php?forumId={$row['forumId']} class="link tips" title="{$row['name']|escape}:{tr}View forum{/tr}" target="_blank">{$value}</a></td> + {elseif $tableName=='tiki_calendars' && ($column=='name'|| $column=='description')} + <td><a href=tiki-calendar.php?calIds[]={$row['calendarId']} class="link tips" title="{$row['name']|escape}:{tr}View calendar{/tr}" target="_blank">{$value}</a></td> + {elseif $tableName=='tiki_calendar_items' && ($column=='name'|| $column=='description')} + <td><a href=tiki-calendar_edit_item.php?viewcalitemId={$row['calitemId']} class="link tips" title="{$row['name']|escape}:{tr}View calendar item{/tr}" target="_blank">{$value}</a></td> + {elseif $tableName=='tiki_trackers' && ($column=='name'|| $column=='description')} + <td><a href=tiki-view_tracker.php?trackerId={$row['trackerId']} class="link tips" title="{$row['name']|escape}:{tr}View tracker{/tr}" target="_blank">{$value}</a></td> + {elseif $tableName=='tiki_tracker_item_fields' && $column=='value'} + <td><a href=tiki-view_tracker_item.php?itemId={$row['itemId']} class="link tips" title="{$row['value']|escape}:{tr}View tracker item{/tr}" target="_blank">{$value}</a></td> + {elseif $tableName=='tiki_comments'} + {if $row['objectType']=='blog post'} + {if ($column=='objectType' || $column=='data')} + <td><a href=tiki-view_blog_post.php?postId={$row['object']} class="link tips" title="{$row['data']|escape}:{tr}View blog post{/tr}" target="_blank">{$value}</a></td> + {else} + <td>{$value}</td> + {/if} + {elseif $row['objectType']=='forum'} + {if ($column=='objectType' || $column=='data' || $column=='title')} + {if $row['parentId']==0} + <td><a href=tiki-view_forum_thread.php?forumId={$row['object']}&comments_parentId={$row['threadId']}#threadId{$row['threadId']} class="link tips" title="{$row['title']|escape:'htmlall'}:{tr}View forum comment{/tr}" target="_blank">{$value}</a></td> + {else} + <td><a href=tiki-view_forum_thread.php?comments_parentId={$row['parentId']}#threadId{$row['threadId']} class="link tips" title="{$row['title']|escape:'htmlall'}:{tr}View forum comment{/tr}" target="_blank">{$value}</a></td> + {/if} + {else} + <td>{$value}</td> + {/if} + {elseif $row['objectType']=='article'} + {if ($column=='objectType' || $column=='data')} + <td><a href=tiki-read_article.php?articleId={$row['object']} class="link tips" title="{$row['data']|escape}:{tr}View article{/tr}" target="_blank">{$value}</a></td> + {else} + <td>{$value}</td> + {/if} + {elseif $row['objectType']=='wiki page'} + {if ($column=='objectType' || $column=='data' || $column=='object')} + <td><a href="tiki-index.php?page={$row['object']|escape}&threadId={$row['threadId']}&comzone=show#threadId{$row['threadId']}" class="link tips" title="{$row['data']|escape}:{tr}View page{/tr}" target="_blank">{$value}</a></td> + {else} + <td>{$value}</td> + {/if} + {else} + <td>{$value}</td> + {/if} + {else} + <td>{$value}</td> + {/if} + {/foreach} + </tr> + {/foreach} + </table> + {/if} +{/if} Deleted: trunk/templates/tiki-report_string_in_db.tpl =================================================================== --- trunk/templates/tiki-report_string_in_db.tpl 2017-11-21 16:10:17 UTC (rev 64652) +++ trunk/templates/tiki-report_string_in_db.tpl 2017-11-21 16:17:11 UTC (rev 64653) @@ -1,117 +0,0 @@ -{* $Id$ *} -<h2 class="panel-title">Occurences of string in database</h2> -<input type="text" id="string_in_db_search" name="string_in_db_search" size="60" value="{$searchStringAgain|escape}" /> <input type="submit" class="btn btn-default btn-sm" value="Search" onClick="document.getElementById('redirect').value='0';"/> -<input type="hidden" id="redirect" name="redirect" value="1"> - -<hr/> -{if isset($errorMsg)} - <span id="error">{$errorMsg}</span> -{else} - {if isset($searchString)} - {remarksbox}{tr}Results for {/tr}<b>{$searchString|escape}</b> {tr}in all tables:{/tr}{/remarksbox} - <p> - - <input type="hidden" name="query" value="{$searchString}"> - <input type="hidden" id="table" name="table" value=""> - <input type="hidden" id="column" name="column" value=""> - - <table class="string_in_db_search table normal"> - <tr> - <th>{tr}Table{/tr}</th> - <th>{tr}Column{/tr}</th> - <th>{tr}Occurrences{/tr}</th> - </tr> - {$last = ''} - {foreach from=$searchResult item=res} - {$table = $res['table']} - <tr> - {if $last eq '' || $last neq $table} - {$span = $tableCount["$table"]} - <td rowspan="{$span}">{$table|escape}</td> - {/if} - <td><input type="submit" class="btn btn-link" value="{$res['column']|escape}" title="{tr}View occurrences{/tr}" onClick="document.getElementById('table').value='{$res['table']}'; document.getElementById('column').value='{$res['column']}'; document.getElementById('redirect').value='0'; document.getElementById('string_in_db_search').value='';"></td> - <td>{$res['occurrences']|escape}</td> - </tr> - {$last = $table} - {/foreach} - </table> - </p> - {/if} - - {if isset($tableHeaders)} - {remarksbox}{tr}Results for {/tr}<b>{$searchStringAgain|escape}</b> {tr}in table {/tr} <b>{$tableName}</b>:{/remarksbox} - <table class="table"> - <tr> - {foreach from=$tableHeaders item=hdr} - <th>{$hdr}</th> - {/foreach} - </tr> - - {foreach from=$tableData item=row} - <tr> - {foreach from=$row key=column item=val} - {$value = $val|truncate:30|escape} - {if $tableName=='tiki_pages' && ($column=='pageName' || $column=='pageSlug' || $column=='data' || $column=='description') && $val} - <td><a href=tiki-index.php?page={$row['pageName']|escape} title="{tr}View page{/tr}" target="_blank">{$value}</a></td> - <!-- TODO:<td>{object_link type='wiki page' id={$row['pageName']|escape} class="link tips" title="{$val|escape}:{tr}View page{/tr}"}</td> --> - {elseif $tableName=='tiki_blog_posts' && ($column=='data' || $column=='title')} - <td><a href=tiki-view_blog_post.php?postId={$row['postId']} class="link tips" title="{$row['title']|escape}:{tr}View blog post{/tr}" target="_blank">{$value}</a></td> - {elseif $tableName=='tiki_files' && ($column=='name' || $column=='description' || $column=='filename')} - <td><a href=tiki-download_file.php?fileId={$row['fileId']}&display class="link tips" title="{$row['name']|escape}:{tr}View file{/tr}" target="_blank">{$value}</a></td> - {elseif $tableName=='tiki_file_galleries' && $column=='name'} - <td><a href=tiki-list_file_gallery.php?galleryId={$row['galleryId']} class="link tips" title="{$val|escape}:{tr}View gallery{/tr}" target="_blank">{$value}</a></td> - {elseif $tableName=='tiki_categories' && ($column=='name'|| $column=='description')} - <td><a href=tiki-admin_categories.php?parentId={$row['parentId']}&categId={$row['categId']} class="link tips" title="{$row['name']|escape}:{tr}View category{/tr}" target="_blank">{$value}</a></td> - {elseif $tableName=='tiki_articles' && ($column=='title'|| $column=='heading')} - <td><a href=tiki-read_article.php?articleId={$row['articleId']} class="link tips" title="{$row['title']|escape}:{tr}View article{/tr}" target="_blank">{$value}</a></td> - {elseif $tableName=='tiki_forums' && ($column=='name'|| $column=='description')} - <td><a href=tiki-view_forum.php?forumId={$row['forumId']} class="link tips" title="{$row['name']|escape}:{tr}View forum{/tr}" target="_blank">{$value}</a></td> - {elseif $tableName=='tiki_calendars' && ($column=='name'|| $column=='description')} - <td><a href=tiki-calendar.php?calIds[]={$row['calendarId']} class="link tips" title="{$row['name']|escape}:{tr}View calendar{/tr}" target="_blank">{$value}</a></td> - {elseif $tableName=='tiki_calendar_items' && ($column=='name'|| $column=='description')} - <td><a href=tiki-calendar_edit_item.php?viewcalitemId={$row['calitemId']} class="link tips" title="{$row['name']|escape}:{tr}View calendar item{/tr}" target="_blank">{$value}</a></td> - {elseif $tableName=='tiki_trackers' && ($column=='name'|| $column=='description')} - <td><a href=tiki-view_tracker.php?trackerId={$row['trackerId']} class="link tips" title="{$row['name']|escape}:{tr}View tracker{/tr}" target="_blank">{$value}</a></td> - {elseif $tableName=='tiki_tracker_item_fields' && $column=='value'} - <td><a href=tiki-view_tracker_item.php?itemId={$row['itemId']} class="link tips" title="{$row['value']|escape}:{tr}View tracker item{/tr}" target="_blank">{$value}</a></td> - {elseif $tableName=='tiki_comments'} - {if $row['objectType']=='blog post'} - {if ($column=='objectType' || $column=='data')} - <td><a href=tiki-view_blog_post.php?postId={$row['object']} class="link tips" title="{$row['data']|escape}:{tr}View blog post{/tr}" target="_blank">{$value}</a></td> - {else} - <td>{$value}</td> - {/if} - {elseif $row['objectType']=='forum'} - {if ($column=='objectType' || $column=='data' || $column=='title')} - {if $row['parentId']==0} - <td><a href=tiki-view_forum_thread.php?forumId={$row['object']}&comments_parentId={$row['threadId']}#threadId{$row['threadId']} class="link tips" title="{$row['title']|escape:'htmlall'}:{tr}View forum comment{/tr}" target="_blank">{$value}</a></td> - {else} - <td><a href=tiki-view_forum_thread.php?comments_parentId={$row['parentId']}#threadId{$row['threadId']} class="link tips" title="{$row['title']|escape:'htmlall'}:{tr}View forum comment{/tr}" target="_blank">{$value}</a></td> - {/if} - {else} - <td>{$value}</td> - {/if} - {elseif $row['objectType']=='article'} - {if ($column=='objectType' || $column=='data')} - <td><a href=tiki-read_article.php?articleId={$row['object']} class="link tips" title="{$row['data']|escape}:{tr}View article{/tr}" target="_blank">{$value}</a></td> - {else} - <td>{$value}</td> - {/if} - {elseif $row['objectType']=='wiki page'} - {if ($column=='objectType' || $column=='data' || $column=='object')} - <td><a href="tiki-index.php?page={$row['object']|escape}&threadId={$row['threadId']}&comzone=show#threadId{$row['threadId']}" class="link tips" title="{$row['data']|escape}:{tr}View page{/tr}" target="_blank">{$value}</a></td> - {else} - <td>{$value}</td> - {/if} - {else} - <td>{$value}</td> - {/if} - {else} - <td>{$value}</td> - {/if} - {/foreach} - </tr> - {/foreach} - </table> - {/if} -{/if} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: Filipus K. <ch...@gm...> - 2017-11-27 02:45:14
|
This commit completes r64648. On 2017-11-21 11:17, robertokir--- via Tikiwiki-cvs wrote: > Revision: 64653 > http://sourceforge.net/p/tikiwiki/code/64653 > Author: robertokir > Date: 2017-11-21 16:17:11 +0000 (Tue, 21 Nov 2017) > Log Message: > ----------- > Move/rename the template, for better coherence after deletion of tiki-report_string_in_db.php. > > Added Paths: > ----------- > trunk/templates/admin/include_search_report_string_in_db.tpl > > Removed Paths: > ------------- > trunk/templates/tiki-report_string_in_db.tpl > > Copied: trunk/templates/admin/include_search_report_string_in_db.tpl (from rev 64652, trunk/templates/tiki-report_string_in_db.tpl) > =================================================================== > --- trunk/templates/admin/include_search_report_string_in_db.tpl (rev 0) > +++ trunk/templates/admin/include_search_report_string_in_db.tpl 2017-11-21 16:17:11 UTC (rev 64653) > @@ -0,0 +1,117 @@ > +{* $Id$ *} > +<h2 class="panel-title">Occurences of string in database</h2> > +<input type="text" id="string_in_db_search" name="string_in_db_search" size="60" value="{$searchStringAgain|escape}" /> <input type="submit" class="btn btn-default btn-sm" value="Search" onClick="document.getElementById('redirect').value='0';"/> > +<input type="hidden" id="redirect" name="redirect" value="1"> > + > +<hr/> > +{if isset($errorMsg)} > + <span id="error">{$errorMsg}</span> > +{else} > + {if isset($searchString)} > + {remarksbox}{tr}Results for {/tr}<b>{$searchString|escape}</b> {tr}in all tables:{/tr}{/remarksbox} > + <p> > + > + <input type="hidden" name="query" value="{$searchString}"> > + <input type="hidden" id="table" name="table" value=""> > + <input type="hidden" id="column" name="column" value=""> > + > + <table class="string_in_db_search table normal"> > + <tr> > + <th>{tr}Table{/tr}</th> > + <th>{tr}Column{/tr}</th> > + <th>{tr}Occurrences{/tr}</th> > + </tr> > + {$last = ''} > + {foreach from=$searchResult item=res} > + {$table = $res['table']} > + <tr> > + {if $last eq '' || $last neq $table} > + {$span = $tableCount["$table"]} > + <td rowspan="{$span}">{$table|escape}</td> > + {/if} > + <td><input type="submit" class="btn btn-link" value="{$res['column']|escape}" title="{tr}View occurrences{/tr}" onClick="document.getElementById('table').value='{$res['table']}'; document.getElementById('column').value='{$res['column']}'; document.getElementById('redirect').value='0'; document.getElementById('string_in_db_search').value='';"></td> > + <td>{$res['occurrences']|escape}</td> > + </tr> > + {$last = $table} > + {/foreach} > + </table> > + </p> > + {/if} > + > + {if isset($tableHeaders)} > + {remarksbox}{tr}Results for {/tr}<b>{$searchStringAgain|escape}</b> {tr}in table {/tr} <b>{$tableName}</b>:{/remarksbox} > + <table class="table"> > + <tr> > + {foreach from=$tableHeaders item=hdr} > + <th>{$hdr}</th> > + {/foreach} > + </tr> > + > + {foreach from=$tableData item=row} > + <tr> > + {foreach from=$row key=column item=val} > + {$value = $val|truncate:30|escape} > + {if $tableName=='tiki_pages' && ($column=='pageName' || $column=='pageSlug' || $column=='data' || $column=='description') && $val} > + <td><a href=tiki-index.php?page={$row['pageName']|escape} title="{tr}View page{/tr}" target="_blank">{$value}</a></td> > + <!-- TODO:<td>{object_link type='wiki page' id={$row['pageName']|escape} class="link tips" title="{$val|escape}:{tr}View page{/tr}"}</td> --> > + {elseif $tableName=='tiki_blog_posts' && ($column=='data' || $column=='title')} > + <td><a href=tiki-view_blog_post.php?postId={$row['postId']} class="link tips" title="{$row['title']|escape}:{tr}View blog post{/tr}" target="_blank">{$value}</a></td> > + {elseif $tableName=='tiki_files' && ($column=='name' || $column=='description' || $column=='filename')} > + <td><a href=tiki-download_file.php?fileId={$row['fileId']}&display class="link tips" title="{$row['name']|escape}:{tr}View file{/tr}" target="_blank">{$value}</a></td> > + {elseif $tableName=='tiki_file_galleries' && $column=='name'} > + <td><a href=tiki-list_file_gallery.php?galleryId={$row['galleryId']} class="link tips" title="{$val|escape}:{tr}View gallery{/tr}" target="_blank">{$value}</a></td> > + {elseif $tableName=='tiki_categories' && ($column=='name'|| $column=='description')} > + <td><a href=tiki-admin_categories.php?parentId={$row['parentId']}&categId={$row['categId']} class="link tips" title="{$row['name']|escape}:{tr}View category{/tr}" target="_blank">{$value}</a></td> > + {elseif $tableName=='tiki_articles' && ($column=='title'|| $column=='heading')} > + <td><a href=tiki-read_article.php?articleId={$row['articleId']} class="link tips" title="{$row['title']|escape}:{tr}View article{/tr}" target="_blank">{$value}</a></td> > + {elseif $tableName=='tiki_forums' && ($column=='name'|| $column=='description')} > + <td><a href=tiki-view_forum.php?forumId={$row['forumId']} class="link tips" title="{$row['name']|escape}:{tr}View forum{/tr}" target="_blank">{$value}</a></td> > + {elseif $tableName=='tiki_calendars' && ($column=='name'|| $column=='description')} > + <td><a href=tiki-calendar.php?calIds[]={$row['calendarId']} class="link tips" title="{$row['name']|escape}:{tr}View calendar{/tr}" target="_blank">{$value}</a></td> > + {elseif $tableName=='tiki_calendar_items' && ($column=='name'|| $column=='description')} > + <td><a href=tiki-calendar_edit_item.php?viewcalitemId={$row['calitemId']} class="link tips" title="{$row['name']|escape}:{tr}View calendar item{/tr}" target="_blank">{$value}</a></td> > + {elseif $tableName=='tiki_trackers' && ($column=='name'|| $column=='description')} > + <td><a href=tiki-view_tracker.php?trackerId={$row['trackerId']} class="link tips" title="{$row['name']|escape}:{tr}View tracker{/tr}" target="_blank">{$value}</a></td> > + {elseif $tableName=='tiki_tracker_item_fields' && $column=='value'} > + <td><a href=tiki-view_tracker_item.php?itemId={$row['itemId']} class="link tips" title="{$row['value']|escape}:{tr}View tracker item{/tr}" target="_blank">{$value}</a></td> > + {elseif $tableName=='tiki_comments'} > + {if $row['objectType']=='blog post'} > + {if ($column=='objectType' || $column=='data')} > + <td><a href=tiki-view_blog_post.php?postId={$row['object']} class="link tips" title="{$row['data']|escape}:{tr}View blog post{/tr}" target="_blank">{$value}</a></td> > + {else} > + <td>{$value}</td> > + {/if} > + {elseif $row['objectType']=='forum'} > + {if ($column=='objectType' || $column=='data' || $column=='title')} > + {if $row['parentId']==0} > + <td><a href=tiki-view_forum_thread.php?forumId={$row['object']}&comments_parentId={$row['threadId']}#threadId{$row['threadId']} class="link tips" title="{$row['title']|escape:'htmlall'}:{tr}View forum comment{/tr}" target="_blank">{$value}</a></td> > + {else} > + <td><a href=tiki-view_forum_thread.php?comments_parentId={$row['parentId']}#threadId{$row['threadId']} class="link tips" title="{$row['title']|escape:'htmlall'}:{tr}View forum comment{/tr}" target="_blank">{$value}</a></td> > + {/if} > + {else} > + <td>{$value}</td> > + {/if} > + {elseif $row['objectType']=='article'} > + {if ($column=='objectType' || $column=='data')} > + <td><a href=tiki-read_article.php?articleId={$row['object']} class="link tips" title="{$row['data']|escape}:{tr}View article{/tr}" target="_blank">{$value}</a></td> > + {else} > + <td>{$value}</td> > + {/if} > + {elseif $row['objectType']=='wiki page'} > + {if ($column=='objectType' || $column=='data' || $column=='object')} > + <td><a href="tiki-index.php?page={$row['object']|escape}&threadId={$row['threadId']}&comzone=show#threadId{$row['threadId']}" class="link tips" title="{$row['data']|escape}:{tr}View page{/tr}" target="_blank">{$value}</a></td> > + {else} > + <td>{$value}</td> > + {/if} > + {else} > + <td>{$value}</td> > + {/if} > + {else} > + <td>{$value}</td> > + {/if} > + {/foreach} > + </tr> > + {/foreach} > + </table> > + {/if} > +{/if} > > Deleted: trunk/templates/tiki-report_string_in_db.tpl > =================================================================== > --- trunk/templates/tiki-report_string_in_db.tpl 2017-11-21 16:10:17 UTC (rev 64652) > +++ trunk/templates/tiki-report_string_in_db.tpl 2017-11-21 16:17:11 UTC (rev 64653) > @@ -1,117 +0,0 @@ > -{* $Id$ *} > -<h2 class="panel-title">Occurences of string in database</h2> > -<input type="text" id="string_in_db_search" name="string_in_db_search" size="60" value="{$searchStringAgain|escape}" /> <input type="submit" class="btn btn-default btn-sm" value="Search" onClick="document.getElementById('redirect').value='0';"/> > -<input type="hidden" id="redirect" name="redirect" value="1"> > - > -<hr/> > -{if isset($errorMsg)} > - <span id="error">{$errorMsg}</span> > -{else} > - {if isset($searchString)} > - {remarksbox}{tr}Results for {/tr}<b>{$searchString|escape}</b> {tr}in all tables:{/tr}{/remarksbox} > - <p> > - > - <input type="hidden" name="query" value="{$searchString}"> > - <input type="hidden" id="table" name="table" value=""> > - <input type="hidden" id="column" name="column" value=""> > - > - <table class="string_in_db_search table normal"> > - <tr> > - <th>{tr}Table{/tr}</th> > - <th>{tr}Column{/tr}</th> > - <th>{tr}Occurrences{/tr}</th> > - </tr> > - {$last = ''} > - {foreach from=$searchResult item=res} > - {$table = $res['table']} > - <tr> > - {if $last eq '' || $last neq $table} > - {$span = $tableCount["$table"]} > - <td rowspan="{$span}">{$table|escape}</td> > - {/if} > - <td><input type="submit" class="btn btn-link" value="{$res['column']|escape}" title="{tr}View occurrences{/tr}" onClick="document.getElementById('table').value='{$res['table']}'; document.getElementById('column').value='{$res['column']}'; document.getElementById('redirect').value='0'; document.getElementById('string_in_db_search').value='';"></td> > - <td>{$res['occurrences']|escape}</td> > - </tr> > - {$last = $table} > - {/foreach} > - </table> > - </p> > - {/if} > - > - {if isset($tableHeaders)} > - {remarksbox}{tr}Results for {/tr}<b>{$searchStringAgain|escape}</b> {tr}in table {/tr} <b>{$tableName}</b>:{/remarksbox} > - <table class="table"> > - <tr> > - {foreach from=$tableHeaders item=hdr} > - <th>{$hdr}</th> > - {/foreach} > - </tr> > - > - {foreach from=$tableData item=row} > - <tr> > - {foreach from=$row key=column item=val} > - {$value = $val|truncate:30|escape} > - {if $tableName=='tiki_pages' && ($column=='pageName' || $column=='pageSlug' || $column=='data' || $column=='description') && $val} > - <td><a href=tiki-index.php?page={$row['pageName']|escape} title="{tr}View page{/tr}" target="_blank">{$value}</a></td> > - <!-- TODO:<td>{object_link type='wiki page' id={$row['pageName']|escape} class="link tips" title="{$val|escape}:{tr}View page{/tr}"}</td> --> > - {elseif $tableName=='tiki_blog_posts' && ($column=='data' || $column=='title')} > - <td><a href=tiki-view_blog_post.php?postId={$row['postId']} class="link tips" title="{$row['title']|escape}:{tr}View blog post{/tr}" target="_blank">{$value}</a></td> > - {elseif $tableName=='tiki_files' && ($column=='name' || $column=='description' || $column=='filename')} > - <td><a href=tiki-download_file.php?fileId={$row['fileId']}&display class="link tips" title="{$row['name']|escape}:{tr}View file{/tr}" target="_blank">{$value}</a></td> > - {elseif $tableName=='tiki_file_galleries' && $column=='name'} > - <td><a href=tiki-list_file_gallery.php?galleryId={$row['galleryId']} class="link tips" title="{$val|escape}:{tr}View gallery{/tr}" target="_blank">{$value}</a></td> > - {elseif $tableName=='tiki_categories' && ($column=='name'|| $column=='description')} > - <td><a href=tiki-admin_categories.php?parentId={$row['parentId']}&categId={$row['categId']} class="link tips" title="{$row['name']|escape}:{tr}View category{/tr}" target="_blank">{$value}</a></td> > - {elseif $tableName=='tiki_articles' && ($column=='title'|| $column=='heading')} > - <td><a href=tiki-read_article.php?articleId={$row['articleId']} class="link tips" title="{$row['title']|escape}:{tr}View article{/tr}" target="_blank">{$value}</a></td> > - {elseif $tableName=='tiki_forums' && ($column=='name'|| $column=='description')} > - <td><a href=tiki-view_forum.php?forumId={$row['forumId']} class="link tips" title="{$row['name']|escape}:{tr}View forum{/tr}" target="_blank">{$value}</a></td> > - {elseif $tableName=='tiki_calendars' && ($column=='name'|| $column=='description')} > - <td><a href=tiki-calendar.php?calIds[]={$row['calendarId']} class="link tips" title="{$row['name']|escape}:{tr}View calendar{/tr}" target="_blank">{$value}</a></td> > - {elseif $tableName=='tiki_calendar_items' && ($column=='name'|| $column=='description')} > - <td><a href=tiki-calendar_edit_item.php?viewcalitemId={$row['calitemId']} class="link tips" title="{$row['name']|escape}:{tr}View calendar item{/tr}" target="_blank">{$value}</a></td> > - {elseif $tableName=='tiki_trackers' && ($column=='name'|| $column=='description')} > - <td><a href=tiki-view_tracker.php?trackerId={$row['trackerId']} class="link tips" title="{$row['name']|escape}:{tr}View tracker{/tr}" target="_blank">{$value}</a></td> > - {elseif $tableName=='tiki_tracker_item_fields' && $column=='value'} > - <td><a href=tiki-view_tracker_item.php?itemId={$row['itemId']} class="link tips" title="{$row['value']|escape}:{tr}View tracker item{/tr}" target="_blank">{$value}</a></td> > - {elseif $tableName=='tiki_comments'} > - {if $row['objectType']=='blog post'} > - {if ($column=='objectType' || $column=='data')} > - <td><a href=tiki-view_blog_post.php?postId={$row['object']} class="link tips" title="{$row['data']|escape}:{tr}View blog post{/tr}" target="_blank">{$value}</a></td> > - {else} > - <td>{$value}</td> > - {/if} > - {elseif $row['objectType']=='forum'} > - {if ($column=='objectType' || $column=='data' || $column=='title')} > - {if $row['parentId']==0} > - <td><a href=tiki-view_forum_thread.php?forumId={$row['object']}&comments_parentId={$row['threadId']}#threadId{$row['threadId']} class="link tips" title="{$row['title']|escape:'htmlall'}:{tr}View forum comment{/tr}" target="_blank">{$value}</a></td> > - {else} > - <td><a href=tiki-view_forum_thread.php?comments_parentId={$row['parentId']}#threadId{$row['threadId']} class="link tips" title="{$row['title']|escape:'htmlall'}:{tr}View forum comment{/tr}" target="_blank">{$value}</a></td> > - {/if} > - {else} > - <td>{$value}</td> > - {/if} > - {elseif $row['objectType']=='article'} > - {if ($column=='objectType' || $column=='data')} > - <td><a href=tiki-read_article.php?articleId={$row['object']} class="link tips" title="{$row['data']|escape}:{tr}View article{/tr}" target="_blank">{$value}</a></td> > - {else} > - <td>{$value}</td> > - {/if} > - {elseif $row['objectType']=='wiki page'} > - {if ($column=='objectType' || $column=='data' || $column=='object')} > - <td><a href="tiki-index.php?page={$row['object']|escape}&threadId={$row['threadId']}&comzone=show#threadId{$row['threadId']}" class="link tips" title="{$row['data']|escape}:{tr}View page{/tr}" target="_blank">{$value}</a></td> > - {else} > - <td>{$value}</td> > - {/if} > - {else} > - <td>{$value}</td> > - {/if} > - {else} > - <td>{$value}</td> > - {/if} > - {/foreach} > - </tr> > - {/foreach} > - </table> > - {/if} > -{/if} > -- Filipus Klutiero http://www.philippecloutier.com |
From: <lu...@us...> - 2018-03-31 00:47:14
|
Revision: 65845 http://sourceforge.net/p/tikiwiki/code/65845 Author: luciash Date: 2018-03-31 00:47:13 +0000 (Sat, 31 Mar 2018) Log Message: ----------- [ENH] Webmail: Address book pop-up contacts - insert multiple addresses nicely separated by comma + escape bcc too (just in case and for the consistency) Modified Paths: -------------- trunk/templates/tiki-webmail.tpl trunk/templates/tiki-webmail_contacts.tpl Modified: trunk/templates/tiki-webmail.tpl =================================================================== --- trunk/templates/tiki-webmail.tpl 2018-03-31 00:37:05 UTC (rev 65844) +++ trunk/templates/tiki-webmail.tpl 2018-03-31 00:47:13 UTC (rev 65845) @@ -710,7 +710,7 @@ </label> </td> <td> - <input type="text" name="bcc" value="{$bcc}" id="bcc" class="form-control"> + <input type="text" name="bcc" value="{$bcc|escape}" id="bcc" class="form-control"> </td> </tr> <tr> Modified: trunk/templates/tiki-webmail_contacts.tpl =================================================================== --- trunk/templates/tiki-webmail_contacts.tpl 2018-03-31 00:37:05 UTC (rev 65844) +++ trunk/templates/tiki-webmail_contacts.tpl 2018-03-31 00:47:13 UTC (rev 65845) @@ -42,7 +42,7 @@ <td class="text">{$channels[user].firstName}</td> <td class="text">{$channels[user].lastName}</td> <td class="email"> - <a class="link" href="#" onClick="javascript:window.opener.document.getElementById('{$element}').value=window.opener.document.getElementById('{$element}').value + '{$channels[user].email}' + ' ';"> + <a class="link" href="#" onclick="var em = window.opener.document.getElementById('{$element}').value; if (em != '') window.opener.document.getElementById('{$element}').value = window.opener.document.getElementById('{$element}').value + ', {$channels[user].email}'; if (em == '') window.opener.document.getElementById('{$element}').value = window.opener.document.getElementById('{$element}').value + '{$channels[user].email}';">{* TODO: optimize the Javascript code *} {$channels[user].email} </a> [ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <kr...@us...> - 2018-04-12 06:34:04
|
Revision: 65995 http://sourceforge.net/p/tikiwiki/code/65995 Author: kroky6 Date: 2018-04-12 06:34:03 +0000 (Thu, 12 Apr 2018) Log Message: ----------- [FIX] listexecute action submits the relevant editable filters as well now, since they are in different form, JS added to copy them to the action form Modified Paths: -------------- trunk/templates/search/list/table.tpl trunk/templates/wiki-plugins/wikiplugin_listexecute.tpl Modified: trunk/templates/search/list/table.tpl =================================================================== --- trunk/templates/search/list/table.tpl 2018-04-12 06:25:20 UTC (rev 65994) +++ trunk/templates/search/list/table.tpl 2018-04-12 06:34:03 UTC (rev 65995) @@ -146,6 +146,13 @@ $('#listexecute-{{$iListExecute}}').submit(function(){ feedback(tr('Action is being executed, please wait.')); $(this).tikiModal(" "); + var filters = $('#list_filter{{$iListExecute|replace:'wplistexecute-':''}} form').serializeArray(); + for(var i = 0, l = filters.length; i < l; i++) { + var inp = $('<input type="hidden">'); + inp.attr('name', filters[i].name); + inp.val(filters[i].value); + $('#listexecute-{{$iListExecute}}').append(inp); + } }); })(); {/jq} Modified: trunk/templates/wiki-plugins/wikiplugin_listexecute.tpl =================================================================== --- trunk/templates/wiki-plugins/wikiplugin_listexecute.tpl 2018-04-12 06:25:20 UTC (rev 65994) +++ trunk/templates/wiki-plugins/wikiplugin_listexecute.tpl 2018-04-12 06:34:03 UTC (rev 65995) @@ -35,4 +35,13 @@ $(this).siblings('input[name=list_input]').hide(); } }); +$('#listexecute-{{$iListExecute}}').submit(function(){ + var filters = $('#list_filter{{$iListExecute|replace:'wplistexecute-':''}} form').serializeArray(); + for(var i = 0, l = filters.length; i < l; i++) { + var inp = $('<input type="hidden">'); + inp.attr('name', filters[i].name); + inp.val(filters[i].value); + $('#listexecute-{{$iListExecute}}').append(inp); + } +}); {/jq} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lu...@us...> - 2018-04-17 11:03:47
|
Revision: 66064 http://sourceforge.net/p/tikiwiki/code/66064 Author: luciash Date: 2018-04-17 11:03:44 +0000 (Tue, 17 Apr 2018) Log Message: ----------- Mass search and replace: Copyright year bump up to 2018 in Tiki PHP files (templates/ dir) Modified Paths: -------------- trunk/templates/access/index.php trunk/templates/activity/index.php trunk/templates/activitystream/index.php trunk/templates/admin/index.php trunk/templates/article/index.php trunk/templates/category/index.php trunk/templates/comment/index.php trunk/templates/debug/index.php trunk/templates/draw/index.php trunk/templates/edit/index.php trunk/templates/examples/index.php trunk/templates/examples/shop/index.php trunk/templates/file/index.php trunk/templates/filter_control/index.php trunk/templates/goal/index.php trunk/templates/index.php trunk/templates/kaltura/index.php trunk/templates/language/index.php trunk/templates/layouts/basic/index.php trunk/templates/layouts/classic/index.php trunk/templates/layouts/fixed_top_modules/index.php trunk/templates/layouts/header_middle_footer_containers_3-6-3/index.php trunk/templates/layouts/index.php trunk/templates/layouts/internal/index.php trunk/templates/layouts/social/index.php trunk/templates/mail/index.php trunk/templates/mailin/index.php trunk/templates/managestream/index.php trunk/templates/menu/index.php trunk/templates/metadata/index.php trunk/templates/module/index.php trunk/templates/modules/index.php trunk/templates/monitor/index.php trunk/templates/mustread/index.php trunk/templates/object/index.php trunk/templates/object/infobox/index.php trunk/templates/plugins/index.php trunk/templates/prefs/index.php trunk/templates/print/index.php trunk/templates/rating/index.php trunk/templates/recommendation_dev/index.php trunk/templates/report/index.php trunk/templates/search/index.php trunk/templates/search/list/index.php trunk/templates/search_customsearch/index.php trunk/templates/search_manifold/index.php trunk/templates/search_stored/index.php trunk/templates/social/index.php trunk/templates/styleguide/index.php trunk/templates/suite/index.php trunk/templates/tablesorter/index.php trunk/templates/tabular/index.php trunk/templates/tracker/index.php trunk/templates/tracker_sync/index.php trunk/templates/tracker_todo/index.php trunk/templates/trackerinput/index.php trunk/templates/trackeroutput/index.php trunk/templates/translation/index.php trunk/templates/user/index.php trunk/templates/user_conditions/index.php trunk/templates/vimeo/index.php trunk/templates/wiki/index.php trunk/templates/wiki-plugins/index.php trunk/templates/wizard/index.php trunk/templates/workspace/index.php Modified: trunk/templates/access/index.php =================================================================== --- trunk/templates/access/index.php 2018-04-17 11:01:49 UTC (rev 66063) +++ trunk/templates/access/index.php 2018-04-17 11:03:44 UTC (rev 66064) @@ -1,5 +1,5 @@ <?php -// (c) Copyright 2002-2016 by authors of the Tiki Wiki CMS Groupware Project +// (c) Copyright 2002-2018 by authors of the Tiki Wiki CMS Groupware Project // // All Rights Reserved. See copyright.txt for details and a complete list of authors. // Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details. Modified: trunk/templates/activity/index.php =================================================================== --- trunk/templates/activity/index.php 2018-04-17 11:01:49 UTC (rev 66063) +++ trunk/templates/activity/index.php 2018-04-17 11:03:44 UTC (rev 66064) @@ -1,5 +1,5 @@ <?php -// (c) Copyright 2002-2016 by authors of the Tiki Wiki CMS Groupware Project +// (c) Copyright 2002-2018 by authors of the Tiki Wiki CMS Groupware Project // // All Rights Reserved. See copyright.txt for details and a complete list of authors. // Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details. Modified: trunk/templates/activitystream/index.php =================================================================== --- trunk/templates/activitystream/index.php 2018-04-17 11:01:49 UTC (rev 66063) +++ trunk/templates/activitystream/index.php 2018-04-17 11:03:44 UTC (rev 66064) @@ -1,5 +1,5 @@ <?php -// (c) Copyright 2002-2016 by authors of the Tiki Wiki CMS Groupware Project +// (c) Copyright 2002-2018 by authors of the Tiki Wiki CMS Groupware Project // // All Rights Reserved. See copyright.txt for details and a complete list of authors. // Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details. Modified: trunk/templates/admin/index.php =================================================================== --- trunk/templates/admin/index.php 2018-04-17 11:01:49 UTC (rev 66063) +++ trunk/templates/admin/index.php 2018-04-17 11:03:44 UTC (rev 66064) @@ -1,5 +1,5 @@ <?php -// (c) Copyright 2002-2016 by authors of the Tiki Wiki CMS Groupware Project +// (c) Copyright 2002-2018 by authors of the Tiki Wiki CMS Groupware Project // // All Rights Reserved. See copyright.txt for details and a complete list of authors. // Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details. Modified: trunk/templates/article/index.php =================================================================== --- trunk/templates/article/index.php 2018-04-17 11:01:49 UTC (rev 66063) +++ trunk/templates/article/index.php 2018-04-17 11:03:44 UTC (rev 66064) @@ -1,5 +1,5 @@ <?php -// (c) Copyright 2002-2016 by authors of the Tiki Wiki CMS Groupware Project +// (c) Copyright 2002-2018 by authors of the Tiki Wiki CMS Groupware Project // // All Rights Reserved. See copyright.txt for details and a complete list of authors. // Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details. Modified: trunk/templates/category/index.php =================================================================== --- trunk/templates/category/index.php 2018-04-17 11:01:49 UTC (rev 66063) +++ trunk/templates/category/index.php 2018-04-17 11:03:44 UTC (rev 66064) @@ -1,5 +1,5 @@ <?php -// (c) Copyright 2002-2016 by authors of the Tiki Wiki CMS Groupware Project +// (c) Copyright 2002-2018 by authors of the Tiki Wiki CMS Groupware Project // // All Rights Reserved. See copyright.txt for details and a complete list of authors. // Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details. Modified: trunk/templates/comment/index.php =================================================================== --- trunk/templates/comment/index.php 2018-04-17 11:01:49 UTC (rev 66063) +++ trunk/templates/comment/index.php 2018-04-17 11:03:44 UTC (rev 66064) @@ -1,5 +1,5 @@ <?php -// (c) Copyright 2002-2016 by authors of the Tiki Wiki CMS Groupware Project +// (c) Copyright 2002-2018 by authors of the Tiki Wiki CMS Groupware Project // // All Rights Reserved. See copyright.txt for details and a complete list of authors. // Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details. Modified: trunk/templates/debug/index.php =================================================================== --- trunk/templates/debug/index.php 2018-04-17 11:01:49 UTC (rev 66063) +++ trunk/templates/debug/index.php 2018-04-17 11:03:44 UTC (rev 66064) @@ -1,5 +1,5 @@ <?php -// (c) Copyright 2002-2016 by authors of the Tiki Wiki CMS Groupware Project +// (c) Copyright 2002-2018 by authors of the Tiki Wiki CMS Groupware Project // // All Rights Reserved. See copyright.txt for details and a complete list of authors. // Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details. Modified: trunk/templates/draw/index.php =================================================================== --- trunk/templates/draw/index.php 2018-04-17 11:01:49 UTC (rev 66063) +++ trunk/templates/draw/index.php 2018-04-17 11:03:44 UTC (rev 66064) @@ -1,5 +1,5 @@ <?php -// (c) Copyright 2002-2016 by authors of the Tiki Wiki CMS Groupware Project +// (c) Copyright 2002-2018 by authors of the Tiki Wiki CMS Groupware Project // // All Rights Reserved. See copyright.txt for details and a complete list of authors. // Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details. Modified: trunk/templates/edit/index.php =================================================================== --- trunk/templates/edit/index.php 2018-04-17 11:01:49 UTC (rev 66063) +++ trunk/templates/edit/index.php 2018-04-17 11:03:44 UTC (rev 66064) @@ -1,5 +1,5 @@ <?php -// (c) Copyright 2002-2016 by authors of the Tiki Wiki CMS Groupware Project +// (c) Copyright 2002-2018 by authors of the Tiki Wiki CMS Groupware Project // // All Rights Reserved. See copyright.txt for details and a complete list of authors. // Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details. Modified: trunk/templates/examples/index.php =================================================================== --- trunk/templates/examples/index.php 2018-04-17 11:01:49 UTC (rev 66063) +++ trunk/templates/examples/index.php 2018-04-17 11:03:44 UTC (rev 66064) @@ -1,5 +1,5 @@ <?php -// (c) Copyright 2002-2016 by authors of the Tiki Wiki CMS Groupware Project +// (c) Copyright 2002-2018 by authors of the Tiki Wiki CMS Groupware Project // // All Rights Reserved. See copyright.txt for details and a complete list of authors. // Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details. Modified: trunk/templates/examples/shop/index.php =================================================================== --- trunk/templates/examples/shop/index.php 2018-04-17 11:01:49 UTC (rev 66063) +++ trunk/templates/examples/shop/index.php 2018-04-17 11:03:44 UTC (rev 66064) @@ -1,5 +1,5 @@ <?php -// (c) Copyright 2002-2016 by authors of the Tiki Wiki CMS Groupware Project +// (c) Copyright 2002-2018 by authors of the Tiki Wiki CMS Groupware Project // // All Rights Reserved. See copyright.txt for details and a complete list of authors. // Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details. Modified: trunk/templates/file/index.php =================================================================== --- trunk/templates/file/index.php 2018-04-17 11:01:49 UTC (rev 66063) +++ trunk/templates/file/index.php 2018-04-17 11:03:44 UTC (rev 66064) @@ -1,5 +1,5 @@ <?php -// (c) Copyright 2002-2016 by authors of the Tiki Wiki CMS Groupware Project +// (c) Copyright 2002-2018 by authors of the Tiki Wiki CMS Groupware Project // // All Rights Reserved. See copyright.txt for details and a complete list of authors. // Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details. Modified: trunk/templates/filter_control/index.php =================================================================== --- trunk/templates/filter_control/index.php 2018-04-17 11:01:49 UTC (rev 66063) +++ trunk/templates/filter_control/index.php 2018-04-17 11:03:44 UTC (rev 66064) @@ -1,5 +1,5 @@ <?php -// (c) Copyright 2002-2016 by authors of the Tiki Wiki CMS Groupware Project +// (c) Copyright 2002-2018 by authors of the Tiki Wiki CMS Groupware Project // // All Rights Reserved. See copyright.txt for details and a complete list of authors. // Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details. Modified: trunk/templates/goal/index.php =================================================================== --- trunk/templates/goal/index.php 2018-04-17 11:01:49 UTC (rev 66063) +++ trunk/templates/goal/index.php 2018-04-17 11:03:44 UTC (rev 66064) @@ -1,5 +1,5 @@ <?php -// (c) Copyright 2002-2016 by authors of the Tiki Wiki CMS Groupware Project +// (c) Copyright 2002-2018 by authors of the Tiki Wiki CMS Groupware Project // // All Rights Reserved. See copyright.txt for details and a complete list of authors. // Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details. Modified: trunk/templates/index.php =================================================================== --- trunk/templates/index.php 2018-04-17 11:01:49 UTC (rev 66063) +++ trunk/templates/index.php 2018-04-17 11:03:44 UTC (rev 66064) @@ -1,5 +1,5 @@ <?php -// (c) Copyright 2002-2016 by authors of the Tiki Wiki CMS Groupware Project +// (c) Copyright 2002-2018 by authors of the Tiki Wiki CMS Groupware Project // // All Rights Reserved. See copyright.txt for details and a complete list of authors. // Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details. Modified: trunk/templates/kaltura/index.php =================================================================== --- trunk/templates/kaltura/index.php 2018-04-17 11:01:49 UTC (rev 66063) +++ trunk/templates/kaltura/index.php 2018-04-17 11:03:44 UTC (rev 66064) @@ -1,5 +1,5 @@ <?php -// (c) Copyright 2002-2016 by authors of the Tiki Wiki CMS Groupware Project +// (c) Copyright 2002-2018 by authors of the Tiki Wiki CMS Groupware Project // // All Rights Reserved. See copyright.txt for details and a complete list of authors. // Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details. Modified: trunk/templates/language/index.php =================================================================== --- trunk/templates/language/index.php 2018-04-17 11:01:49 UTC (rev 66063) +++ trunk/templates/language/index.php 2018-04-17 11:03:44 UTC (rev 66064) @@ -1,5 +1,5 @@ <?php -// (c) Copyright 2002-2016 by authors of the Tiki Wiki CMS Groupware Project +// (c) Copyright 2002-2018 by authors of the Tiki Wiki CMS Groupware Project // // All Rights Reserved. See copyright.txt for details and a complete list of authors. // Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details. Modified: trunk/templates/layouts/basic/index.php =================================================================== --- trunk/templates/layouts/basic/index.php 2018-04-17 11:01:49 UTC (rev 66063) +++ trunk/templates/layouts/basic/index.php 2018-04-17 11:03:44 UTC (rev 66064) @@ -1,5 +1,5 @@ <?php -// (c) Copyright 2002-2016 by authors of the Tiki Wiki CMS Groupware Project +// (c) Copyright 2002-2018 by authors of the Tiki Wiki CMS Groupware Project // // All Rights Reserved. See copyright.txt for details and a complete list of authors. // Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details. Modified: trunk/templates/layouts/classic/index.php =================================================================== --- trunk/templates/layouts/classic/index.php 2018-04-17 11:01:49 UTC (rev 66063) +++ trunk/templates/layouts/classic/index.php 2018-04-17 11:03:44 UTC (rev 66064) @@ -1,5 +1,5 @@ <?php -// (c) Copyright 2002-2016 by authors of the Tiki Wiki CMS Groupware Project +// (c) Copyright 2002-2018 by authors of the Tiki Wiki CMS Groupware Project // // All Rights Reserved. See copyright.txt for details and a complete list of authors. // Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details. Modified: trunk/templates/layouts/fixed_top_modules/index.php =================================================================== --- trunk/templates/layouts/fixed_top_modules/index.php 2018-04-17 11:01:49 UTC (rev 66063) +++ trunk/templates/layouts/fixed_top_modules/index.php 2018-04-17 11:03:44 UTC (rev 66064) @@ -1,5 +1,5 @@ <?php -// (c) Copyright 2002-2016 by authors of the Tiki Wiki CMS Groupware Project +// (c) Copyright 2002-2018 by authors of the Tiki Wiki CMS Groupware Project // // All Rights Reserved. See copyright.txt for details and a complete list of authors. // Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details. Modified: trunk/templates/layouts/header_middle_footer_containers_3-6-3/index.php =================================================================== --- trunk/templates/layouts/header_middle_footer_containers_3-6-3/index.php 2018-04-17 11:01:49 UTC (rev 66063) +++ trunk/templates/layouts/header_middle_footer_containers_3-6-3/index.php 2018-04-17 11:03:44 UTC (rev 66064) @@ -1,5 +1,5 @@ <?php -// (c) Copyright 2002-2016 by authors of the Tiki Wiki CMS Groupware Project +// (c) Copyright 2002-2018 by authors of the Tiki Wiki CMS Groupware Project // // All Rights Reserved. See copyright.txt for details and a complete list of authors. // Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details. Modified: trunk/templates/layouts/index.php =================================================================== --- trunk/templates/layouts/index.php 2018-04-17 11:01:49 UTC (rev 66063) +++ trunk/templates/layouts/index.php 2018-04-17 11:03:44 UTC (rev 66064) @@ -1,5 +1,5 @@ <?php -// (c) Copyright 2002-2016 by authors of the Tiki Wiki CMS Groupware Project +// (c) Copyright 2002-2018 by authors of the Tiki Wiki CMS Groupware Project // // All Rights Reserved. See copyright.txt for details and a complete list of authors. // Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details. Modified: trunk/templates/layouts/internal/index.php =================================================================== --- trunk/templates/layouts/internal/index.php 2018-04-17 11:01:49 UTC (rev 66063) +++ trunk/templates/layouts/internal/index.php 2018-04-17 11:03:44 UTC (rev 66064) @@ -1,5 +1,5 @@ <?php -// (c) Copyright 2002-2016 by authors of the Tiki Wiki CMS Groupware Project +// (c) Copyright 2002-2018 by authors of the Tiki Wiki CMS Groupware Project // // All Rights Reserved. See copyright.txt for details and a complete list of authors. // Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details. Modified: trunk/templates/layouts/social/index.php =================================================================== --- trunk/templates/layouts/social/index.php 2018-04-17 11:01:49 UTC (rev 66063) +++ trunk/templates/layouts/social/index.php 2018-04-17 11:03:44 UTC (rev 66064) @@ -1,5 +1,5 @@ <?php -// (c) Copyright 2002-2016 by authors of the Tiki Wiki CMS Groupware Project +// (c) Copyright 2002-2018 by authors of the Tiki Wiki CMS Groupware Project // // All Rights Reserved. See copyright.txt for details and a complete list of authors. // Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details. Modified: trunk/templates/mail/index.php =================================================================== --- trunk/templates/mail/index.php 2018-04-17 11:01:49 UTC (rev 66063) +++ trunk/templates/mail/index.php 2018-04-17 11:03:44 UTC (rev 66064) @@ -1,5 +1,5 @@ <?php -// (c) Copyright 2002-2016 by authors of the Tiki Wiki CMS Groupware Project +// (c) Copyright 2002-2018 by authors of the Tiki Wiki CMS Groupware Project // // All Rights Reserved. See copyright.txt for details and a complete list of authors. // Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details. Modified: trunk/templates/mailin/index.php =================================================================== --- trunk/templates/mailin/index.php 2018-04-17 11:01:49 UTC (rev 66063) +++ trunk/templates/mailin/index.php 2018-04-17 11:03:44 UTC (rev 66064) @@ -1,5 +1,5 @@ <?php -// (c) Copyright 2002-2016 by authors of the Tiki Wiki CMS Groupware Project +// (c) Copyright 2002-2018 by authors of the Tiki Wiki CMS Groupware Project // // All Rights Reserved. See copyright.txt for details and a complete list of authors. // Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details. Modified: trunk/templates/managestream/index.php =================================================================== --- trunk/templates/managestream/index.php 2018-04-17 11:01:49 UTC (rev 66063) +++ trunk/templates/managestream/index.php 2018-04-17 11:03:44 UTC (rev 66064) @@ -1,5 +1,5 @@ <?php -// (c) Copyright 2002-2016 by authors of the Tiki Wiki CMS Groupware Project +// (c) Copyright 2002-2018 by authors of the Tiki Wiki CMS Groupware Project // // All Rights Reserved. See copyright.txt for details and a complete list of authors. // Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details. Modified: trunk/templates/menu/index.php =================================================================== --- trunk/templates/menu/index.php 2018-04-17 11:01:49 UTC (rev 66063) +++ trunk/templates/menu/index.php 2018-04-17 11:03:44 UTC (rev 66064) @@ -1,5 +1,5 @@ <?php -// (c) Copyright 2002-2016 by authors of the Tiki Wiki CMS Groupware Project +// (c) Copyright 2002-2018 by authors of the Tiki Wiki CMS Groupware Project // // All Rights Reserved. See copyright.txt for details and a complete list of authors. // Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details. Modified: trunk/templates/metadata/index.php =================================================================== --- trunk/templates/metadata/index.php 2018-04-17 11:01:49 UTC (rev 66063) +++ trunk/templates/metadata/index.php 2018-04-17 11:03:44 UTC (rev 66064) @@ -1,5 +1,5 @@ <?php -// (c) Copyright 2002-2016 by authors of the Tiki Wiki CMS Groupware Project +// (c) Copyright 2002-2018 by authors of the Tiki Wiki CMS Groupware Project // // All Rights Reserved. See copyright.txt for details and a complete list of authors. // Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details. Modified: trunk/templates/module/index.php =================================================================== --- trunk/templates/module/index.php 2018-04-17 11:01:49 UTC (rev 66063) +++ trunk/templates/module/index.php 2018-04-17 11:03:44 UTC (rev 66064) @@ -1,5 +1,5 @@ <?php -// (c) Copyright 2002-2016 by authors of the Tiki Wiki CMS Groupware Project +// (c) Copyright 2002-2018 by authors of the Tiki Wiki CMS Groupware Project // // All Rights Reserved. See copyright.txt for details and a complete list of authors. // Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details. Modified: trunk/templates/modules/index.php =================================================================== --- trunk/templates/modules/index.php 2018-04-17 11:01:49 UTC (rev 66063) +++ trunk/templates/modules/index.php 2018-04-17 11:03:44 UTC (rev 66064) @@ -1,5 +1,5 @@ <?php -// (c) Copyright 2002-2016 by authors of the Tiki Wiki CMS Groupware Project +// (c) Copyright 2002-2018 by authors of the Tiki Wiki CMS Groupware Project // // All Rights Reserved. See copyright.txt for details and a complete list of authors. // Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details. Modified: trunk/templates/monitor/index.php =================================================================== --- trunk/templates/monitor/index.php 2018-04-17 11:01:49 UTC (rev 66063) +++ trunk/templates/monitor/index.php 2018-04-17 11:03:44 UTC (rev 66064) @@ -1,5 +1,5 @@ <?php -// (c) Copyright 2002-2016 by authors of the Tiki Wiki CMS Groupware Project +// (c) Copyright 2002-2018 by authors of the Tiki Wiki CMS Groupware Project // // All Rights Reserved. See copyright.txt for details and a complete list of authors. // Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details. Modified: trunk/templates/mustread/index.php =================================================================== --- trunk/templates/mustread/index.php 2018-04-17 11:01:49 UTC (rev 66063) +++ trunk/templates/mustread/index.php 2018-04-17 11:03:44 UTC (rev 66064) @@ -1,5 +1,5 @@ <?php -// (c) Copyright 2002-2016 by authors of the Tiki Wiki CMS Groupware Project +// (c) Copyright 2002-2018 by authors of the Tiki Wiki CMS Groupware Project // // All Rights Reserved. See copyright.txt for details and a complete list of authors. // Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details. Modified: trunk/templates/object/index.php =================================================================== --- trunk/templates/object/index.php 2018-04-17 11:01:49 UTC (rev 66063) +++ trunk/templates/object/index.php 2018-04-17 11:03:44 UTC (rev 66064) @@ -1,5 +1,5 @@ <?php -// (c) Copyright 2002-2016 by authors of the Tiki Wiki CMS Groupware Project +// (c) Copyright 2002-2018 by authors of the Tiki Wiki CMS Groupware Project // // All Rights Reserved. See copyright.txt for details and a complete list of authors. // Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details. Modified: trunk/templates/object/infobox/index.php =================================================================== --- trunk/templates/object/infobox/index.php 2018-04-17 11:01:49 UTC (rev 66063) +++ trunk/templates/object/infobox/index.php 2018-04-17 11:03:44 UTC (rev 66064) @@ -1,5 +1,5 @@ <?php -// (c) Copyright 2002-2016 by authors of the Tiki Wiki CMS Groupware Project +// (c) Copyright 2002-2018 by authors of the Tiki Wiki CMS Groupware Project // // All Rights Reserved. See copyright.txt for details and a complete list of authors. // Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details. Modified: trunk/templates/plugins/index.php =================================================================== --- trunk/templates/plugins/index.php 2018-04-17 11:01:49 UTC (rev 66063) +++ trunk/templates/plugins/index.php 2018-04-17 11:03:44 UTC (rev 66064) @@ -1,5 +1,5 @@ <?php -// (c) Copyright 2002-2016 by authors of the Tiki Wiki CMS Groupware Project +// (c) Copyright 2002-2018 by authors of the Tiki Wiki CMS Groupware Project // // All Rights Reserved. See copyright.txt for details and a complete list of authors. // Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details. Modified: trunk/templates/prefs/index.php =================================================================== --- trunk/templates/prefs/index.php 2018-04-17 11:01:49 UTC (rev 66063) +++ trunk/templates/prefs/index.php 2018-04-17 11:03:44 UTC (rev 66064) @@ -1,5 +1,5 @@ <?php -// (c) Copyright 2002-2016 by authors of the Tiki Wiki CMS Groupware Project +// (c) Copyright 2002-2018 by authors of the Tiki Wiki CMS Groupware Project // // All Rights Reserved. See copyright.txt for details and a complete list of authors. // Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details. Modified: trunk/templates/print/index.php =================================================================== --- trunk/templates/print/index.php 2018-04-17 11:01:49 UTC (rev 66063) +++ trunk/templates/print/index.php 2018-04-17 11:03:44 UTC (rev 66064) @@ -1,5 +1,5 @@ <?php -// (c) Copyright 2002-2016 by authors of the Tiki Wiki CMS Groupware Project +// (c) Copyright 2002-2018 by authors of the Tiki Wiki CMS Groupware Project // // All Rights Reserved. See copyright.txt for details and a complete list of authors. // Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details. Modified: trunk/templates/rating/index.php =================================================================== --- trunk/templates/rating/index.php 2018-04-17 11:01:49 UTC (rev 66063) +++ trunk/templates/rating/index.php 2018-04-17 11:03:44 UTC (rev 66064) @@ -1,5 +1,5 @@ <?php -// (c) Copyright 2002-2016 by authors of the Tiki Wiki CMS Groupware Project +// (c) Copyright 2002-2018 by authors of the Tiki Wiki CMS Groupware Project // // All Rights Reserved. See copyright.txt for details and a complete list of authors. // Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details. Modified: trunk/templates/recommendation_dev/index.php =================================================================== --- trunk/templates/recommendation_dev/index.php 2018-04-17 11:01:49 UTC (rev 66063) +++ trunk/templates/recommendation_dev/index.php 2018-04-17 11:03:44 UTC (rev 66064) @@ -1,5 +1,5 @@ <?php -// (c) Copyright 2002-2016 by authors of the Tiki Wiki CMS Groupware Project +// (c) Copyright 2002-2018 by authors of the Tiki Wiki CMS Groupware Project // // All Rights Reserved. See copyright.txt for details and a complete list of authors. // Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details. Modified: trunk/templates/report/index.php =================================================================== --- trunk/templates/report/index.php 2018-04-17 11:01:49 UTC (rev 66063) +++ trunk/templates/report/index.php 2018-04-17 11:03:44 UTC (rev 66064) @@ -1,5 +1,5 @@ <?php -// (c) Copyright 2002-2016 by authors of the Tiki Wiki CMS Groupware Project +// (c) Copyright 2002-2018 by authors of the Tiki Wiki CMS Groupware Project // // All Rights Reserved. See copyright.txt for details and a complete list of authors. // Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details. Modified: trunk/templates/search/index.php =================================================================== --- trunk/templates/search/index.php 2018-04-17 11:01:49 UTC (rev 66063) +++ trunk/templates/search/index.php 2018-04-17 11:03:44 UTC (rev 66064) @@ -1,5 +1,5 @@ <?php -// (c) Copyright 2002-2016 by authors of the Tiki Wiki CMS Groupware Project +// (c) Copyright 2002-2018 by authors of the Tiki Wiki CMS Groupware Project // // All Rights Reserved. See copyright.txt for details and a complete list of authors. // Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details. Modified: trunk/templates/search/list/index.php =================================================================== --- trunk/templates/search/list/index.php 2018-04-17 11:01:49 UTC (rev 66063) +++ trunk/templates/search/list/index.php 2018-04-17 11:03:44 UTC (rev 66064) @@ -1,5 +1,5 @@ <?php -// (c) Copyright 2002-2016 by authors of the Tiki Wiki CMS Groupware Project +// (c) Copyright 2002-2018 by authors of the Tiki Wiki CMS Groupware Project // // All Rights Reserved. See copyright.txt for details and a complete list of authors. // Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details. Modified: trunk/templates/search_customsearch/index.php =================================================================== --- trunk/templates/search_customsearch/index.php 2018-04-17 11:01:49 UTC (rev 66063) +++ trunk/templates/search_customsearch/index.php 2018-04-17 11:03:44 UTC (rev 66064) @@ -1,5 +1,5 @@ <?php -// (c) Copyright 2002-2016 by authors of the Tiki Wiki CMS Groupware Project +// (c) Copyright 2002-2018 by authors of the Tiki Wiki CMS Groupware Project // // All Rights Reserved. See copyright.txt for details and a complete list of authors. // Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details. Modified: trunk/templates/search_manifold/index.php =================================================================== --- trunk/templates/search_manifold/index.php 2018-04-17 11:01:49 UTC (rev 66063) +++ trunk/templates/search_manifold/index.php 2018-04-17 11:03:44 UTC (rev 66064) @@ -1,5 +1,5 @@ <?php -// (c) Copyright 2002-2016 by authors of the Tiki Wiki CMS Groupware Project +// (c) Copyright 2002-2018 by authors of the Tiki Wiki CMS Groupware Project // // All Rights Reserved. See copyright.txt for details and a complete list of authors. // Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details. Modified: trunk/templates/search_stored/index.php =================================================================== --- trunk/templates/search_stored/index.php 2018-04-17 11:01:49 UTC (rev 66063) +++ trunk/templates/search_stored/index.php 2018-04-17 11:03:44 UTC (rev 66064) @@ -1,5 +1,5 @@ <?php -// (c) Copyright 2002-2016 by authors of the Tiki Wiki CMS Groupware Project +// (c) Copyright 2002-2018 by authors of the Tiki Wiki CMS Groupware Project // // All Rights Reserved. See copyright.txt for details and a complete list of authors. // Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details. Modified: trunk/templates/social/index.php =================================================================== --- trunk/templates/social/index.php 2018-04-17 11:01:49 UTC (rev 66063) +++ trunk/templates/social/index.php 2018-04-17 11:03:44 UTC (rev 66064) @@ -1,5 +1,5 @@ <?php -// (c) Copyright 2002-2016 by authors of the Tiki Wiki CMS Groupware Project +// (c) Copyright 2002-2018 by authors of the Tiki Wiki CMS Groupware Project // // All Rights Reserved. See copyright.txt for details and a complete list of authors. // Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details. Modified: trunk/templates/styleguide/index.php =================================================================== --- trunk/templates/styleguide/index.php 2018-04-17 11:01:49 UTC (rev 66063) +++ trunk/templates/styleguide/index.php 2018-04-17 11:03:44 UTC (rev 66064) @@ -1,5 +1,5 @@ <?php -// (c) Copyright 2002-2016 by authors of the Tiki Wiki CMS Groupware Project +// (c) Copyright 2002-2018 by authors of the Tiki Wiki CMS Groupware Project // // All Rights Reserved. See copyright.txt for details and a complete list of authors. // Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details. Modified: trunk/templates/suite/index.php =================================================================== --- trunk/templates/suite/index.php 2018-04-17 11:01:49 UTC (rev 66063) +++ trunk/templates/suite/index.php 2018-04-17 11:03:44 UTC (rev 66064) @@ -1,5 +1,5 @@ <?php -// (c) Copyright 2002-2016 by authors of the Tiki Wiki CMS Groupware Project +// (c) Copyright 2002-2018 by authors of the Tiki Wiki CMS Groupware Project // // All Rights Reserved. See copyright.txt for details and a complete list of authors. // Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details. Modified: trunk/templates/tablesorter/index.php =================================================================== --- trunk/templates/tablesorter/index.php 2018-04-17 11:01:49 UTC (rev 66063) +++ trunk/templates/tablesorter/index.php 2018-04-17 11:03:44 UTC (rev 66064) @@ -1,5 +1,5 @@ <?php -// (c) Copyright 2002-2016 by authors of the Tiki Wiki CMS Groupware Project +// (c) Copyright 2002-2018 by authors of the Tiki Wiki CMS Groupware Project // // All Rights Reserved. See copyright.txt for details and a complete list of authors. // Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details. Modified: trunk/templates/tabular/index.php =================================================================== --- trunk/templates/tabular/index.php 2018-04-17 11:01:49 UTC (rev 66063) +++ trunk/templates/tabular/index.php 2018-04-17 11:03:44 UTC (rev 66064) @@ -1,5 +1,5 @@ <?php -// (c) Copyright 2002-2016 by authors of the Tiki Wiki CMS Groupware Project +// (c) Copyright 2002-2018 by authors of the Tiki Wiki CMS Groupware Project // // All Rights Reserved. See copyright.txt for details and a complete list of authors. // Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details. Modified: trunk/templates/tracker/index.php =================================================================== --- trunk/templates/tracker/index.php 2018-04-17 11:01:49 UTC (rev 66063) +++ trunk/templates/tracker/index.php 2018-04-17 11:03:44 UTC (rev 66064) @@ -1,5 +1,5 @@ <?php -// (c) Copyright 2002-2016 by authors of the Tiki Wiki CMS Groupware Project +// (c) Copyright 2002-2018 by authors of the Tiki Wiki CMS Groupware Project // // All Rights Reserved. See copyright.txt for details and a complete list of authors. // Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details. Modified: trunk/templates/tracker_sync/index.php =================================================================== --- trunk/templates/tracker_sync/index.php 2018-04-17 11:01:49 UTC (rev 66063) +++ trunk/templates/tracker_sync/index.php 2018-04-17 11:03:44 UTC (rev 66064) @@ -1,5 +1,5 @@ <?php -// (c) Copyright 2002-2016 by authors of the Tiki Wiki CMS Groupware Project +// (c) Copyright 2002-2018 by authors of the Tiki Wiki CMS Groupware Project // // All Rights Reserved. See copyright.txt for details and a complete list of authors. // Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details. Modified: trunk/templates/tracker_todo/index.php =================================================================== --- trunk/templates/tracker_todo/index.php 2018-04-17 11:01:49 UTC (rev 66063) +++ trunk/templates/tracker_todo/index.php 2018-04-17 11:03:44 UTC (rev 66064) @@ -1,5 +1,5 @@ <?php -// (c) Copyright 2002-2016 by authors of the Tiki Wiki CMS Groupware Project +// (c) Copyright 2002-2018 by authors of the Tiki Wiki CMS Groupware Project // // All Rights Reserved. See copyright.txt for details and a complete list of authors. // Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details. Modified: trunk/templates/trackerinput/index.php =================================================================== --- trunk/templates/trackerinput/index.php 2018-04-17 11:01:49 UTC (rev 66063) +++ trunk/templates/trackerinput/index.php 2018-04-17 11:03:44 UTC (rev 66064) @@ -1,5 +1,5 @@ <?php -// (c) Copyright 2002-2016 by authors of the Tiki Wiki CMS Groupware Project +// (c) Copyright 2002-2018 by authors of the Tiki Wiki CMS Groupware Project // // All Rights Reserved. See copyright.txt for details and a complete list of authors. // Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details. Modified: trunk/templates/trackeroutput/index.php =================================================================== --- trunk/templates/trackeroutput/index.php 2018-04-17 11:01:49 UTC (rev 66063) +++ trunk/templates/trackeroutput/index.php 2018-04-17 11:03:44 UTC (rev 66064) @@ -1,5 +1,5 @@ <?php -// (c) Copyright 2002-2016 by authors of the Tiki Wiki CMS Groupware Project +// (c) Copyright 2002-2018 by authors of the Tiki Wiki CMS Groupware Project // // All Rights Reserved. See copyright.txt for details and a complete list of authors. // Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details. Modified: trunk/templates/translation/index.php =================================================================== --- trunk/templates/translation/index.php 2018-04-17 11:01:49 UTC (rev 66063) +++ trunk/templates/translation/index.php 2018-04-17 11:03:44 UTC (rev 66064) @@ -1,5 +1,5 @@ <?php -// (c) Copyright 2002-2016 by authors of the Tiki Wiki CMS Groupware Project +// (c) Copyright 2002-2018 by authors of the Tiki Wiki CMS Groupware Project // // All Rights Reserved. See copyright.txt for details and a complete list of authors. // Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details. Modified: trunk/templates/user/index.php =================================================================== --- trunk/templates/user/index.php 2018-04-17 11:01:49 UTC (rev 66063) +++ trunk/templates/user/index.php 2018-04-17 11:03:44 UTC (rev 66064) @@ -1,5 +1,5 @@ <?php -// (c) Copyright 2002-2016 by authors of the Tiki Wiki CMS Groupware Project +// (c) Copyright 2002-2018 by authors of the Tiki Wiki CMS Groupware Project // // All Rights Reserved. See copyright.txt for details and a complete list of authors. // Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details. Modified: trunk/templates/user_conditions/index.php =================================================================== --- trunk/templates/user_conditions/index.php 2018-04-17 11:01:49 UTC (rev 66063) +++ trunk/templates/user_conditions/index.php 2018-04-17 11:03:44 UTC (rev 66064) @@ -1,5 +1,5 @@ <?php -// (c) Copyright 2002-2016 by authors of the Tiki Wiki CMS Groupware Project +// (c) Copyright 2002-2018 by authors of the Tiki Wiki CMS Groupware Project // // All Rights Reserved. See copyright.txt for details and a complete list of authors. // Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details. Modified: trunk/templates/vimeo/index.php =================================================================== --- trunk/templates/vimeo/index.php 2018-04-17 11:01:49 UTC (rev 66063) +++ trunk/templates/vimeo/index.php 2018-04-17 11:03:44 UTC (rev 66064) @@ -1,5 +1,5 @@ <?php -// (c) Copyright 2002-2016 by authors of the Tiki Wiki CMS Groupware Project +// (c) Copyright 2002-2018 by authors of the Tiki Wiki CMS Groupware Project // // All Rights Reserved. See copyright.txt for details and a complete list of authors. // Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details. Modified: trunk/templates/wiki/index.php =================================================================== --- trunk/templates/wiki/index.php 2018-04-17 11:01:49 UTC (rev 66063) +++ trunk/templates/wiki/index.php 2018-04-17 11:03:44 UTC (rev 66064) @@ -1,5 +1,5 @@ <?php -// (c) Copyright 2002-2016 by authors of the Tiki Wiki CMS Groupware Project +// (c) Copyright 2002-2018 by authors of the Tiki Wiki CMS Groupware Project // // All Rights Reserved. See copyright.txt for details and a complete list of authors. // Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details. Modified: trunk/templates/wiki-plugins/index.php =================================================================== --- trunk/templates/wiki-plugins/index.php 2018-04-17 11:01:49 UTC (rev 66063) +++ trunk/templates/wiki-plugins/index.php 2018-04-17 11:03:44 UTC (rev 66064) @@ -1,5 +1,5 @@ <?php -// (c) Copyright 2002-2016 by authors of the Tiki Wiki CMS Groupware Project +// (c) Copyright 2002-2018 by authors of the Tiki Wiki CMS Groupware Project // // All Rights Reserved. See copyright.txt for details and a complete list of authors. // Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details. Modified: trunk/templates/wizard/index.php =================================================================== --- trunk/templates/wizard/index.php 2018-04-17 11:01:49 UTC (rev 66063) +++ trunk/templates/wizard/index.php 2018-04-17 11:03:44 UTC (rev 66064) @@ -1,5 +1,5 @@ <?php -// (c) Copyright 2002-2016 by authors of the Tiki Wiki CMS Groupware Project +// (c) Copyright 2002-2018 by authors of the Tiki Wiki CMS Groupware Project // // All Rights Reserved. See copyright.txt for details and a complete list of authors. // Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details. Modified: trunk/templates/workspace/index.php =================================================================== --- trunk/templates/workspace/index.php 2018-04-17 11:01:49 UTC (rev 66063) +++ trunk/templates/workspace/index.php 2018-04-17 11:03:44 UTC (rev 66064) @@ -1,5 +1,5 @@ <?php -// (c) Copyright 2002-2016 by authors of the Tiki Wiki CMS Groupware Project +// (c) Copyright 2002-2018 by authors of the Tiki Wiki CMS Groupware Project // // All Rights Reserved. See copyright.txt for details and a complete list of authors. // Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |