ave-cms-team
/
ave-cms
mirror of https://github.com/avecms/AVE.cms.git
4
0
Fork 0
Code Issues Releases Wiki Activity
Browse Source

Fixes

pull/3/head
M@d D3n 5 years ago
parent
ca61704d08
commit
21937bbed7
13 changed files with 37 additions and 37 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 16
      admin/templates/documents/doc_search.tpl
  2. 6
      admin/templates/documents/docs.tpl
  3. 2
      admin/templates/documents/form.tpl
  4. 2
      admin/templates/navigation/template.tpl
  5. 2
      admin/templates/navigation/tree_docform.tpl
  6. 2
      admin/templates/request/change.tpl
  7. 2
      admin/templates/rubs/change.tpl
  8. 4
      admin/templates/rubs/fields_list.tpl
  9. 2
      admin/templates/rubs/groups.tpl
  10. 2
      admin/templates/settings/settings_case.tpl
  11. 10
      admin/templates/settings/settings_main.tpl
  12. 8
      admin/templates/user/form.tpl
  13. 16
      admin/templates/user/users.tpl

16
admin/templates/documents/doc_search.tpl
Unescape View File

@ -115,7 +115,7 @@
</td>
<td><strong>{#MAIN_SELECT_RUBRIK#}</strong></td>
<td>
<select name="rubric_id" id="rubric_id" style="width: 200px;">
<select name="rubric_id" id="rubric_id">
<option value="all">{#MAIN_ALL_RUBRUKS#}</option>
{foreach from=$rubrics item=rubric}
<option value="{$rubric->Id}" {if $smarty.request.rubric_id==$rubric->Id}selected{/if}>{$rubric->rubric_title|escape}</option>
@ -132,7 +132,7 @@
<td><input style="width:80px" type="text" name="doc_id" value="{$smarty.request.doc_id|escape|stripslashes}" placeholder="{#MAIN_TITLE_DOC_ID#}" /></td>
<td><strong>{#MAIN_DOCUMENT_STATUS#}</strong></td>
<td>
<select style="width:185px" name="status">
<select name="status">
<option value="All">{#MAIN_ALL_DOCUMENTS#}</option>
<option value="Opened" {if $smarty.request.status == 'Opened'}selected{/if}>{#MAIN_DOCUMENT_ACTIVE#}</option>
<option value="Closed" {if $smarty.request.status == 'Closed'}selected{/if}>{#MAIN_DOCUMENT_INACTIVE#}</option>
@ -147,7 +147,7 @@
<strong>{#DOC_SEARCH_FIELD#}</strong>
</td>
<td colspan="2">
<select style="width:250px" name="field_id">
<select name="field_id">
<option value="">{#DOC_SEARCH_FIELD_SELECT#}</option>
{foreach from=$fields item=field}
<option value="{$field->Id}" {if $smarty.request.field_id == $field->Id}selected{/if}>{$field->rubric_field_title|escape}</option>
@ -155,7 +155,7 @@
</select>
</td>
<td>
<select style="width:150px" name="field_request">
<select name="field_request">
<option value="like" {if $smarty.request.field_request == 'like'}selected{/if}>{#DOC_SEARCH_FIELD_LIKE#}</option>
<option value="eq" {if $smarty.request.field_request == 'eq'}selected{/if}>{#DOC_SEARCH_FIELD_EQ#}</option>
</select>
@ -173,7 +173,7 @@
<strong>{#DOC_SEARCH_PARAM#}</strong>
</td>
<td colspan="2">
<select style="width:250px" name="param_id">
<select name="param_id">
<option value="">{#DOC_SEARCH_PARAM_SELECT#}</option>
{foreach from=$params item=param}
<option value="{$param}" {if $smarty.request.param_id == $param}selected{/if}>{$param}</option>
@ -181,7 +181,7 @@
</select>
</td>
<td>
<select style="width:150px" name="param_request">
<select name="param_request">
<option value="like" {if $smarty.request.param_request == 'like'}selected{/if}>{#DOC_SEARCH_PARAM_LIKE#}</option>
<option value="eq" {if $smarty.request.param_request == 'eq'}selected{/if}>{#DOC_SEARCH_PARAM_EQ#}</option>
</select>
@ -199,7 +199,7 @@
<strong>{#DOC_LANG_ID#}</strong>
</td>
<td>
<select style="width:70px" name="lang_id">
<select name="lang_id">
<option value="" {if !$smarty.request.lang_id}selected{/if}>{#DOC_LANG_SELECT#}</option>
{foreach from=$smarty.session.accept_langs key=lang_id item=lang}
<option value="{$lang_id}" {if $smarty.request.lang_id == $lang_id}selected{/if}>{$lang_id}</option>
@ -211,7 +211,7 @@
<strong>{#MAIN_RESULTS_ON_PAGE#}</strong>
</td>
<td>
<select style="width:70px" name="limit">
<select name="limit">
{section loop=500 name=dl step=50}
<option value="{$smarty.section.dl.index+50}" {if $smarty.request.limit==$smarty.section.dl.index+50}selected{/if}>{$smarty.section.dl.index+50}</option>
{/section}

6
admin/templates/documents/docs.tpl
Unescape View File

@ -36,7 +36,7 @@
<input type="hidden" name="cp" value="{$sess}" />
<input type="hidden" name="do" value="docs" />
<input type="hidden" name="action" value="new" />
<select name="rubric_id" id="DocName" style="width: 250px;">
<select name="rubric_id" id="DocName">
<option value="">{#DOC_CHOSE_RUB#}</option>
{foreach from=$rubrics item=rubric}
{if $rubric->Show==1}
@ -53,7 +53,7 @@
<form action="index.php" method="get" class="mainForm">
<input type="hidden" name="cp" value="{$sess}" />
<input type="hidden" name="do" value="docs" />
<select name="rubric_id" id="RubrikSort" style="width: 250px;">
<select name="rubric_id" id="RubrikSort">
<option value="all">{#MAIN_ALL_RUBRUKS#}</option>
{foreach from=$rubrics item=rubric}
{if $rubric->Show==1}
@ -427,7 +427,7 @@
{if check_permission('alle')}
<div class="rowElem" id="saveBtn">
<div class="saveBtn">
<select name="moderation" class="action-in-moderation" style="width: 250px;">
<select name="moderation" class="action-in-moderation">
<option value="none" selected="selected">{#DOC_ACTION_SELECT#}</option>
<option value="1">{#DOC_ACTION_SELECT_ACT#}</option>
<option value="0">{#DOC_ACTION_SELECT_NACT#}</option>

2
admin/templates/documents/form.tpl
Unescape View File

@ -484,7 +484,7 @@ $(document).ready(function(){ldelim}
{foreach from=$document_alias key=k item=v}
<div>&nbsp;{$k}:</div>
<div style="margin:2px 0 3px;">
<select class="linkSelect" style="width: 300px;">
<select class="linkSelect">
<option value="" data-id="" selected="selected">{#DOC_LINK_CHOOSE#}</option>
{section name=nov loop=$v}
<option value="{$v[nov].document_alias}" data-id="{$v[nov].Id}">{if $v[nov].document_breadcrum_title}{$v[nov].document_breadcrum_title}{else}{$v[nov].document_title}{/if}</option>

2
admin/templates/navigation/template.tpl
Unescape View File

@ -75,7 +75,7 @@
<tr>
<td width="200"><strong>{#NAVI_PRINT_TYPE#}</strong></td>
<td>
<select name="expand_ext" style="width: 300px;">
<select name="expand_ext">
<option value="1"{if $navigation->expand_ext == 1} selected{/if}/>{#NAVI_EXPAND_ALL#}</option>
<option value="0"{if $navigation->expand_ext == 0} selected{/if}/>{#NAVI_EXPAND_WAY#}</option>
<option value="2"{if $navigation->expand_ext == 2} selected{/if}/>{#NAVI_EXPAND_LEVEL#}</option>

2
admin/templates/navigation/tree_docform.tpl
Unescape View File

@ -1,4 +1,4 @@
<select name="parent_id" id="parent_id" style="width: 300px;">
<select name="parent_id" id="parent_id">
<option value="0">{#DOC_TOP_MENU_ITEM#}</option>
{foreach from=$navigations item=navigation}
<optgroup label="({$navigation->navigation_id}) {$navigation->title|escape}">

2
admin/templates/request/change.tpl
Unescape View File

@ -1,6 +1,6 @@
{if $smarty.request.sub == ''}
<div id="req_cond_{$cond_id}" stye="text-align: left;">
<select class="mousetrap" name="conditions[{$cond_id}][condition_field_id]" style="width: 200px;" id="form_cond_{$cond_id}">
<select class="mousetrap" name="conditions[{$cond_id}][condition_field_id]" id="form_cond_{$cond_id}">
{foreach from=$fields_list item=field_group}
{if $groups_count > 1}

2
admin/templates/rubs/change.tpl
Unescape View File

@ -1,7 +1,7 @@
{if $smarty.request.action == 'change'}
<div id="rub_field_{$rf.rubric_id}_{$rf.Id}" style="text-align: left;">
<form name="field_save_{$rf.rubric_id}_{$rf.Id}" id="field_save_{$rf.rubric_id}_{$rf.Id}" method="post" action="index.php?do=rubs&action=changesave&field_id={$rf.Id|escape}&rubric_id={$rf.rubric_id|escape}&pop=1&onlycontent=1&cp={$sess}" class="mainForm">
<select class="mousetrap" name="rubric_field_type" id="rubric_field_type_{$field_id|escape}" style="width: 200px;">
<select class="mousetrap" name="rubric_field_type" id="rubric_field_type_{$field_id|escape}">
{section name=field loop=$fields}
<option value="{$fields[field].id}" {if $rf.rubric_field_type == $fields[field].id}selected{/if}>{$fields[field].name}</option>
{/section}

4
admin/templates/rubs/fields_list.tpl
Unescape View File

@ -281,14 +281,14 @@ function openAliasWindow(fieldId, rubId, width, height, target) {ldelim}
</div>
</td>
<td>
<select name="rub_type_new" id="rub_type_new" style="width: 250px;">
<select name="rub_type_new" id="rub_type_new">
{section name=field loop=$fields}
<option value="{$fields[field].id}" {if $fields[field].id == 'single_line'}selected{/if}>{$fields[field].name}</option>
{/section}
</select>
</td>
<td>
<select name="group_new" id="group_new" style="width: 300px;">
<select name="group_new" id="group_new">
<option value="">{#RUBRIK_FIELD_GROUP_SEL#}</option>
{foreach from=$fields_groups item=f_group}
<option value="{$f_group->Id}">{$f_group->group_title|escape}</option>

2
admin/templates/rubs/groups.tpl
Unescape View File

@ -2,7 +2,7 @@
<div id="rub_field_group_{$rf.rubric_id}_{$rf.Id}">
<form name="field_save_{$rf.rubric_id}_{$rf.Id}" id="field_save_{$rf.rubric_id}_{$rf.Id}" method="post" action="index.php?do=rubs&action=changegroupsave&field_id={$rf.Id|escape}&rubric_id={$rf.rubric_id|escape}&pop=1&onlycontent=1&cp={$sess}" class="mainForm">
<select class="mousetrap" name="rubric_field_group" id="rubric_field_group_{$field_id|escape}" style="width: 200px;">
<select class="mousetrap" name="rubric_field_group" id="rubric_field_group_{$field_id|escape}">
<option value="">{#RUBRIK_FIELD_GROUP_SEL#}</option>
{foreach from=$groups item=group}
<option value="{$group->Id}" {if $rf.rubric_field_group == $group->Id}selected{/if}>{$group->group_title}</option>

2
admin/templates/settings/settings_case.tpl
Unescape View File

@ -69,7 +69,7 @@
</td>
<td>
{if $def.TYPE=="dropdown"}
<select class="mousetrap" name="GLOB[{$type}][{$_var}]" style="width: 250px;">
<select class="mousetrap" name="GLOB[{$type}][{$_var}]">
{foreach from=$def.VARIANT item=elem}
<option value="{$elem}"
{php}

10
admin/templates/settings/settings_main.tpl
Unescape View File

@ -63,7 +63,7 @@
<td>{#SETTINGS_SITE_COUNTRY#}</td>
<td>
<div class="pr12">
<select name="default_country" style="width: 300px;">
<select name="default_country">
{foreach from=$available_countries item=land}
<option value="{$land->country_code}"{if $row.default_country==$land->country_code} selected{/if}>{$land->country_name}</option>
{/foreach}
@ -76,7 +76,7 @@
<td>{#SETTINGS_DATE_FORMAT#}</td>
<td>
<div class="pr12">
<select name="date_format" style="width: 300px;">
<select name="date_format">
{foreach from=$date_formats item=date_format}
<option value="{$date_format}"{if $row.date_format==$date_format} selected{/if}>{$smarty.now|date_format:$date_format|pretty_date}</option>
{/foreach}
@ -89,7 +89,7 @@
<td>{#SETTINGS_TIME_FORMAT#}</td>
<td>
<div class="pr12">
<select name="time_format" style="width: 300px;">
<select name="time_format">
{foreach from=$time_formats item=time_format}
<option value="{$time_format}"{if $row.time_format==$time_format} selected{/if}>{$smarty.now|date_format:$time_format|pretty_date}</option>
{/foreach}
@ -202,7 +202,7 @@
<td>{#SETTINGS_MAIL_TRANSPORT#}</td>
<td>
<div class="pr12">
<select name="mail_type" id="mail_type" style="width: 250px;">
<select name="mail_type" id="mail_type">
<option value="mail"{if $row.mail_type=='mail'} selected{/if}>{#SETTINGS_MAIL#}</option>
<option id="smtp" value="smtp"{if $row.mail_type=='smtp'} selected{/if}>{#SETTINGS_SMTP#}</option>
<option value="sendmail"{if $row.mail_type=='sendmail'} selected{/if}>{#SETTINGS_SENDMAIL#}</option>
@ -251,7 +251,7 @@
<td>{#SETTINGS_SMTP_ENCRYPT#}</td>
<td>
<div class="pr12">
<select name="mail_smtp_encrypt" style="width: 250px;" class="mousetrap">
<select name="mail_smtp_encrypt" class="mousetrap">
<option value="">{#SETTINGS_SMTP_NOENCRYPT#}</option>
<option value="tls"{if $row.mail_smtp_encrypt=='tls'} selected="selected"{/if}>TLS</option>
<option value="ssl"{if $row.mail_smtp_encrypt=='ssl'} selected="selected"{/if}>SSL</option>

8
admin/templates/user/form.tpl
Unescape View File

@ -222,7 +222,7 @@ function mail_status(){
<div class="pr12">
{if check_permission('user_perms')}
{if ($smarty.session.user_id == $row->Id) && $row->user_group != 1}
<select name="user_group" style="width: 200px;" disabled="disabled">
<select name="user_group" disabled="disabled">
{foreach from=$ugroups item=groups}
{if $groups->user_group!=2}
<option value="{$groups->user_group}"{if $groups->user_group==$row->user_group} selected="selected"{/if}>{$groups->user_group_name}</option>
@ -230,7 +230,7 @@ function mail_status(){
{/foreach}
</select>
{else}
<select name="user_group" style="width: 200px;" {if $row->Id==1 && $groups->user_group!=1} disabled="disabled"{/if}>
<select name="user_group" {if $row->Id==1 && $groups->user_group!=1} disabled="disabled"{/if}>
{foreach from=$ugroups item=groups}
{if $smarty.session.user_group != 1}
{if $row->user_group == 1 && $groups->user_group != 1}
@ -249,7 +249,7 @@ function mail_status(){
</select>
{/if}
{else}
<select name="user_group" style="width: 200px;" disabled="disabled">
<select name="user_group" disabled="disabled">
{foreach from=$ugroups item=groups}
{if $groups->user_group!=2}
<option value="{$groups->user_group}"{if $groups->user_group==$row->user_group} selected="selected"{/if}>{$groups->user_group_name}</option>
@ -279,7 +279,7 @@ function mail_status(){
<td>{#USER_STATUS#}</td>
<td>
<div class="pr12">
<select style="width:250px;" name="status" id="status" onchange="mail_status();">
<select name="status" id="status" onchange="mail_status();">
<option id="free" value="1"{if $row->status==1 || $smarty.request.action=='new'} selected="selected"{/if}>{#USER_ACTIVE#}</option>
<option id="notfree" value="0"{if $row->Id==1 && $g->user_group!=1} disabled="disabled"{else}{if $row->status==0 && $smarty.request.action!='new'} selected="selected"{/if}{if $ItsGroup=='1' && $smarty.session.user_group=='1'} disabled="disabled"{/if}{/if}>{#USER_INACTIVE#}</option>
</select>

16
admin/templates/user/users.tpl
Unescape View File

@ -53,7 +53,7 @@ $(document).ready(function(){ldelim}
<tr>
<td><div class="pr12"><input name="query" type="text" value="{$smarty.request.query|escape|stripslashes}" /></div></td>
<td>
<select style="width: 250px;" name="user_group">
<select name="user_group">
<option value="0">{#MAIN_ALL_USER_GROUP#}</option>
{foreach from=$ugroups item=g}
<option value="{$g->user_group}"{if $g->user_group==$smarty.request.user_group} selected="selected"{/if}>{$g->user_group_name|escape}</option>
@ -61,7 +61,7 @@ $(document).ready(function(){ldelim}
</select>
</td>
<td>
<select style="width: 250px;" name="status">
<select name="status">
<option value="all"{if $smarty.request.status=='all'} selected="selected"{/if}>{#MAIN_USER_STATUS_ALL#}</option>
<option value="1"{if $smarty.request.status=='1'} selected="selected"{/if}>{#MAIN_USER_STATUS_ACTIVE#}</option>
<option value="0"{if $smarty.request.status=='0'} selected="selected"{/if}>{#MAIN_USER_STATUS_INACTIVE#}</option>
@ -239,7 +239,7 @@ $(document).ready(function(){ldelim}
{if check_permission('user_edit')}
<!-- Если сессия группы не равна 1 а у этого юзера группа равная 1 - то не даем ссылку -->
{if ($smarty.session.user_group != 1 && $user->user_group == 1)}
<select name="user_group[{$user->Id}]" style="width: 200px;" disabled="disabled">
<select name="user_group[{$user->Id}]" disabled="disabled">
{foreach from=$ugroups item=groups}
{if $groups->user_group!=2}
<option value="{$groups->user_group}"{if $groups->user_group==$user->user_group} selected="selected"{/if}>{$groups->user_group_name}</option>
@ -248,7 +248,7 @@ $(document).ready(function(){ldelim}
</select>
<!-- Если сессия группы равна 1 даем ссылку -->
{elseif $smarty.session.user_group == 1}
<select name="user_group[{$user->Id}]" style="width: 200px;" {if $user->Id == 1} disabled="disabled"{/if}>
<select name="user_group[{$user->Id}]" {if $user->Id == 1} disabled="disabled"{/if}>
{foreach from=$ugroups item=groups}
{if $groups->user_group!=2}
<option value="{$groups->user_group}"{if $groups->user_group==$user->user_group} selected="selected"{/if}>{$groups->user_group_name}</option>
@ -259,7 +259,7 @@ $(document).ready(function(){ldelim}
{else}
<!-- Если сессия группы и группа юзера равны и сессия айди и юзер айди равны -->
{if $smarty.session.user_group == $user->user_group && $smarty.session.user_id == $user->Id}
<select name="user_group[{$user->Id}]" style="width: 200px;" disabled="disabled">
<select name="user_group[{$user->Id}]" disabled="disabled">
{foreach from=$ugroups item=groups}
{if $groups->user_group!=2}
<option value="{$groups->user_group}"{if $groups->user_group==$user->user_group} selected="selected"{/if}>{$groups->user_group_name}</option>
@ -268,7 +268,7 @@ $(document).ready(function(){ldelim}
</select>
<!-- Если сессия группы и группа юзера равны и сессия айди и юзер айди не равны -->
{elseif $smarty.session.user_group == $user->user_group && $smarty.session.user_id != $user->Id}
<select name="user_group[{$user->Id}]" style="width: 200px;" disabled="disabled">
<select name="user_group[{$user->Id}]" disabled="disabled">
{foreach from=$ugroups item=groups}
{if $groups->user_group!=2}
<option value="{$groups->user_group}"{if $groups->user_group==$user->user_group} selected="selected"{/if}>{$groups->user_group_name}</option>
@ -277,7 +277,7 @@ $(document).ready(function(){ldelim}
</select>
<!-- Если сессия группы и группа юзера не равны и сессия айди и юзер айди не равны -->
{else}
<select name="user_group[{$user->Id}]" style="width: 200px;" {if $user->Id==1 && $groups->user_group!=1} disabled="disabled"{/if}>
<select name="user_group[{$user->Id}]" {if $user->Id==1 && $groups->user_group!=1} disabled="disabled"{/if}>
{foreach from=$ugroups item=groups}
{if $smarty.session.user_group != 1}
{if $user->user_group == 1 && $groups->user_group != 1}
@ -296,7 +296,7 @@ $(document).ready(function(){ldelim}
{/if}
<!-- Если выключены права на редактирование -->
{else}
<select name="user_group[{$user->Id}]" style="width: 200px;" disabled="disabled">
<select name="user_group[{$user->Id}]" disabled="disabled">
{foreach from=$ugroups item=groups}
{if $groups->user_group!=2}
<option value="{$groups->user_group}"{if $groups->user_group==$user->user_group} selected="selected"{/if}>{$groups->user_group_name}</option>

Write Preview
Loading…
Cancel
Save