merge from 1.5.3.2 (~r11225)

git-svn-id: http://xe-core.googlecode.com/svn/trunk@11226 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
flyskyko 2012-09-13 06:14:45 +00:00
parent 54e3a72065
commit 77f5aa2671
313 changed files with 8058 additions and 14251 deletions

View file

@ -8,25 +8,23 @@
<h1 class="h1">File Upload</h1>
<ul>
<li>
<p class="q">{$lang->allow_outlink}</p>
<p class="q"><label>{$lang->allow_outlink}</label></p>
<p class="a">
<input type="radio" name="allow_outlink" value="Y" id="allow_outlink_y" checked="checked"|cond="$config->allow_outlink == 'Y'" /> <label for="allow_outlink_y">{$lang->cmd_yes}</label>
<input type="radio" name="allow_outlink" value="N" id="allow_outlink_n" checked="checked"|cond="$config->allow_outlink == 'N'" /> <label for="allow_outlink_n">{$lang->cmd_no}</label>
</p>
</li>
<li style="display:none"|cond="$config->allow_outlink == 'N'" class="_outLink">
<p class="q">{$lang->allow_outlink_format}</p>
<p class="a">
<input type="text" name="allow_outlink_format" value="{$config->allow_outlink_format}" />
<p>{$lang->about_allow_outlink_format}</p>
</p>
<p class="q"><label for="allow_outlink_format">{$lang->allow_outlink_format}</label></p>
<p class="a"><input type="text" name="allow_outlink_format" id="allow_outlink_format" value="{$config->allow_outlink_format}" /></p>
<p class="desc">{$lang->about_allow_outlink_format}</p>
</li>
<li style="display:none"|cond="$config->allow_outlink == 'N'" class="_outLink">
<p class="q">{$lang->allow_outlink_site}</p>
<p class="a">
<textarea type="text" name="allow_outlink_site" rows="8" cols="42">{$config->allow_outlink_site}</textarea>
<p>{$lang->about_allow_outlink_site}</p>
</p>
<p class="q"><label for="allow_outlink_site">{$lang->allow_outlink_site}</label></p>
<p class="a"><textarea name="allow_outlink_site" id="allow_outlink_site" rows="8" cols="42">{$config->allow_outlink_site}</textarea></p>
<p class="desc">{$lang->about_allow_outlink_site}</p>
</li>
<li>
<p class="q"><label for="filesize">{$lang->about_allowed_filesize}</label></p>
@ -38,12 +36,11 @@
</li>
<li>
<p class="q"><label for="allowedFiletypes">{$lang->allowed_filetypes}</label></p>
<p class="a"><input id="allowedFiletypes" type="text" name="allowed_filetypes" value="{$config->allowed_filetypes}" />
<p>{$lang->about_allowed_filetypes}</p>
</p>
<p class="a"><input id="allowedFiletypes" type="text" name="allowed_filetypes" value="{$config->allowed_filetypes}" /></p>
<p class="desc">{$lang->about_allowed_filetypes}</p>
</li>
</ul>
<div class="btnArea">
<span class="btn medium"><input type="submit" value="{$lang->cmd_save}" /></span>
</div>
</form>
</form>