Added todos to language/en/mods/info_acp_portal.php & language/en/mods/portal.php;

Fixed how color palette gets displayed and also fixed the small button areas of the color palette; 
When adding a Module, the users now see the Module name rather than the file name;
This commit is contained in:
Marc Alexander
2010-11-06 12:38:21 +00:00
parent a06c5fd197
commit 914a1d1d77
4 changed files with 27 additions and 7 deletions

View File

@@ -40,7 +40,6 @@
<fieldset> <fieldset>
<legend>{L_PORTAL_WELCOME}</legend> <legend>{L_PORTAL_WELCOME}</legend>
<dl> <dl>
<dt></dt>
<dd> <dd>
<script type="text/javascript"> <script type="text/javascript">
// <![CDATA[ // <![CDATA[
@@ -453,7 +452,7 @@
{ {
color = String(numberList[r]) + String(numberList[g]) + String(numberList[b]); color = String(numberList[r]) + String(numberList[g]) + String(numberList[b]);
document.write('<td bgcolor="#' + color + '" style="width: ' + width + 'px; height: ' + height + 'px;">'); document.write('<td bgcolor="#' + color + '" style="width: ' + width + 'px; height: ' + height + 'px;">');
document.write('<a href="#" onclick="bbfontstyle(\'[color=#' + color + ']\', \'[/color]\'); return false;"><img src="images/spacer.gif" width="' + width + '" height="' + height + '" alt="#' + color + '" title="#' + color + '" /></a>'); document.write('<a href="#" onclick="bbfontstyle(\'[color=#' + color + ']\', \'[/color]\'); return false;" style="margin: -4px 0px -4px 2px;"><img src="images/spacer.gif" width="' + width + '" height="' + (height+10) + '" alt="#' + color + '" title="#' + color + '" style="margin: -4px;" /></a>');
document.writeln('</td>'); document.writeln('</td>');
} }
@@ -534,8 +533,15 @@
// <![CDATA[ // <![CDATA[
function change_palette() function change_palette()
{ {
dE('colour_palette');
e = document.getElementById('colour_palette'); e = document.getElementById('colour_palette');
if(e.style.display == 'block')
{
dE('colour_palette', -1);
}
else
{
dE('colour_palette', 1);
}
if (e.style.display == 'block') if (e.style.display == 'block')
{ {
@@ -547,7 +553,7 @@
} }
} }
colorPalette('h', 5, 5); colorPalette('h', 10, 5);
// ]]> // ]]>
</script> </script>
</dt> </dt>

View File

@@ -424,19 +424,31 @@ class acp_portal
$c_class = new $class(); $c_class = new $class();
if ($c_class->columns & column_string_const($add_module)) if ($c_class->columns & column_string_const($add_module))
{ {
$fileinfo[] = substr($class, 7, -7); if ($c_class->language)
{
$user->add_lang('mods/portal/' . $c_class->language);
}
$fileinfo[] = array(
'module' => substr($class, 7, -7),
'name' => $user->lang[$c_class->name],
);
} }
} }
} }
} }
closedir($dh); closedir($dh);
sort($fileinfo); // we sort the $fileinfo array by the name of the modules
foreach($fileinfo as $key => $cur_file)
{
$name_ary[$key] = $cur_file['name'];
}
array_multisort($name_ary, SORT_REGULAR, $fileinfo);
$options = ''; $options = '';
foreach ($fileinfo as $module) foreach ($fileinfo as $module)
{ {
$options .= '<option value="' . $module . '">' . $module . '</option>'; $options .= '<option value="' . $module['module'] . '">' . $module['name'] . '</option>';
} }
$s_hidden_fields = build_hidden_fields(array( $s_hidden_fields = build_hidden_fields(array(

View File

@@ -35,6 +35,7 @@ if (empty($lang) || !is_array($lang))
// @todo: check for unneeded language variables // @todo: check for unneeded language variables
// @todo: change language variables to English ones // @todo: change language variables to English ones
// @todo: merge into mods/portal/
$lang = array_merge($lang, array( $lang = array_merge($lang, array(
// Manage blocks // Manage blocks

View File

@@ -32,6 +32,7 @@ if (empty($lang) || !is_array($lang))
// You do not need this where single placeholders are used, e.g. 'Message %d' is fine // You do not need this where single placeholders are used, e.g. 'Message %d' is fine
// equally where a string contains only two placeholders which are used to wrap text // equally where a string contains only two placeholders which are used to wrap text
// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine // in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
// @todo: merge into mods/portal/
// Common // Common
$lang = array_merge($lang, array( $lang = array_merge($lang, array(