Skip to content

Commit 494c3cf

Browse files
tbrehmtbrehm
committed
Fixed: FS#752 - Cannot import lang file 3.0.1.1 => 3.0.1.3
1 parent 6a9054f commit 494c3cf

File tree

2 files changed

+63
-52
lines changed

2 files changed

+63
-52
lines changed

‎interface/web/admin/templates/language_export.htm‎

Lines changed: 28 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,28 @@
1-
<h2><tmpl_var name="list_head_txt"></h2>
2-
<p><tmpl_var name="list_desc_txt"></p>
3-
4-
<div class="panel panel_language_export">
5-
6-
<div class="pnl_formsarea">
7-
<fieldset class="inlineLabels"><legend>Language Export</legend>
8-
<div class="ctrlHolder">
9-
<label for="lng_select">{tmpl_var name='language_select_txt'}</label>
10-
<select name="lng_select" id="language" class="selectInput withicons">
11-
{tmpl_var name='language_option'}
12-
</select>
13-
</div>
14-
</fieldset>
15-
16-
<input type="hidden" name="id" value="{tmpl_var name='id'}">
17-
18-
<div class="buttonHolder buttons">
19-
<button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','admin/language_export.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
20-
<button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('admin/language_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
21-
</div>
22-
</div>
23-
24-
</div>
1+
<h2><tmpl_var name="list_head_txt"></h2>
2+
<p><tmpl_var name="list_desc_txt"></p>
3+
4+
<div class="panel panel_language_export">
5+
6+
<div class="pnl_formsarea">
7+
<fieldset class="inlineLabels"><legend>Language Export</legend>
8+
<div class="ctrlHolder">
9+
<label for="lng_select">{tmpl_var name='language_select_txt'}</label>
10+
<select name="lng_select" id="lng_select" class="selectInput withicons">
11+
{tmpl_var name='language_option'}
12+
</select>
13+
</div>
14+
</fieldset>
15+
16+
<tmpl_if name="msg">
17+
<div id="OKMsg"><p><tmpl_var name="msg"></p></div>
18+
</tmpl_if>
19+
20+
<input type="hidden" name="id" value="{tmpl_var name='id'}">
21+
22+
<div class="buttonHolder buttons">
23+
<button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','admin/language_export.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
24+
<button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('admin/language_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
25+
</div>
26+
</div>
27+
28+
</div>

‎interface/web/admin/templates/language_import.htm‎

Lines changed: 35 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,35 @@
1-
<h2><tmpl_var name="list_head_txt"></h2>
2-
<p><tmpl_var name="list_desc_txt"></p>
3-
4-
<div class="panel panel_language_import">
5-
6-
<div class="pnl_formsarea">
7-
<fieldset class="inlineLabels"><legend>Language Import</legend>
8-
<div class="ctrlHolder">
9-
<label for="lng_select"><em>*</em> {tmpl_var name='language_import_txt'}</label>
10-
<input name="file" id="file" size="30" type="file" class="fileUpload" />
11-
</div>
12-
<div class="ctrlHolder">
13-
<p class="label">{tmpl_var name='language_overwrite_txt'}</p>
14-
<div class="multiField">
15-
<input id="overwrite" type="checkbox" value="1" name="overwrite"/>
16-
</div>
17-
</div>
18-
</fieldset>
19-
20-
<input type="hidden" name="id" value="{tmpl_var name='id'}">
21-
22-
<div class="buttonHolder buttons">
23-
<button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitUploadForm('pageForm','admin/language_import.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
24-
<button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('admin/language_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
25-
</div>
26-
</div>
27-
28-
</div>
1+
<h2><tmpl_var name="list_head_txt"></h2>
2+
<p><tmpl_var name="list_desc_txt"></p>
3+
4+
<div class="panel panel_language_import">
5+
6+
<div class="pnl_formsarea">
7+
<fieldset class="inlineLabels"><legend>Language Import</legend>
8+
<div class="ctrlHolder">
9+
<label for="lng_select"><em>*</em> {tmpl_var name='language_import_txt'}</label>
10+
<input name="file" id="file" size="30" type="file" class="fileUpload" />
11+
</div>
12+
<div class="ctrlHolder">
13+
<p class="label">{tmpl_var name='language_overwrite_txt'}</p>
14+
<div class="multiField">
15+
<input id="overwrite" type="checkbox" value="1" name="overwrite"/>
16+
</div>
17+
</div>
18+
</fieldset>
19+
20+
<tmpl_if name="msg">
21+
<div id="OKMsg"><p><tmpl_var name="msg"></p></div>
22+
</tmpl_if>
23+
<tmpl_if name="error">
24+
<div id="errorMsg"><h3>ERROR</h3><ol><tmpl_var name="error"></ol></div>
25+
</tmpl_if>
26+
27+
<input type="hidden" name="id" value="{tmpl_var name='id'}">
28+
29+
<div class="buttonHolder buttons">
30+
<button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitUploadForm('pageForm','admin/language_import.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
31+
<button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('admin/language_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
32+
</div>
33+
</div>
34+
35+
</div>

0 commit comments

Comments
 (0)