diff --git a/docs/upgrades/upgrade_4.6.9-4.7.0.sql b/docs/upgrades/upgrade_4.6.9-4.7.0.sql index 3b2c9e71e..25ef6a081 100644 --- a/docs/upgrades/upgrade_4.6.9-4.7.0.sql +++ b/docs/upgrades/upgrade_4.6.9-4.7.0.sql @@ -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); diff --git a/lib/WebGUI/Icon.pm b/lib/WebGUI/Icon.pm index c57c690e7..d60283126 100644 --- a/lib/WebGUI/Icon.pm +++ b/lib/WebGUI/Icon.pm @@ -78,7 +78,7 @@ sub becomeIcon { my ($output, $pageURL); $pageURL = $_[1] || $session{page}{urlizedTitle}; $output = ''; - $output .= 'Become'; + $output .= 'Become'; return $output; } @@ -103,7 +103,7 @@ sub copyIcon { my ($output, $pageURL); $pageURL = $_[1] || $session{page}{urlizedTitle}; $output = ''; - $output .= 'Copy'; + $output .= 'Copy'; return $output; } @@ -128,7 +128,7 @@ sub cutIcon { my ($output, $pageURL); $pageURL = $_[1] || $session{page}{urlizedTitle}; $output = ''; - $output .= 'Cut'; + $output .= 'Cut'; return $output; } @@ -153,7 +153,7 @@ sub deleteIcon { my ($output, $pageURL); $pageURL = $_[1] || $session{page}{urlizedTitle}; $output = ''; - $output .= 'Delete'; + $output .= 'Delete'; return $output; } @@ -178,7 +178,7 @@ sub editIcon { my ($output, $pageURL); $pageURL = $_[1] || $session{page}{urlizedTitle}; $output = ''; - $output .= 'Edit'; + $output .= 'Edit'; return $output; } @@ -204,7 +204,7 @@ sub helpIcon { my ($output, $namespace); $namespace = $_[1] || "WebGUI"; $output = ''; + '" target="_blank">'; return $output; } @@ -229,7 +229,7 @@ sub moveBottomIcon { my ($output, $pageURL); $pageURL = $_[1] || $session{page}{urlizedTitle}; $output = ''; - $output .= 'Move To Bottom'; + $output .= 'Move To Bottom'; return $output; } @@ -254,7 +254,7 @@ sub moveDownIcon { my ($output, $pageURL); $pageURL = $_[1] || $session{page}{urlizedTitle}; $output = ''; - $output .= 'Move Down'; + $output .= 'Move Down'; return $output; } @@ -279,7 +279,7 @@ sub moveTopIcon { my ($output, $pageURL); $pageURL = $_[1] || $session{page}{urlizedTitle}; $output = ''; - $output .= 'Move To Top'; + $output .= 'Move To Top'; return $output; } @@ -304,7 +304,7 @@ sub moveUpIcon { my ($output, $pageURL); $pageURL = $_[1] || $session{page}{urlizedTitle}; $output = ''; - $output .= 'Move Up'; + $output .= 'Move Up'; return $output; } @@ -319,7 +319,7 @@ sub moveUpIcon { =cut sub pageIcon { - return 'Page Settings'; + return 'Page Settings'; } #------------------------------------------------------------------- @@ -343,7 +343,7 @@ sub viewIcon { my ($output, $pageURL); $pageURL = $_[1] || $session{page}{urlizedTitle}; $output = ''; - $output .= 'View'; + $output .= 'View'; return $output; } @@ -358,7 +358,7 @@ sub viewIcon { =cut sub wobjectIcon { - return 'Wobject Settings'; + return 'Wobject Settings'; } diff --git a/lib/WebGUI/Operation/International.pm b/lib/WebGUI/Operation/International.pm index 02ffcb02f..98da6b623 100644 --- a/lib/WebGUI/Operation/International.pm +++ b/lib/WebGUI/Operation/International.pm @@ -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); diff --git a/lib/WebGUI/Session.pm b/lib/WebGUI/Session.pm index ba01cde8e..3497ac055 100644 --- a/lib/WebGUI/Session.pm +++ b/lib/WebGUI/Session.pm @@ -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(); diff --git a/www/extras/downArrow.gif b/www/extras/downArrow.gif deleted file mode 100644 index 4b4e551c8..000000000 Binary files a/www/extras/downArrow.gif and /dev/null differ diff --git a/www/extras/jumpDown.gif b/www/extras/jumpDown.gif deleted file mode 100644 index 0729c752b..000000000 Binary files a/www/extras/jumpDown.gif and /dev/null differ diff --git a/www/extras/jumpUp.gif b/www/extras/jumpUp.gif deleted file mode 100644 index 64ac54988..000000000 Binary files a/www/extras/jumpUp.gif and /dev/null differ diff --git a/www/extras/leftArrow.gif b/www/extras/leftArrow.gif deleted file mode 100644 index ea8060cca..000000000 Binary files a/www/extras/leftArrow.gif and /dev/null differ diff --git a/www/extras/pageDown.gif b/www/extras/pageDown.gif deleted file mode 100644 index 68e4e0f42..000000000 Binary files a/www/extras/pageDown.gif and /dev/null differ diff --git a/www/extras/pageUp.gif b/www/extras/pageUp.gif deleted file mode 100644 index e52c00e4c..000000000 Binary files a/www/extras/pageUp.gif and /dev/null differ diff --git a/www/extras/rightArrow.gif b/www/extras/rightArrow.gif deleted file mode 100644 index ade9d51b9..000000000 Binary files a/www/extras/rightArrow.gif and /dev/null differ diff --git a/www/extras/toolbar/default/become.gif b/www/extras/toolbar/default/become.gif new file mode 100644 index 000000000..e50248a2e Binary files /dev/null and b/www/extras/toolbar/default/become.gif differ diff --git a/www/extras/toolbar/default/copy.gif b/www/extras/toolbar/default/copy.gif new file mode 100644 index 000000000..6bff47c23 Binary files /dev/null and b/www/extras/toolbar/default/copy.gif differ diff --git a/www/extras/toolbar/default/cut.gif b/www/extras/toolbar/default/cut.gif new file mode 100644 index 000000000..d405397a1 Binary files /dev/null and b/www/extras/toolbar/default/cut.gif differ diff --git a/www/extras/toolbar/default/delete.gif b/www/extras/toolbar/default/delete.gif new file mode 100644 index 000000000..d94f9f872 Binary files /dev/null and b/www/extras/toolbar/default/delete.gif differ diff --git a/www/extras/edit.gif b/www/extras/toolbar/default/edit.gif similarity index 52% rename from www/extras/edit.gif rename to www/extras/toolbar/default/edit.gif index 40de8403b..ce3349bdb 100644 Binary files a/www/extras/edit.gif and b/www/extras/toolbar/default/edit.gif differ diff --git a/www/extras/help.gif b/www/extras/toolbar/default/help.gif similarity index 51% rename from www/extras/help.gif rename to www/extras/toolbar/default/help.gif index 93a5f08eb..80bc598e9 100644 Binary files a/www/extras/help.gif and b/www/extras/toolbar/default/help.gif differ diff --git a/www/extras/delete.gif b/www/extras/toolbar/default/moveBottom.gif similarity index 58% rename from www/extras/delete.gif rename to www/extras/toolbar/default/moveBottom.gif index 06b7e76c8..55d07ee9c 100644 Binary files a/www/extras/delete.gif and b/www/extras/toolbar/default/moveBottom.gif differ diff --git a/www/extras/cut.gif b/www/extras/toolbar/default/moveDown.gif similarity index 58% rename from www/extras/cut.gif rename to www/extras/toolbar/default/moveDown.gif index a4344eb36..93b457b02 100644 Binary files a/www/extras/cut.gif and b/www/extras/toolbar/default/moveDown.gif differ diff --git a/www/extras/become.gif b/www/extras/toolbar/default/moveTop.gif similarity index 58% rename from www/extras/become.gif rename to www/extras/toolbar/default/moveTop.gif index c7bcc7dea..28b41929d 100644 Binary files a/www/extras/become.gif and b/www/extras/toolbar/default/moveTop.gif differ diff --git a/www/extras/copy.gif b/www/extras/toolbar/default/moveUp.gif similarity index 58% rename from www/extras/copy.gif rename to www/extras/toolbar/default/moveUp.gif index d0fe877ae..745eaf120 100644 Binary files a/www/extras/copy.gif and b/www/extras/toolbar/default/moveUp.gif differ diff --git a/www/extras/page.gif b/www/extras/toolbar/default/page.gif similarity index 68% rename from www/extras/page.gif rename to www/extras/toolbar/default/page.gif index be41fc854..fa912fc5d 100644 Binary files a/www/extras/page.gif and b/www/extras/toolbar/default/page.gif differ diff --git a/www/extras/toolbar/default/view.gif b/www/extras/toolbar/default/view.gif new file mode 100644 index 000000000..f806ea5d2 Binary files /dev/null and b/www/extras/toolbar/default/view.gif differ diff --git a/www/extras/wobject.gif b/www/extras/toolbar/default/wobject.gif similarity index 57% rename from www/extras/wobject.gif rename to www/extras/toolbar/default/wobject.gif index 7ae477c4d..df14bf290 100644 Binary files a/www/extras/wobject.gif and b/www/extras/toolbar/default/wobject.gif differ diff --git a/www/extras/upArrow.gif b/www/extras/upArrow.gif deleted file mode 100644 index 8c4e5400e..000000000 Binary files a/www/extras/upArrow.gif and /dev/null differ diff --git a/www/extras/view.gif b/www/extras/view.gif deleted file mode 100644 index b0cffa2f3..000000000 Binary files a/www/extras/view.gif and /dev/null differ