Commit a00c2546 authored by fettesvieh's avatar fettesvieh

some ui and code changes + fixes

parent 9834c8ce
{if isset($error_msg)}
{$error_msg}
{/if}
<script type="text/javascript" src="{$DESIGN_PATH}access/script.js"></script>
<form action="{$REQUEST_URI}" method="post" accept-charset="UTF-8">
<fieldset>
<legend>{lang values="access|create"}</legend>
......
{if isset($error_msg)}
{$error_msg}
{/if}
<script type="text/javascript" src="{$DESIGN_PATH}access/script.js"></script>
<form action="{$REQUEST_URI}" method="post" accept-charset="UTF-8">
<fieldset>
<legend>{lang values="access|edit"}</legend>
<dl>
<dt><label for="name">{lang values="common|name"}</label></dt>
<dd><input type="text" name="form[name]" id="name" value="{$form.name}" maxlength="120" /></dd>
......
......@@ -12,4 +12,6 @@ $(document).ready(function() {
});
</script>
{/literal}
<input type="text" name="form[{$date.name}]" id="{$date.name}" value="{$date.input}" maxlength="16" style="width:96%;margin-right:4px;display:inline" />
\ No newline at end of file
<span style="white-space:nowrap">
<input type="text" name="form[{$date.name}]" id="{$date.name}" value="{$date.input}" maxlength="16" style="width:96%;margin-right:4px;display:inline" />
</span>
\ No newline at end of file
......@@ -116,7 +116,7 @@ fieldset {
font-size: 100%;
}
#tabs {
width: 60%;
width: 65%;
margin: 0 auto;
font-size: 100%;
}
......
<script type="text/javascript" src="{$DESIGN_PATH}emoticons/script.js"></script>
<div class="icons">
{foreach from=$emoticons item=row}
<a href="javascript:emoticon('{$emoticons_field_id}','{$row.code}')"><img src="{$row.img}" alt="{$row.description}" title="{$row.description}" /></a>
......
{if isset($error_msg)}
{$error_msg}
{/if}
<script type="text/javascript" src="{$DESIGN_PATH}files/script.js"></script>
<form action="{$REQUEST_URI}" method="post" enctype="multipart/form-data" accept-charset="UTF-8">
<div id="tabs">
<ul>
......
{if isset($error_msg)}
{$error_msg}
{/if}
<script type="text/javascript" src="{$DESIGN_PATH}files/script.js"></script>
<form action="{$REQUEST_URI}" method="post" enctype="multipart/form-data" accept-charset="UTF-8">
<div id="tabs">
<ul>
......
{if isset($error_msg)}
{$error_msg}
{/if}
<script type="text/javascript" src="{$DESIGN_PATH}menu_items/script.js"></script>
<form action="{$REQUEST_URI}" method="post" accept-charset="UTF-8">
<fieldset>
<legend>{lang values="common|general_statements"}</legend>
......
{if isset($error_msg)}
{$error_msg}
{/if}
<script type="text/javascript" src="{$DESIGN_PATH}menu_items/script.js"></script>
<form action="{$REQUEST_URI}" method="post" accept-charset="UTF-8">
<fieldset>
<legend>{lang values="common|general_statements"}</legend>
......
{if isset($error_msg)}
{$error_msg}
{/if}
<script type="text/javascript" src="{$DESIGN_PATH}static_pages/script.js"></script>
<form action="{$REQUEST_URI}" method="post" accept-charset="UTF-8">
<div id="tabs">
<ul>
......
......@@ -2,18 +2,17 @@
{$error_msg}
{/if}
<form action="{$REQUEST_URI}" method="post" accept-charset="UTF-8">
<fieldset class="no-border">
<fieldset>
<legend>{lang values="users|forgot_pwd"}</legend>
<p>
{lang values="users|forgot_pwd_description"}
</p>
<dl>
<dt><label for="nickname">{lang values="users|nickname"}</label></dt>
<dd><input type="text" name="form[nickname]" id="nickname" value="{$form.nickname}" maxlength="30" /></dd>
<dt><label for="mail">{lang values="common|email"}</label></dt>
<dd><input type="text" name="form[mail]" id="mail" value="{$form.mail}" maxlength="120" /></dd>
<dt><label for="nick_mail">{lang values="users|nickname_or_email"}</label></dt>
<dd><input type="text" name="form[nick_mail]" id="nick_mail" value="{$form.nick_mail}" maxlength="120" /></dd>
</dl>
{$captcha}
</fieldset>
{$captcha}
<div class="form-bottom">
<input type="submit" name="submit" value="{lang values="common|submit"}" class="form" />
<input type="reset" value="{lang values="common|reset"}" class="form" />
......
......@@ -2,24 +2,28 @@
{$error_msg}
{/if}
<form action="{$REQUEST_URI}" method="post" accept-charset="UTF-8">
<fieldset>
<legend>{lang values="users|nickname"} &amp; {lang values="common|email"}</legend>
<dl>
<dt><label for="nickname">{lang values="users|nickname"}</label></dt>
<dd><input type="text" name="form[nickname]" id="nickname" value="{$form.nickname}" maxlength="30" /></dd>
<dt><label for="mail">{lang values="common|email"}</label></dt>
<dd><input type="text" name="form[mail]" id="mail" value="{$form.mail}" maxlength="120" /></dd>
</dl>
</fieldset>
<fieldset>
<legend>{lang values="users|pwd"}</legend>
<dl>
<dt><label for="pwd">{lang values="users|pwd"}</label></dt>
<dd><input type="password" name="form[pwd]" id="pwd" value="" /></dd>
<dt><label for="pwd_repeat">{lang values="users|pwd_repeat"}</label></dt>
<dd><input type="password" name="form[pwd_repeat]" id="pwd_repeat" value="" /></dd>
</dl>
</fieldset>
<div id="tabs">
<ul>
<li><a href="#tab-1">{lang values="users|nickname"} &amp; {lang values="common|email"}</a></li>
<li><a href="#tab-2">{lang values="users|pwd"}</a></li>
</ul>
<div id="tab-1">
<dl>
<dt><label for="nickname">{lang values="users|nickname"}</label></dt>
<dd><input type="text" name="form[nickname]" id="nickname" value="{$form.nickname}" maxlength="30" /></dd>
<dt><label for="mail">{lang values="common|email"}</label></dt>
<dd><input type="text" name="form[mail]" id="mail" value="{$form.mail}" maxlength="120" /></dd>
</dl>
</div>
<div id="tab-2">
<dl>
<dt><label for="pwd">{lang values="users|pwd"}</label></dt>
<dd><input type="password" name="form[pwd]" id="pwd" value="" /></dd>
<dt><label for="pwd_repeat">{lang values="users|pwd_repeat"}</label></dt>
<dd><input type="password" name="form[pwd_repeat]" id="pwd_repeat" value="" /></dd>
</dl>
</div>
</div>
{$captcha}
<div class="form-bottom">
<input type="submit" name="submit" value="{lang values="common|submit"}" class="form" />
......
<h4>{lang values="users|user_menu"}</h4>
<script type="text/javascript" src="{$DESIGN_PATH}users/script.js"></script>
<ul class="admin">
<li><a href="{uri args="users/home"}">{lang values="users|home"}</a></li>
{if isset($nav_mods)}
......
......@@ -188,5 +188,4 @@ class auth
{
return setcookie('ACP3_AUTH', base64_encode($nickname . '|' . $password), time() + $expiry, ROOT_DIR);
}
}
?>
\ No newline at end of file
}
\ No newline at end of file
......@@ -131,5 +131,4 @@ class breadcrumb
// Nur Titel ausgeben
return self::$end;
}
}
?>
\ No newline at end of file
}
\ No newline at end of file
......@@ -102,5 +102,4 @@ class cache
}
return;
}
}
?>
\ No newline at end of file
}
\ No newline at end of file
......@@ -65,5 +65,4 @@ class config
{
return xml::parseXmlFile(ACP3_ROOT . 'modules/' . $module . '/module.xml', 'settings');
}
}
?>
\ No newline at end of file
}
\ No newline at end of file
......@@ -96,5 +96,4 @@ class date
}
return gmdate('U');
}
}
?>
\ No newline at end of file
}
\ No newline at end of file
......@@ -241,5 +241,4 @@ class db
}
return false;
}
}
?>
\ No newline at end of file
}
\ No newline at end of file
......@@ -87,5 +87,4 @@ class lang
return isset($lang_data[$module][$key]) ? $lang_data[$module][$key] : strtoupper('{' . $module . '_' . $key . '}');
}
}
?>
\ No newline at end of file
}
\ No newline at end of file
......@@ -183,5 +183,4 @@ class modules
}
return $parsed_modules[$module];
}
}
?>
\ No newline at end of file
}
\ No newline at end of file
......@@ -103,5 +103,4 @@ class uri
{
$this->params[$name] = $value;
}
}
?>
\ No newline at end of file
}
\ No newline at end of file
......@@ -208,5 +208,4 @@ class validate
}
}
}
}
?>
\ No newline at end of file
}
\ No newline at end of file
......@@ -89,5 +89,4 @@ class xml
}
return false;
}
}
?>
\ No newline at end of file
}
\ No newline at end of file
......@@ -76,5 +76,4 @@ $tpl->assign('MODULES', new modules());
require_once ACP3_ROOT . 'includes/functions.php';
$auth = new auth();
$lang = new lang();
$date = new date();
?>
\ No newline at end of file
$date = new date();
\ No newline at end of file
......@@ -464,5 +464,4 @@ function uri($uri)
$uri = $uri . (!preg_match('/\/$/', $uri) ? '/' : '');
$prefix = CONFIG_SEO_MOD_REWRITE == '0' || preg_match('/^acp\//', $uri) ? PHP_SELF . '/' : ROOT_DIR;
return $prefix . $uri;
}
?>
\ No newline at end of file
}
\ No newline at end of file
......@@ -46,5 +46,4 @@ if (get_magic_quotes_gpc()) {
$_POST = acp3_strip($_POST);
$_COOKIE = acp3_strip($_COOKIE);
$_REQUEST = acp3_strip($_REQUEST);
}
?>
\ No newline at end of file
}
\ No newline at end of file
......@@ -28,19 +28,11 @@ if ($_GET['g'] == 'css') {
return $styles;
} elseif ($_GET['g'] == 'js') {
$modules = scandir(DESIGN_PATH);
$scripts = array();
$scripts['js'][] = DESIGN_PATH . '/jquery.js';
$scripts['js'][] = DESIGN_PATH . '/jquery.cookie.js';
$scripts['js'][] = DESIGN_PATH . '/jquery.ui.js';
$scripts['js'][] = DESIGN_PATH . '/script.js';
foreach ($modules as $module) {
$path = DESIGN_PATH . $module . '/script.js';
if (is_dir(DESIGN_PATH . $module) && $module != '.' && $module != '..' && is_file($path)) {
$scripts['js'][] = $path;
}
}
return $scripts;
}
\ No newline at end of file
......@@ -75,5 +75,4 @@ function editor($params) {
return $out;
}
?>
\ No newline at end of file
}
\ No newline at end of file
......@@ -49,5 +49,4 @@ function editor($params) {
$init = true;
return $out;
}
?>
\ No newline at end of file
}
\ No newline at end of file
......@@ -9,5 +9,4 @@
define('ACP3_ROOT', './');
require ACP3_ROOT . 'includes/common.php';
modules::outputPage();
?>
\ No newline at end of file
modules::outputPage();
\ No newline at end of file
......@@ -74,7 +74,7 @@
</item>
<item>
<name>forgot_pwd_description</name>
<message>Bitte geben Sie in den folgenden Feldern entweder Ihren bei der Registrierung verwendeten Benutzernamen oder die E-Mail-Adresse ein.</message>
<message>Bitte geben Sie im folgenden Feld entweder Ihren bei der Registrierung verwendeten Benutzernamen oder die E-Mail-Adresse ein.</message>
</item>
<item>
<name>forgot_pwd_mail_subject</name>
......@@ -148,6 +148,10 @@
<name>new_pwd_repeat</name>
<message>Neues Passwort wiederholen</message>
</item>
<item>
<name>nickname_or_email</name>
<message>Benutzername oder E-Mail-Adresse</message>
</item>
<item>
<name>nickname</name>
<message>Benutzername</message>
......
......@@ -74,7 +74,7 @@
</item>
<item>
<name>forgot_pwd_description</name>
<message>Please either enter the E-mail address or the user name you used with the registration in the following fields.</message>
<message>Please either enter the E-mail address or the user name you used with the registration in the following input field.</message>
</item>
<item>
<name>forgot_pwd_mail_subject</name>
......@@ -148,6 +148,10 @@
<name>new_pwd_repeat</name>
<message>Repeat new password</message>
</item>
<item>
<name>nickname_or_email</name>
<message>Benutzername oder E-Mail-Adresse</message>
</item>
<item>
<name>nickname</name>
<message>User name</message>
......
......@@ -39,4 +39,3 @@ if ($c_access > 0) {
$tpl->assign('access', $access);
}
$content = $tpl->fetch('access/adm_list.html');
?>
\ No newline at end of file
......@@ -54,4 +54,3 @@ if (!isset($_POST['submit']) || isset($errors) && is_array($errors)) {
$content = $tpl->fetch('access/create.html');
}
?>
\ No newline at end of file
......@@ -43,4 +43,3 @@ if (!isset($entries)) {
} else {
redirect('acp/errors/404');
}
?>
\ No newline at end of file
......@@ -94,4 +94,3 @@ if (validate::isNumber($uri->id) && $db->countRows('*', 'access', 'id = \'' . $u
} else {
redirect('errors/404');
}
?>
\ No newline at end of file
......@@ -35,4 +35,3 @@ function buildAccessLevel($modules)
}
return '';
}
?>
\ No newline at end of file
......@@ -40,4 +40,3 @@ if (modules::check('system', 'server_config') == 1) {
}
$content = $tpl->fetch('acp/adm_list.html');
?>
\ No newline at end of file
......@@ -49,4 +49,3 @@ if (strlen($uri->hash) == 32 && validate::isMD5($uri->hash)) {
} else {
redirect('errors/404');
}
?>
\ No newline at end of file
......@@ -24,4 +24,3 @@ if ($c_categories > 0) {
$tpl->assign('categories', $categories);
}
$content = $tpl->fetch('categories/adm_list.html');
?>
\ No newline at end of file
......@@ -73,4 +73,3 @@ if (!isset($_POST['submit']) || isset($errors) && is_array($errors)) {
$content = $tpl->fetch('categories/create.html');
}
?>
\ No newline at end of file
......@@ -55,4 +55,3 @@ if (!isset($entries)) {
} else {
redirect('acp/errors/404');
}
?>
\ No newline at end of file
......@@ -68,4 +68,3 @@ if (validate::isNumber($uri->id) && $db->countRows('*', 'categories', 'id = \''
} else {
redirect('errors/404');
}
?>
\ No newline at end of file
......@@ -125,4 +125,3 @@ function categoriesList($module, $category_id = '', $category_create = false, $c
$tpl->assign('categories', $categories);
return $tpl->fetch('categories/create_list.html');
}
?>
\ No newline at end of file
......@@ -35,4 +35,3 @@ if (!isset($_POST['submit']) || isset($errors) && is_array($errors)) {
$content = $tpl->fetch('categories/settings.html');
}
?>
\ No newline at end of file
......@@ -57,4 +57,3 @@ if (empty($module) || !empty($module) && $db->countRows('*', 'comments', 'module
}
}
$content = $tpl->fetch('comments/adm_list.html');
?>
\ No newline at end of file
......@@ -100,4 +100,3 @@ function commentsCreate($module, $entry_id)
return $tpl->fetch('comments/create.html');
}
}
?>
\ No newline at end of file
......@@ -32,4 +32,3 @@ if (!isset($entries)) {
} else {
redirect('acp/errors/404');
}
?>
\ No newline at end of file
......@@ -32,4 +32,3 @@ if (!isset($entries)) {
} else {
redirect('acp/errors/404');
}
?>
\ No newline at end of file
......@@ -56,4 +56,3 @@ if (validate::isNumber($uri->id) && $db->countRows('*', 'comments', 'id = \'' .
} else {
redirect('errors/404');
}
?>
\ No newline at end of file
......@@ -71,4 +71,3 @@ function commentsList($module, $entry_id)
}
return $content;
}
?>
\ No newline at end of file
......@@ -40,4 +40,3 @@ if (!isset($_POST['submit']) || isset($errors) && is_array($errors)) {
$content = $tpl->fetch('contact/adm_list.html');
}
?>
\ No newline at end of file
......@@ -27,4 +27,3 @@ $tpl->assign('imprint', str_replace($search, $replace, $contact['layout']));
$tpl->assign('powered_by', sprintf($lang->t('contact', 'powered_by'), '<a href="http://www.acp3-cms.net" onclick="window.open(this.href); return false">ACP3</a>'));
$content = $tpl->fetch('contact/imprint.html');
?>
\ No newline at end of file
......@@ -67,4 +67,3 @@ if (!isset($_POST['submit']) || isset($errors) && is_array($errors)) {
$content = $tpl->fetch('contact/list.html');
}
?>
\ No newline at end of file
......@@ -22,4 +22,3 @@ if ($c_emoticons > 0) {
$tpl->assign('emoticons', $emoticons);
}
$content = $tpl->fetch('emoticons/adm_list.html');
?>
\ No newline at end of file
......@@ -51,4 +51,3 @@ if (!isset($_POST['submit']) || isset($errors) && is_array($errors)) {
$content = $tpl->fetch('emoticons/create.html');
}
?>
\ No newline at end of file
......@@ -39,4 +39,3 @@ if (!isset($entries)) {
} else {
redirect('acp/errors/404');
}
?>
\ No newline at end of file
......@@ -66,4 +66,3 @@ if (validate::isNumber($uri->id) && $db->countRows('*', 'emoticons', 'id = \'' .
} else {
redirect('errors/404');
}
?>
\ No newline at end of file
......@@ -69,4 +69,3 @@ function emoticonsReplace($string)
}
return $string;
}
?>
\ No newline at end of file
......@@ -35,4 +35,3 @@ if (!isset($_POST['submit']) || isset($errors) && is_array($errors)) {
$content = $tpl->fetch('emoticons/settings.html');
}
?>
\ No newline at end of file
......@@ -12,4 +12,3 @@ if (!defined('IN_ACP3') && !defined('IN_ADM'))
header('HTTP/1.0 403 Forbidden');
$content = $tpl->fetch('errors/403.html');
?>
\ No newline at end of file
......@@ -12,4 +12,3 @@ if (!defined('IN_ACP3') && !defined('IN_ADM'))
header('HTTP/1.0 404 not found');
$content = $tpl->fetch('errors/404.html');
?>
\ No newline at end of file
......@@ -24,4 +24,3 @@ if (modules::check($uri->feed, 'extensions/feeds') == 1) {
} else {
redirect(0, ROOT_DIR);
}
?>
\ No newline at end of file
......@@ -24,4 +24,3 @@ if ($c_files > 0) {
}
$content = $tpl->fetch('files/adm_list.html');
?>
\ No newline at end of file
......@@ -112,4 +112,3 @@ if (!isset($_POST['submit']) || isset($errors) && is_array($errors)) {
$content = $tpl->fetch('files/create.html');
}
?>
\ No newline at end of file
......@@ -39,4 +39,3 @@ if (!isset($entries)) {
} else {
redirect('acp/errors/404');
}
?>
\ No newline at end of file
......@@ -49,4 +49,3 @@ if (validate::isNumber($uri->id) && $db->countRows('*', 'files', 'id = \'' . $ur
} else {
redirect('errors/404');
}
?>
\ No newline at end of file
......@@ -127,4 +127,3 @@ if (validate::isNumber($uri->id) && $db->countRows('*', 'files', 'id = \'' . $ur
} else {
redirect('errors/403');
}
?>
\ No newline at end of file
......@@ -25,4 +25,3 @@ if ($c_result > 0) {
}
$tpl->assign('results', $results);
}
?>
\ No newline at end of file
......@@ -35,4 +35,3 @@ if ($c_result_files > 0) {
$results_mods['files']['results'][$i]['text'] = shortenEntry($db->escape($result_files[$i]['text'], 3), 200, 0, '...');
}
}
?>
\ No newline at end of file
......@@ -32,4 +32,3 @@ if (validate::isNumber($uri->cat) && $db->countRows('*', 'categories', 'id = \''
} else {
redirect('errors/404');
}
?>
\ No newline at end of file
......@@ -19,4 +19,4 @@ function getFilesCache($id)
return cache::output('files_details_id_' . $id);
}
?>
......@@ -19,4 +19,3 @@ if (modules::check('categories', 'functions') == 1) {
}
$content = $tpl->fetch('files/list.html');
?>
\ No newline at end of file
......@@ -23,4 +23,3 @@ if ($c_files > 0) {
}
$tpl->display('files/sidebar.html');
?>
\ No newline at end of file
......@@ -80,4 +80,3 @@ if (validate::isNumber($uri->id) && $db->countRows('*', 'gallery', 'id = \'' . $
} else {
redirect('errors/404');
}
?>
\ No newline at end of file
......@@ -23,4 +23,3 @@ if ($c_galleries > 0) {
$tpl->assign('galleries', $galleries);
}
$content = $tpl->fetch('gallery/adm_list.html');
?>
\ No newline at end of file
......@@ -42,4 +42,3 @@ if (!isset($_POST['submit']) || isset($errors) && is_array($errors)) {
$content = $tpl->fetch('gallery/create.html');
}
?>
\ No newline at end of file
......@@ -42,4 +42,3 @@ if (!isset($entries)) {
} else {
redirect('acp/errors/404');
}
?>
\ No newline at end of file
......@@ -39,4 +39,3 @@ if (!isset($entries)) {
} else {
redirect('acp/errors/404');
}
?>
\ No newline at end of file
......@@ -45,4 +45,3 @@ if (validate::isNumber($uri->id) && $db->select('COUNT(g.id)', 'gallery AS g, '
} else {
redirect('errors/404');
}
?>
\ No newline at end of file
......@@ -66,4 +66,3 @@ if (validate::isNumber($uri->id) && $db->countRows('*', 'gallery', 'id = \'' . $
} else {
redirect('errors/404');
}
?>
\ No newline at end of file
......@@ -76,4 +76,3 @@ if (validate::isNumber($uri->id) && $db->countRows('*', 'gallery_pictures', 'id
} else {
redirect('errors/404');
}
?>
\ No newline at end of file
......@@ -32,4 +32,4 @@ function getGalleryCache($id)
return cache::output('gallery_pics_id_' . $id);
}
?>
......@@ -79,4 +79,3 @@ if (!validate::isNumber($uri->id) || $uri->action != 'mini' && $uri->action != '
}
exit;
}
?>
\ No newline at end of file
......@@ -27,4 +27,3 @@ if ($c_galleries > 0) {
$tpl->assign('galleries', $galleries);
}
$content = $tpl->fetch('gallery/list.html');
?>
\ No newline at end of file
......@@ -28,4 +28,3 @@ if (validate::isNumber($uri->id)) {
}
}