oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

99
docs/upgrades/upgrade_4.6.9-4.7.0.sql
View file

@ -930,7 +930,104 @@ INSERT INTO international VALUES (3,'WobjectProxy',11,'
INSERT INTO international VALUES (4,'WobjectProxy',11,'ÝÔáÊ ÚãáíÉ Öã ÇáææÈÌßÊ Åáì ÈÑæßÓí. ÑÈãÇ ÌÑì ÍÐÝ åÐÇ ÇáææÈÌíßÊ',1031514049);
INSERT INTO international VALUES (5,'WobjectProxy',11,'ææÈÌíßÊ ÈÑæßÓí¡ ÅÖÇÝÉ/ÊÍÑíÑ',1031514049);
delete from incrementer where incrementerId='Product_templateId';
alter table language add column toolbar varchar(35) not null default 'default';
insert into international (internationalId,languageId,namespace,message,lastUpdated) values (746,1,'WebGUI','Toolbar Icon Set', 1036046598);
insert into international (internationalId,languageId,namespace,message,lastUpdated) values (45,1,'Survey','Are you certain you wish to delete this answer and its responses?', 1035951913);
insert into international (internationalId,languageId,namespace,message,lastUpdated) values (44,1,'Survey','Are you certain you wish to delete this question, its answers and responses?', 1035951626);
insert into international (internationalId,languageId,namespace,message,lastUpdated) values (34,1,'Survey','Agree.', 1035948150);
insert into international (internationalId,languageId,namespace,message,lastUpdated) values (33,1,'Survey','Strongly agree.', 1035948137);
insert into international (internationalId,languageId,namespace,message,lastUpdated) values (32,1,'Survey','False.', 1035948033);
insert into international (internationalId,languageId,namespace,message,lastUpdated) values (31,1,'Survey','True.', 1035948023);
insert into international (internationalId,languageId,namespace,message,lastUpdated) values (27,1,'Survey','Add an opinion (agree/disagree) answer scale.', 1035948010);
insert into international (internationalId,languageId,namespace,message,lastUpdated) values (25,1,'Survey','Add a true/false answer.', 1035947960);
insert into international (internationalId,languageId,namespace,message,lastUpdated) values (26,1,'Survey','Add a frequency (always/never) answer scale.', 1035947924);
insert into international (internationalId,languageId,namespace,message,lastUpdated) values (43,1,'Survey','Never.', 1035947630);
insert into international (internationalId,languageId,namespace,message,lastUpdated) values (42,1,'Survey','Occasionally.', 1035947620);
insert into international (internationalId,languageId,namespace,message,lastUpdated) values (41,1,'Survey','Frequently.', 1035947594);
insert into international (internationalId,languageId,namespace,message,lastUpdated) values (40,1,'Survey','Always.', 1035947586);
insert into international (internationalId,languageId,namespace,message,lastUpdated) values (39,1,'Survey','Not applicable.', 1035947497);
insert into international (internationalId,languageId,namespace,message,lastUpdated) values (38,1,'Survey','Strongly disagree.', 1035947488);
insert into international (internationalId,languageId,namespace,message,lastUpdated) values (37,1,'Survey','Disagree.', 1035947477);
insert into international (internationalId,languageId,namespace,message,lastUpdated) values (36,1,'Survey','Somewhat disagree.', 1035947465);
insert into international (internationalId,languageId,namespace,message,lastUpdated) values (35,1,'Survey','Somewhat agree.', 1035947450);
insert into international (internationalId,languageId,namespace,message,lastUpdated) values (30,1,'Survey','Add a new question.', 1035944708);
insert into international (internationalId,languageId,namespace,message,lastUpdated) values (29,1,'Survey','Add a text answer.', 1035874640);
insert into international (internationalId,languageId,namespace,message,lastUpdated) values (24,1,'Survey','Add a multiple choice answer.', 1035874502);
insert into international (internationalId,languageId,namespace,message,lastUpdated) values (745,1,'WebGUI','Go back to the page.', 1035872437);
insert into international (internationalId,languageId,namespace,message,lastUpdated) values (28,1,'Survey','Add a question.', 1035872173);
insert into international (internationalId,languageId,namespace,message,lastUpdated) values (744,1,'WebGUI','What next?', 1035864828);
insert into international (internationalId,languageId,namespace,message,lastUpdated) values (23,1,'Survey','Add a new answer.', 1035864494);
insert into international (internationalId,languageId,namespace,message,lastUpdated) values (22,1,'Survey','Answer Type', 1035864413);
insert into international (internationalId,languageId,namespace,message,lastUpdated) values (21,1,'Survey','Go To', 1035506057);
insert into international (internationalId,languageId,namespace,message,lastUpdated) values (20,1,'Survey','Is this answer correct?', 1035436321);
insert into international (internationalId,languageId,namespace,message,lastUpdated) values (19,1,'Survey','Answer', 1035436296);
insert into international (internationalId,languageId,namespace,message,lastUpdated) values (18,1,'Survey','Edit Answer', 1035436102);
insert into international (internationalId,languageId,namespace,message,lastUpdated) values (17,1,'Survey','Edit Question', 1035436091);
insert into international (internationalId,languageId,namespace,message,lastUpdated) values (16,1,'Survey','Randomize answers?', 1035429242);
insert into international (internationalId,languageId,namespace,message,lastUpdated) values (15,1,'Survey','Allow comment?', 1035429212);
insert into international (internationalId,languageId,namespace,message,lastUpdated) values (14,1,'Survey','Question', 1035428770);
insert into international (internationalId,languageId,namespace,message,lastUpdated) values (743,1,'WebGUI','You must specify a valid email address in order to attempt to recover your password.', 1035246389);
create table Survey (
wobjectId int not null primary key,
questionOrder varchar(30),
groupToTakeSurvey int,
groupToViewReports int,
mode varchar(30)
);
create table Survey_question(
wobjectId int not null,
Survey_questionId int not null primary key,
question text,
sequenceNumber int not null default 1,
allowComment int not null default 0,
randomizeAnswers int not null default 0
);
create table Survey_answer (
wobjectId int not null,
Survey_questionId int not null,
Survey_answerId int not null primary key,
sequenceNumber int not null default 1,
goto int,
answer varchar(255),
isCorrect int not null default 0,
fieldType varchar(30) not null default 'radio'
);
create table Survey_response (
wobjectId int not null,
Survey_questionId int not null,
Survey_answerId int not null,
Survey_responseId int not null primary key,
userId int,
username varchar(255),
ipAddress varchar(15),
response varchar(255),
comment text,
dateOfResponse int
);
alter table Survey_question add column answerFieldType varchar(35);
alter table Survey_answer drop column fieldType;
INSERT INTO incrementer VALUES ('Survey_answerId',1000);
INSERT INTO incrementer VALUES ('Survey_questionId',1000);
INSERT INTO incrementer VALUES ('Survey_responseId',1000);
insert into help (helpId,namespace,titleId,bodyId,seeAlso) values (1, 'Survey', 3, 4, '21,WebGUI;');
insert into international (internationalId,languageId,namespace,message,lastUpdated) values (13,1,'Survey','Who can view reports?', 1033949863);
insert into international (internationalId,languageId,namespace,message,lastUpdated) values (12,1,'Survey','Who can take the survey?', 1033949789);
insert into international (internationalId,languageId,namespace,message,lastUpdated) values (11,1,'Survey','Mode', 1033949647);
insert into international (internationalId,languageId,namespace,message,lastUpdated) values (10,1,'Survey','Quiz', 1033949566);
insert into international (internationalId,languageId,namespace,message,lastUpdated) values (9,1,'Survey','Survey', 1033949540);
insert into international (internationalId,languageId,namespace,message,lastUpdated) values (8,1,'Survey','Question Order', 1033949393);
insert into international (internationalId,languageId,namespace,message,lastUpdated) values (7,1,'Survey','Response Driven', 1033944729);
insert into international (internationalId,languageId,namespace,message,lastUpdated) values (6,1,'Survey','Random', 1033944643);
insert into international (internationalId,languageId,namespace,message,lastUpdated) values (5,1,'Survey','Sequential', 1033944535);
insert into international (internationalId,languageId,namespace,message,lastUpdated) values (3,1,'Survey','Survey, Add/Edit', 1033944306);
insert into international (internationalId,languageId,namespace,message,lastUpdated) values (4,1,'Survey','', 1033944306);
insert into international (internationalId,languageId,namespace,message,lastUpdated) values (2,1,'Survey','Edit Survey', 1033943825);
insert into international (internationalId,languageId,namespace,message,lastUpdated) values (1,1,'Survey','Survey', 1033942924);

26
lib/WebGUI/Icon.pm
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">';
}

