Added new toolbar icon set and the ability to have different icon sets per language.

This commit is contained in:
JT Smith 2002-10-31 06:58:32 +00:00
parent bc4e7160df
commit b507cd81dc
26 changed files with 116 additions and 14 deletions

View file

@ -78,7 +78,7 @@ sub becomeIcon {
my ($output, $pageURL);
$pageURL = $_[1] || $session{page}{urlizedTitle};
$output = '<a href="'.WebGUI::URL::gateway($pageURL,$_[0]).'">';
$output .= '<img src="'.$session{config}{extras}.'/become.gif" align="middle" border="0" alt="Become"></a>';
$output .= '<img src="'.$session{config}{extras}.'/toolbar/'.$session{language}{toolbar}.'/become.gif" align="middle" border="0" alt="Become"></a>';
return $output;
}
@ -103,7 +103,7 @@ sub copyIcon {
my ($output, $pageURL);
$pageURL = $_[1] || $session{page}{urlizedTitle};
$output = '<a href="'.WebGUI::URL::gateway($pageURL,$_[0]).'">';
$output .= '<img src="'.$session{config}{extras}.'/copy.gif" align="middle" border="0" alt="Copy"></a>';
$output .= '<img src="'.$session{config}{extras}.'/toolbar/'.$session{language}{toolbar}.'/copy.gif" align="middle" border="0" alt="Copy"></a>';
return $output;
}
@ -128,7 +128,7 @@ sub cutIcon {
my ($output, $pageURL);
$pageURL = $_[1] || $session{page}{urlizedTitle};
$output = '<a href="'.WebGUI::URL::gateway($pageURL,$_[0]).'">';
$output .= '<img src="'.$session{config}{extras}.'/cut.gif" align="middle" border="0" alt="Cut"></a>';
$output .= '<img src="'.$session{config}{extras}.'/toolbar/'.$session{language}{toolbar}.'/cut.gif" align="middle" border="0" alt="Cut"></a>';
return $output;
}
@ -153,7 +153,7 @@ sub deleteIcon {
my ($output, $pageURL);
$pageURL = $_[1] || $session{page}{urlizedTitle};
$output = '<a href="'.WebGUI::URL::gateway($pageURL,$_[0]).'">';
$output .= '<img src="'.$session{config}{extras}.'/delete.gif" align="middle" border="0" alt="Delete"></a>';
$output .= '<img src="'.$session{config}{extras}.'/toolbar/'.$session{language}{toolbar}.'/delete.gif" align="middle" border="0" alt="Delete"></a>';
return $output;
}
@ -178,7 +178,7 @@ sub editIcon {
my ($output, $pageURL);
$pageURL = $_[1] || $session{page}{urlizedTitle};
$output = '<a href="'.WebGUI::URL::gateway($pageURL,$_[0]).'">';
$output .= '<img src="'.$session{config}{extras}.'/edit.gif" align="middle" border="0" alt="Edit"></a>';
$output .= '<img src="'.$session{config}{extras}.'/toolbar/'.$session{language}{toolbar}.'/edit.gif" align="middle" border="0" alt="Edit"></a>';
return $output;
}
@ -204,7 +204,7 @@ sub helpIcon {
my ($output, $namespace);
$namespace = $_[1] || "WebGUI";
$output = '<a href="'.WebGUI::URL::page('op=viewHelp&hid='.$_[0].'&namespace='.$namespace).
'" target="_blank"><img src="'.$session{config}{extras}.'/help.gif" border="0" align="right"></a>';
'" target="_blank"><img src="'.$session{config}{extras}.'/toolbar/'.$session{language}{toolbar}.'/help.gif" border="0" align="right"></a>';
return $output;
}
@ -229,7 +229,7 @@ sub moveBottomIcon {
my ($output, $pageURL);
$pageURL = $_[1] || $session{page}{urlizedTitle};
$output = '<a href="'.WebGUI::URL::gateway($pageURL,$_[0]).'">';
$output .= '<img src="'.$session{config}{extras}.'/jumpDown.gif" align="middle" border="0" alt="Move To Bottom"></a>';
$output .= '<img src="'.$session{config}{extras}.'/toolbar/'.$session{language}{toolbar}.'/moveBottom.gif" align="middle" border="0" alt="Move To Bottom"></a>';
return $output;
}
@ -254,7 +254,7 @@ sub moveDownIcon {
my ($output, $pageURL);
$pageURL = $_[1] || $session{page}{urlizedTitle};
$output = '<a href="'.WebGUI::URL::gateway($pageURL,$_[0]).'">';
$output .= '<img src="'.$session{config}{extras}.'/downArrow.gif" align="middle" border="0" alt="Move Down"></a>';
$output .= '<img src="'.$session{config}{extras}.'/toolbar/'.$session{language}{toolbar}.'/moveDown.gif" align="middle" border="0" alt="Move Down"></a>';
return $output;
}
@ -279,7 +279,7 @@ sub moveTopIcon {
my ($output, $pageURL);
$pageURL = $_[1] || $session{page}{urlizedTitle};
$output = '<a href="'.WebGUI::URL::gateway($pageURL,$_[0]).'">';
$output .= '<img src="'.$session{config}{extras}.'/jumpUp.gif" align="middle" border="0" alt="Move To Top"></a>';
$output .= '<img src="'.$session{config}{extras}.'/toolbar/'.$session{language}{toolbar}.'/moveTop.gif" align="middle" border="0" alt="Move To Top"></a>';
return $output;
}
@ -304,7 +304,7 @@ sub moveUpIcon {
my ($output, $pageURL);
$pageURL = $_[1] || $session{page}{urlizedTitle};
$output = '<a href="'.WebGUI::URL::gateway($pageURL,$_[0]).'">';
$output .= '<img src="'.$session{config}{extras}.'/upArrow.gif" align="middle" border="0" alt="Move Up"></a>';
$output .= '<img src="'.$session{config}{extras}.'/toolbar/'.$session{language}{toolbar}.'/moveUp.gif" align="middle" border="0" alt="Move Up"></a>';
return $output;
}
@ -319,7 +319,7 @@ sub moveUpIcon {
=cut
sub pageIcon {
return '<img src="'.$session{config}{extras}.'/page.gif" align="middle" border="0" alt="Page Settings">';
return '<img src="'.$session{config}{extras}.'/toolbar/'.$session{language}{toolbar}.'/page.gif" align="middle" border="0" alt="Page Settings">';
}
#-------------------------------------------------------------------
@ -343,7 +343,7 @@ sub viewIcon {
my ($output, $pageURL);
$pageURL = $_[1] || $session{page}{urlizedTitle};
$output = '<a href="'.WebGUI::URL::gateway($pageURL,$_[0]).'">';
$output .= '<img src="'.$session{config}{extras}.'/view.gif" align="middle" border="0" alt="View"></a>';
$output .= '<img src="'.$session{config}{extras}.'/toolbar/'.$session{language}{toolbar}.'/view.gif" align="middle" border="0" alt="View"></a>';
return $output;
}
@ -358,7 +358,7 @@ sub viewIcon {
=cut
sub wobjectIcon {
return '<img src="'.$session{config}{extras}.'/wobject.gif" align="middle" border="0" alt="Wobject Settings">';
return '<img src="'.$session{config}{extras}.'/toolbar/'.$session{language}{toolbar}.'/wobject.gif" align="middle" border="0" alt="Wobject Settings">';
}

View file

@ -187,6 +187,7 @@ sub www_editLanguage {
if (WebGUI::Privilege::isInGroup(3)) {
if ($session{form}{lid} eq "new") {
$data{characterSet} = "ISO-8859-1";
$data{toolbar} = "default";
} else {
%data = WebGUI::SQL->quickHash("select * from language where languageId=".$session{form}{lid});
}
@ -197,6 +198,7 @@ sub www_editLanguage {
$f->hidden("op","editLanguageSave");
$f->text("language",WebGUI::International::get(591),$data{language});
$f->text("characterSet",WebGUI::International::get(592),$data{characterSet});
$f->text("toolbar",WebGUI::International::get(746),$data{toolbar});
$f->submit;
$output .= $f->print;
return _submenu($output);

View file

@ -263,6 +263,9 @@ sub open {
### current page's properties (from page table)
$session{page} = _getPageInfo("",$session{dbh},$session{setting}{notFoundPage},$session{config}{scripturl});
###----------------------------
### language settings
$session{language} = WebGUI::SQL->quickHashRef("select * from language where languageId=$session{user}{language}");
###----------------------------
### loading plugins
_loadWobjects();
_loadMacros();