2
lib/WebGUI/Operation/International.pm
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);

3
lib/WebGUI/Session.pm
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();

BIN
www/extras/downArrow.gif
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 872 B

BIN
www/extras/jumpDown.gif
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 870 B

BIN
www/extras/jumpUp.gif
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 872 B

BIN
www/extras/leftArrow.gif
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 870 B

BIN
www/extras/pageDown.gif
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 909 B

BIN
www/extras/pageUp.gif
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 912 B

BIN
www/extras/rightArrow.gif
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 867 B

BIN
www/extras/toolbar/default/become.gif Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
www/extras/toolbar/default/copy.gif Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
www/extras/toolbar/default/cut.gif Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
www/extras/toolbar/default/delete.gif Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1 KiB

BIN
www/extras/edit.gif → www/extras/toolbar/default/edit.gif
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 916 B

After

Width:  |  Height:  |  Size: 1.1 KiB

Before After
Before After

BIN
www/extras/help.gif → www/extras/toolbar/default/help.gif
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 925 B

After

Width:  |  Height:  |  Size: 1.1 KiB

Before After
Before After

BIN
www/extras/delete.gif → www/extras/toolbar/default/moveBottom.gif
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 873 B

After

Width:  |  Height:  |  Size: 993 B

Before After
Before After

BIN
www/extras/cut.gif → www/extras/toolbar/default/moveDown.gif
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 907 B

After

Width:  |  Height:  |  Size: 992 B

Before After
Before After

BIN
www/extras/become.gif → www/extras/toolbar/default/moveTop.gif
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 969 B

After

Width:  |  Height:  |  Size: 979 B

Before After
Before After

BIN
www/extras/copy.gif → www/extras/toolbar/default/moveUp.gif
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 934 B

After

Width:  |  Height:  |  Size: 984 B

Before After
Before After

BIN
www/extras/page.gif → www/extras/toolbar/default/page.gif
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 863 B

After

Width:  |  Height:  |  Size: 941 B

Before After
Before After

BIN
www/extras/toolbar/default/view.gif Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
www/extras/wobject.gif → www/extras/toolbar/default/wobject.gif
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 867 B

After

Width:  |  Height:  |  Size: 1,008 B

Before After
Before After

BIN
www/extras/upArrow.gif
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 872 B

BIN
www/extras/view.gif
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 179 B