diff --git a/docs/upgrades/upgrade_5.5.3-6.0.0.pl b/docs/upgrades/upgrade_5.5.3-6.0.0.pl index 144ccf736..a331a469a 100644 --- a/docs/upgrades/upgrade_5.5.3-6.0.0.pl +++ b/docs/upgrades/upgrade_5.5.3-6.0.0.pl @@ -50,6 +50,19 @@ $sth->finish; WebGUI::SQL->write("delete from incrementer where incrementerId='styleId'"); WebGUI::SQL->write("delete from settings where name='docTypeDec'"); WebGUI::SQL->write("drop table style"); +my @templateManagers = WebGUI::SQL->buildArray("select userId from groupings where groupId=8"); +my $clause; +if ($#templateManagers > 0) { + $clause = "and userId not in (".join(",",@templateManagers).")"; +} +$sth = WebGUI::SQL->read("select userId,expireDate,groupAdmin from groupings where groupId=5 ".$clause); +while (my $user = $sth->hashRef) { + WebGUI::SQL->write("insert into groupings (groupId,userId,expireDate,groupAdmin) values (8, ".$user->{userId}.", + ".$user->{expireDate}.", ".$user->{groupAdmin}.")"); +} +$sth->finish; +WebGUI::SQL->write("delete from groups where groupId=5"); +WebGUI::SQL->write("delete from groupings where groupId=5"); #-------------------------------------------- @@ -67,7 +80,7 @@ while (my $template = $sth->hashRef) { - + '.$template->{template}; $template->{template} =~ s/\/_positionFormat6x($1)/eg; @@ -110,7 +123,7 @@ sub _positionFormat6x {
- + diff --git a/docs/upgrades/upgrade_5.5.3-6.0.0.sql b/docs/upgrades/upgrade_5.5.3-6.0.0.sql index 793d44d5a..2784289ac 100644 --- a/docs/upgrades/upgrade_5.5.3-6.0.0.sql +++ b/docs/upgrades/upgrade_5.5.3-6.0.0.sql @@ -13,3 +13,140 @@ delete from international where internationalId=154 and namespace='WebGUI'; delete from international where internationalId=157 and namespace='WebGUI'; delete from international where internationalId=398 and namespace='WebGUI'; delete from style where name='Reserved'; +delete from international where internationalId=654 and namespace='WebGUI'; +delete from international where internationalId=609 and namespace='WebGUI'; +delete from international where internationalId=659 and namespace='WebGUI'; +delete from international where internationalId=614 and namespace='WebGUI'; +delete from international where internationalId=666 and namespace='WebGUI'; +delete from international where internationalId=621 and namespace='WebGUI'; +delete from international where internationalId=6 and namespace='WebGUI'; +delete from international where languageId=1 and namespace='WebGUI' and internationalId=830; +insert into international (internationalId,languageId,namespace,message,lastUpdated,context) values (830,1,'WebGUI','Page templates are used to organize wobjects on your page. To do this you create page template positions. You can have any number of positions in your page template, but you must always have position one. The following are the variables available to page templates.\r\n

\r\n\r\npositionX_loop
\r\nThe loop that defines a page position and contains a list of wobjects for that position. Replace X with a number, so position one would be position1_loop, and position two would be position2_loop, etc.\r\n

\r\n\r\nwobject.canView
\r\nA condition indicating whether the current user has the privileges to view this wobject. \r\n

\r\n\r\nwobject.canEdit
\r\nA condition indicating whether the current user has the privileges to edit this wobject.\r\n

\r\n\r\nwobject.controls
\r\nThe toolbar for manipulating the properties of this wobject.\r\n

\r\n\r\nwobject.namespace
\r\nThe namespace of this wobject. This is also known as the wobject type, for instance Article, USS, SQLReport, and SiteMap are all namespaces.\r\n

\r\n\r\nwobject.id
\r\nThe unique identifier for this wobject.\r\n

\r\n\r\nwobject.isInDateRange
\r\nA condition indicating whether the wobject is scheduled to be displayed right now. The variable wobject.canView already takes this into account, but content managers can always view content, so this is an extra check so they don\'t have to see the wobject if it\'s not scheduled to appear yet, or if it\'s end date has already passed.\r\n

\r\n\r\nwobject.content
\r\nThe content produced by the wobject.\r\n

\r\n\r\n

\r\n\r\n

\r\nNOTE: The position elements can go up to 1 billion, which should be more than enough for the average site.\r\n\r\n

\r\n\r\npage.canEdit
\r\nA condition indicating whether the current user has the privileges to edit this page.\r\n

\r\n\r\npage.controls
\r\nThe toolbar for manipulating the properties of the page.\r\n

\r\n\r\n\r\n\r\n', 1070028702,NULL); +delete from international where languageId=1 and namespace='WebGUI' and internationalId=932; +insert into international (internationalId,languageId,namespace,message,lastUpdated,context) values (932,1,'WebGUI','Themes are a mechanism to quickly install new styles, templates, and collateral into a WebGUI site. They are also great for moving those same items from one site to another.\r\n

\r\nTIP: When building a theme, be sure to name the components (styles, templates collateral) in the theme with some name that is unique to the theme. This is useful so that your users can find the components in your theme, as well as to avoid name conflicts.', 1070027889,NULL); +delete from international where languageId=1 and namespace='WebGUI' and internationalId=1073; +insert into international (internationalId,languageId,namespace,message,lastUpdated,context) values (1073,1,'WebGUI','Style Template', 1070027660,NULL); +delete from international where languageId=1 and namespace='WebGUI' and internationalId=1074; +insert into international (internationalId,languageId,namespace,message,lastUpdated,context) values (1074,1,'WebGUI','Style templates are a special kind of template in WebGUI. They allow you to keep your content seperated from the look and feel of your site. The following are the template variables available in style templates:\r\n\r\n

\r\n\r\nbody.content
\r\nThe the content on the current page.\r\n

\r\n\r\nhead.tags
\r\nTags that WebGUI automatically generates for you so that caching works the way it should, search engines can find you better, and other useful automated functionality. This should go in the <head> </head> section of your style.\r\n\r\n

\r\nIn addition to the above tags all of the session variables are made available to you just like any other template. We suggest using something like this in the <title> </title> portion of your style:\r\n

\r\n\r\n<tmpl_var session.page.title> - <tmpl_var session.setting.companyName>\r\n\r\n

\r\nFollowing a guide like the above will help you get good ranking on search engines.\r\n\r\n', 1070027660,NULL); +delete from international where languageId=1 and namespace='WebGUI' and internationalId=634; +insert into international (internationalId,languageId,namespace,message,lastUpdated,context) values (634,1,'WebGUI','Default Home Page
Some really small sites don\'t have a home page, but instead like to use one of their internal pages like \"About Us\" or \"Company Information\" as their home page. For that reason, you can set the default page of your site to any page in the site. That page will be the one people go to if they type in just your URL http://www.mywebguisite.com, or if they click on the Home link generated by the ^H; macro. \r\n\r\n

Not Found Page
If a page that a user requests is not found in the system, the user can be redirected to the home page or to an error page where they can attempt to find what they were looking for. You decide which is better for your users. \r\n\r\n\r\n

Favicon
An icon that appears on Internet Explorer short cuts such as your \"Favorites\". To learn more about Favicon click here. \r\n\r\n

Site Icon
An icon that appears in the URL bar of most modern browsers. It may also appear in the bookmarks of the browser. The image must be 16x16 pixels. \r\n\r\n

Add edit stamp to posts?
Typically if a user edits a post on a discussion, a stamp is added to that post to identify who made the edit, and at what time. On some sites that information is not necessary, therefore you can turn it off here. \r\n\r\n

Filter Contributed HTML
Especially when running a public site where anybody can post to your message boards or user submission systems, it is often a good idea to filter their content for malicious code that can harm the viewing experience of your visitors; And in some circumstances, it can even cause security problems. Use this setting to select the level of filtering you wish to apply. \r\n\r\n

Maximum Attachment Size
The size (in kilobytes) of the maximum allowable attachment to be uploaded to your system. \r\n\r\n

Max Image Size
If images are uploaded to your system that are bigger than the max image size, then they will be resized to the max image size. The max image size is measured in pixels and will use the size of the longest side of the image to determine if the limit has been reached. \r\n\r\n

Thumbnail Size
When images are uploaded to your system, they will automatically have thumbnails generated at the size specified here (unless overridden on a case-by-case basis). Thumbnail size is measured in pixels. \r\n\r\n

Snippet Preview Length
How many characters of a snippet should be displayed in the collateral management system main listing. \r\n\r\n

Text Area Rows
Some sites wish to control the size of the forms that WebGUI generates. With this setting you can specify how many rows of characters will be displayed in textareas on the site. \r\n\r\n

Text Area Columns
Some sites wish to control the size of the forms that WebGUI generates. With this setting you can specify how many columns of characters will be displayed in textareas on the site. \r\n\r\n

Text Box Size
Some sites wish to control the size of the forms that WebGUI generates. With this setting you can specify how characters can be displayed at once in text boxes on the site. \r\n\r\n

Wobject Privileges
Choose \'Yes\' to enable privileges at the Wobject level.  By default, Wobjects are set to inherit page level privileges

', 1070026791,NULL); +delete from international where languageId=1 and namespace='WebGUI' and internationalId=842; +insert into international (internationalId,languageId,namespace,message,lastUpdated,context) values (842,1,'WebGUI','These macros are used to create navigation on the site.\r\n

\r\n\r\n^C; or ^C(); - Crumb Trail
\r\nA dynamically generated crumb trail to the current page. You can optionally specify a delimeter to be used between page names by using ^C(::);. The default delimeter is >.\r\n

\r\n\r\nNOTE: The .crumbTrail style sheet class is tied to this macro.\r\n

\r\n\r\n^FlexMenu;
\r\nThis menu macro creates a top-level menu that expands as the user selects each menu item.\r\n

\r\n\r\n^H; or ^H(); - Home Link
\r\nA link to the home page of this site. In addition you can change the link text by creating a macro like this ^H(\"Go Home\");.\r\n

\r\n\r\nNOTES: You can also use the special case ^H(linkonly); to return only the URL to the home page and nothing more. Also, the .homeLink style sheet class is tied to this macro.\r\n

\r\n\r\n^M; or ^M(); - Current Menu (Vertical)
\r\nA vertical menu containing the sub-pages at the current level. In addition, you may configure this macro by specifying how many levels deep the menu should go. By default it will show only the first level. To go three levels deep create a macro like this ^M(3);. If you set the macro to \"0\" it will track the entire site tree.\r\n

\r\n\r\n^m; - Current Menu (Horizontal)
\r\nA horizontal menu containing the sub-pages at the current level. You can optionally specify a delimeter to be used between page names by using ^m(:--:);. The default delimeter is ·.\r\n

\r\n\r\n^PreviousDropMenu;
\r\nCreate a drop down menu containing the sub-pages at the previous level in the page tree.\r\n

\r\nExample: ^PreviousDropMenu;\r\n

\r\n\r\n^P; or ^P(); - Previous Menu (Vertical)
\r\nA vertical menu containing the sub-pages at the previous level. In addition, you may configure this macro by specifying how many levels deep the menu should go. By default it will show only the first level. To go three levels deep create a macro like this ^P(3);. If you set the macro to \"0\" it will track the entire site tree.\r\n

\r\n\r\n^p; - Previous Menu (Horizontal)
\r\nA horizontal menu containing the sub-pages at the previous level. You can optionally specify a delimeter to be used between page names by using ^p(:--:);. The default delimeter is ·.\r\n

\r\n\r\n^rootmenu; or ^rootmenu(); (Horizontal)
\r\nCreates a horizontal menu of the various roots on your system (except for the WebGUI system roots). You can optionally specify a menu delimiter like this: ^rootmenu(|);\r\n

\r\n\r\n^RootTab;
\r\nCreate a tab navigation system from the roots on your site (except WebGUI\'s system roots) similar to the tabs used in the tab forms (editing wobjects or pages).\r\n

\r\nNOTE: Has two special style sheet classes: .RootTabOn{} and .RootTabOff{}.\r\n

\r\nExample:
\r\n<style>\r\n.rootTabOn {\r\n line-height: 17px;\r\n font-size: 16px;\r\n spacing: 3px;\r\n border: 1px solid black;\r\n border-bottom-width: 0px;\r\n background-color: #333333;\r\n z-index: 10000;\r\n padding: 3px 9px 5px 9px;\r\n color: white;\r\n}\r\n\r\n.rootTabOn A, .rootTabOn A:visited {\r\n color: white;\r\n font-weight: bold;\r\n text-decoration: none;\r\n}\r\n\r\n.rootTabOff {\r\n line-height: 15px;\r\n font-size: 14px;\r\n border: 1px solid black;\r\n border-bottom-width: 0px;\r\n background-color: #c8c8c8;\r\n z-index: 1000;\r\n padding: 2px 9px 2px 9px;\r\n}\r\n\r\n.rootTabOff A, .rootTabOff A:visited {\r\n color: black;\r\n text-decoration: underline;\r\n}\r\n\r\n.rootTabOff A:hover {\r\n font-weight: bold;\r\n}\r\n</style>\r\n^RootTab;\r\n

\r\n\r\n\r\n^SpecificDropMenu();
\r\nCreate a drop down menu starting at a specific point in your navigation tree. This takes two parameters. The first is the url of the page to start with and the second (optional parameter) is the depth to traverse to.\r\n

\r\nExample: ^SpecificDropMenu(\"home\",3);\r\n

\r\n\r\n^S(); - Specific SubMenu (Vertical)
\r\nThis macro allows you to get the submenu of any page, starting with the page you specified. For instance, you could get the home page submenu by creating a macro that looks like this ^S(\"home\",0);. The first value is the urlized title of the page and the second value is the depth you\'d like the menu to go. By default it will show only the first level. To go three levels deep create a macro like this ^S(\"home\",3);.\r\n

\r\n\r\n\r\n^s(); - Specific SubMenu (Horizontal)
\r\nThis macro allows you to get the submenu of any page, starting with the page you specified. For instance, you could get the home page submenu by creating a macro that looks like this ^s(\"home\");. The value is the urlized title of the page. You can optionally specify a delimeter to be used between page names by using ^s(\"home\",\":--:\");. The default delimeter is ·.\r\n

\r\n\r\n^Synopsis; or ^Synopsis(); Menu
\r\nThis macro allows you to get the submenu of a page along with the synopsis of each link. You may specify an integer to specify how many levels deep to traverse the page tree.\r\n

\r\n\r\nNOTES: The .synopsis_sub, .synopsis_summary, and .synopsis_title style sheet classes are tied to this macro.\r\n

\r\n\r\n^TopDropMenu;
\r\nCreate a drop down menu of your top level navigation.\r\n

\r\nExample: ^TopDropMenu;\r\n

\r\n\r\n^T; or ^T(); - Top Level Menu (Vertical)
\r\nA vertical menu containing the main pages of the site (aka the sub-pages from the home page). In addition, you may configure this macro by specifying how many levels deep the menu should go. By default it will show only the first level. To go three levels deep create a macro like this ^T(3);. If you set the macro to \"0\" it will track the entire site tree.\r\n

\r\n\r\n^t; - Top Level Menu (Horizontal)
\r\nA vertical menu containing the main pages of the site (aka the sub-pages from the home page). You can optionally specify a delimeter to be used between page names by using ^t(:--:);. The default delimeter is ·.\r\n

\r\n\r\n^/; - System URL
\r\nThe URL to the gateway script (example: /index.pl/).\r\n

\r\n\r\n^\\; - Page URL
\r\nThe URL to the current page (example: /index.pl/pagename).\r\n

\r\n\r\nIt should be noted that many of these macros can also make use of these style sheet classes:\r\n

\r\n.selectedMenuItem
\r\nUse this class to highlight the current page in any of the menu macros.\r\n

\r\n\r\n.verticalMenu
\r\nThe vertical menu (if you use a vertical menu macro).\r\n

\r\n\r\n\r\n.horizontalMenu
\r\nThe horizontal menu (if you use a horizontal menu macro).\r\n

\r\n', 1070030242,NULL); +delete from international where languageId=1 and namespace='WebGUI' and internationalId=623; +insert into international (internationalId,languageId,namespace,message,lastUpdated,context) values (623,1,'WebGUI','Cascading Style Sheets (CSS) are a great way to manage the look and feel of any web site. They are used extensively in WebGUI.\r\n

\r\n\r\n\r\nIf you are unfamiliar with how to use CSS, Plain Black provides training classes on XHTML and CSS. Alternatively, Bradsoft makes an excellent CSS editor called Top Style.\r\n

\r\n\r\n\r\nThe following is a list of classes used to control the default look of WebGUI. These of course can be overridden or replaced in the various templates that generate them.\r\n

\r\n\r\n\r\nA
\r\nThe links throughout the style.\r\n

\r\n\r\n\r\nBODY
\r\nThe default setup of all pages within a style.\r\n

\r\n\r\n\r\nH1
\r\nThe headers on every page.\r\n

\r\n\r\n\r\n.content
\r\nThe main content area on all pages of the style.\r\n

\r\n\r\n\r\n.formDescription
\r\nThe tags on all forms next to the form elements. \r\n

\r\n\r\n\r\n.formSubtext
\r\nThe tags below some form elements.\r\n

\r\n\r\n\r\n.highlight
\r\nDenotes a highlighted item, such as which message you are viewing within a list.\r\n

\r\n\r\n\r\n\r\n\r\n.pagination
\r\nThe Previous and Next links on pages with pagination.\r\n

\r\n\r\n\r\n\r\n\r\n.tableData
\r\nThe data rows on things like message boards and user contributions.\r\n

\r\n\r\n\r\n.tableHeader
\r\nThe headings of columns on things like message boards and user contributions.\r\n

\r\n\r\n\r\n\r\n\r\nNOTE: Some wobjects and macros have their own unique styles sheet classes, which are documented in their individual help files.\r\n

\r\n\r\n\r\n', 1070030223,NULL); +delete from international where languageId=1 and namespace='WebGUI' and internationalId=846; +insert into international (internationalId,languageId,namespace,message,lastUpdated,context) values (846,1,'WebGUI','These macros are mainly useful in maintaining styles in WebGUI.\r\n

\r\n\r\n^AdminBar;
\r\nPlaces the administrative tool bar on the page. This is a required element in the \"body\" segment of the Style Manager. This macro uses a style sheet class called .adminBar , which you may want to account for in your style.\r\n\r\n

\r\n\r\n\r\n^c; - Company Name
\r\nThe name of your company specified in the settings by your Administrator.\r\n

\r\n\r\n\r\n^e; - Company Email Address
\r\nThe email address for your company specified in the settings by your Administrator.\r\n

\r\n\r\n^Extras;
\r\nReturns the path to the WebGUI \"extras\" folder, which contains things like WebGUI icons.\r\n

\r\n\r\n^LastModified; or ^LastModified();
\r\nDisplays the date that the current page was last modified based upon the wobjects on the page. The date is defaultly displayed based upon the user\'s date preferences. Optionally, it can take two parameters. The first is text to display before the date. The second is a date format string (see the D (date) macro for details.\r\n

\r\nExample: ^LastModified(\"Updated: \",\"%c %D, %y\");\r\n

\r\n\r\n\r\n^PageTitle;
\r\nDisplays the title of the current page.\r\n

\r\n\r\nNOTE: If you begin using admin functions or the indepth functions of any wobject, the page title will become a link that will quickly bring you back to the page.\r\n

\r\n\r\n^r; or ^r(); - Make Page Printable
\r\nCreates a link to remove the style from a page to make it printable. In addition, you can change the link text by creating a macro like this ^r(\"Print Me!\");.\r\n

\r\n\r\nBy default, when this link is clicked, the current page\'s style is replaced with the \"Make Page Printable\" style in the Style Manager. However, that can be overridden by specifying the name of another style as the second parameter, like this: ^r(\"Print!\",\"WebGUI\");\r\n

\r\n\r\nNOTES: You can also use the special case ^r(linkonly); to return only the URL to the make printable page and nothing more. Also, the .makePrintableLink style sheet class is tied to this macro.\r\n

\r\n\r\n^RootTitle;
\r\nReturns the title of the root of the current page. For instance, the main root in WebGUI is the \"Home\" page. Many advanced sites have many roots and thus need a way to display to the user which root they are in.\r\n

\r\n\r\n^u; - Company URL
\r\nThe URL for your company specified in the settings by your Administrator.\r\n

\r\n\r\n\r\n\r\n^?; - Search
\r\nAdd a search box to the page. The search box is tied to WebGUI\'s built-in search engine.\r\n

\r\n\r\nNOTE: The .searchBox style sheet class is tied to this macro.\r\n

\r\n\r\n^Spacer();
\r\nCreate a spacer in your layout. Great for creating blocks of color with divs and tables. It takes two parameters, width and height.\r\n

\r\nExample: ^Spacer(\"100\",\"50\");\r\n

\r\n\r\n^-;
\r\nThis is known as the separator macro. It must appear exactly once in every style. Wherever it appears is where the content for any given page will be put.\r\n

', 1070029970,NULL); + + + + +delete from help; +insert into help (helpId,namespace,titleId,bodyId,seeAlso) values (20, 'WebGUI', 670, 625, '49,WebGUI;'); +insert into help (helpId,namespace,titleId,bodyId,seeAlso) values (1, 'FileManager', 61, 71, '3,FileManager;2,FileManager;21,WebGUI;'); +insert into help (helpId,namespace,titleId,bodyId,seeAlso) values (28, 'WebGUI', 678, 633, '1,WebGUI;3,WebGUI;'); +insert into help (helpId,namespace,titleId,bodyId,seeAlso) values (31, 'WebGUI', 681, 636, '30,WebGUI;1,WebGUI;3,WebGUI;'); +insert into help (helpId,namespace,titleId,bodyId,seeAlso) values (30, 'WebGUI', 680, 635, '31,WebGUI;'); +insert into help (helpId,namespace,titleId,bodyId,seeAlso) values (25, 'WebGUI', 675, 630, '60,WebGUI;'); +insert into help (helpId,namespace,titleId,bodyId,seeAlso) values (1, 'Item', 61, 71, '2,Item;21,WebGUI;'); +insert into help (helpId,namespace,titleId,bodyId,seeAlso) values (6, 'WebGUI', 656, 611, '12,WebGUI;'); +insert into help (helpId,namespace,titleId,bodyId,seeAlso) values (46, 'WebGUI', 696, 651, '66,WebGUI;'); +insert into help (helpId,namespace,titleId,bodyId,seeAlso) values (22, 'WebGUI', 672, 627, '12,WebGUI;'); +insert into help (helpId,namespace,titleId,bodyId,seeAlso) values (1, 'USS', 61, 71, '71,WebGUI;3,USS;2,USS;21,WebGUI;'); +insert into help (helpId,namespace,titleId,bodyId,seeAlso) values (24, 'WebGUI', 674, 629, '12,WebGUI;'); +insert into help (helpId,namespace,titleId,bodyId,seeAlso) values (1, 'FAQ', 61, 71, '3,FAQ;2,FAQ;21,WebGUI;'); +insert into help (helpId,namespace,titleId,bodyId,seeAlso) values (13, 'WebGUI', 663, 618, '12,WebGUI;'); +insert into help (helpId,namespace,titleId,bodyId,seeAlso) values (1, 'SyndicatedContent', 61, 71, '2,SyndicatedContent;21,WebGUI;'); +insert into help (helpId,namespace,titleId,bodyId,seeAlso) values (1, 'EventsCalendar', 61, 71, '2,EventsCalendar;3,EventsCalendar;21,WebGUI;'); +insert into help (helpId,namespace,titleId,bodyId,seeAlso) values (1, 'MessageBoard', 61, 71, '3,MessageBoard;2,MessageBoard;21,WebGUI;'); +insert into help (helpId,namespace,titleId,bodyId,seeAlso) values (1, 'LinkList', 61, 71, '3,LinkList;2,LinkList;21,WebGUI;'); +insert into help (helpId,namespace,titleId,bodyId,seeAlso) values (21, 'WebGUI', 671, 626, '19,WebGUI;18,WebGUI;27,WebGUI;14,WebGUI;'); +insert into help (helpId,namespace,titleId,bodyId,seeAlso) values (1, 'Article', 61, 71, '2,Article;71,WebGUI;21,WebGUI;'); +insert into help (helpId,namespace,titleId,bodyId,seeAlso) values (1, 'ExtraColumn', 61, 71, '21,WebGUI;'); +insert into help (helpId,namespace,titleId,bodyId,seeAlso) values (27, 'WebGUI', 677, 632, '1,Article;1,EventsCalendar;1,ExtraColumn;1,FAQ;1,FileManager;1,HttpProxy;1,Item;1,LinkList;1,DataForm;1,MessageBoard;1,Poll;1,Product;1,SiteMap;1,SQLReport;1,Survey;1,SyndicatedContent;1,USS;1,WobjectProxy;21,WebGUI;'); +insert into help (helpId,namespace,titleId,bodyId,seeAlso) values (1, 'Poll', 61, 71, '2,Poll;21,WebGUI;'); +insert into help (helpId,namespace,titleId,bodyId,seeAlso) values (1, 'SiteMap', 61, 71, '2,SiteMap;21,WebGUI;'); +insert into help (helpId,namespace,titleId,bodyId,seeAlso) values (1, 'SQLReport', 61, 71, '21,WebGUI;'); +insert into help (helpId,namespace,titleId,bodyId,seeAlso) values (18, 'WebGUI', 668, 623, '52,WebGUI;78,WebGUI;'); +insert into help (helpId,namespace,titleId,bodyId,seeAlso) values (17, 'WebGUI', 667, 622, '10,WebGUI;'); +insert into help (helpId,namespace,titleId,bodyId,seeAlso) values (2, 'WebGUI', 652, 607, '12,WebGUI;'); +insert into help (helpId,namespace,titleId,bodyId,seeAlso) values (15, 'WebGUI', 665, 620, '10,WebGUI;'); +insert into help (helpId,namespace,titleId,bodyId,seeAlso) values (14, 'WebGUI', 664, 619, '21,WebGUI;'); +insert into help (helpId,namespace,titleId,bodyId,seeAlso) values (12, 'WebGUI', 662, 617, '6,WebGUI;29,WebGUI;13,WebGUI;24,WebGUI;22,WebGUI;2,WebGUI;'); +insert into help (helpId,namespace,titleId,bodyId,seeAlso) values (10, 'WebGUI', 660, 615, '17,WebGUI;15,WebGUI;8,WebGUI;'); +insert into help (helpId,namespace,titleId,bodyId,seeAlso) values (8, 'WebGUI', 658, 613, '10,WebGUI;32,WebGUI;5,WebGUI;7,WebGUI;'); +insert into help (helpId,namespace,titleId,bodyId,seeAlso) values (78, 'WebGUI', 1073, 1074, '60,WebGUI;18,WebGUI;50,WebGUI;33,WebGUI;'); +insert into help (helpId,namespace,titleId,bodyId,seeAlso) values (7, 'WebGUI', 657, 612, '8,WebGUI;'); +insert into help (helpId,namespace,titleId,bodyId,seeAlso) values (32, 'WebGUI', 682, 637, '8,WebGUI;'); +insert into help (helpId,namespace,titleId,bodyId,seeAlso) values (5, 'WebGUI', 655, 610, '8,WebGUI;'); +insert into help (helpId,namespace,titleId,bodyId,seeAlso) values (3, 'WebGUI', 653, 608, '1,WebGUI;'); +insert into help (helpId,namespace,titleId,bodyId,seeAlso) values (1, 'WebGUI', 642, 606, '52,WebGUI;3,WebGUI;'); +insert into help (helpId,namespace,titleId,bodyId,seeAlso) values (29, 'WebGUI', 679, 634, '12,WebGUI;'); +insert into help (helpId,namespace,titleId,bodyId,seeAlso) values (33, 'WebGUI', 683, 638, '61,WebGUI;34,WebGUI;35,WebGUI;50,WebGUI;'); +insert into help (helpId,namespace,titleId,bodyId,seeAlso) values (34, 'WebGUI', 684, 639, '33,WebGUI;'); +insert into help (helpId,namespace,titleId,bodyId,seeAlso) values (35, 'WebGUI', 685, 640, '33,WebGUI;'); +insert into help (helpId,namespace,titleId,bodyId,seeAlso) values (19, 'WebGUI', 669, 624, '53,WebGUI;58,WebGUI;57,WebGUI;60,WebGUI;59,WebGUI;'); +insert into help (helpId,namespace,titleId,bodyId,seeAlso) values (66, 'WebGUI', 960, 961, '46,WebGUI;'); +insert into help (helpId,namespace,titleId,bodyId,seeAlso) values (65, 'WebGUI', 957, 958, '67,WebGUI;'); +insert into help (helpId,namespace,titleId,bodyId,seeAlso) values (2, 'FileManager', 72, 73, '1,FileManager;'); +insert into help (helpId,namespace,titleId,bodyId,seeAlso) values (2, 'EventsCalendar', 72, 73, '4,EventsCalendar;1,EventsCalendar;'); +insert into help (helpId,namespace,titleId,bodyId,seeAlso) values (2, 'FAQ', 72, 73, '1,FAQ;'); +insert into help (helpId,namespace,titleId,bodyId,seeAlso) values (2, 'LinkList', 72, 73, '1,LinkList;'); +insert into help (helpId,namespace,titleId,bodyId,seeAlso) values (47, 'WebGUI', 697, 698, '1,Article;17,WebGUI;1,MessageBoard;1,Poll;2,WebGUI;1,USS;'); +insert into help (helpId,namespace,titleId,bodyId,seeAlso) values (1, 'WobjectProxy', 5, 6, '21,WebGUI;'); +insert into help (helpId,namespace,titleId,bodyId,seeAlso) values (1, 'Product', 38, 39, '5,Product;4,Product;6,Product;2,Product;3,Product;7,Product;21,WebGUI;'); +insert into help (helpId,namespace,titleId,bodyId,seeAlso) values (2, 'Product', 40, 41, '6,Product;1,Product;'); +insert into help (helpId,namespace,titleId,bodyId,seeAlso) values (3, 'Product', 42, 43, '1,Product;'); +insert into help (helpId,namespace,titleId,bodyId,seeAlso) values (4, 'Product', 44, 45, '1,Product;'); +insert into help (helpId,namespace,titleId,bodyId,seeAlso) values (5, 'Product', 46, 47, '1,Product;'); +insert into help (helpId,namespace,titleId,bodyId,seeAlso) values (6, 'Product', 49, 50, '2,Product;1,Product;'); +insert into help (helpId,namespace,titleId,bodyId,seeAlso) values (7, 'Product', 62, 63, '1,Product;51,WebGUI;'); +insert into help (helpId,namespace,titleId,bodyId,seeAlso) values (1, 'Survey', 3, 4, '21,WebGUI;'); +insert into help (helpId,namespace,titleId,bodyId,seeAlso) values (49, 'WebGUI', 785, 786, '53,WebGUI;54,WebGUI;56,WebGUI;20,WebGUI;61,WebGUI;55,WebGUI;'); +insert into help (helpId,namespace,titleId,bodyId,seeAlso) values (50, 'WebGUI', 825, 826, '33,WebGUI;'); +insert into help (helpId,namespace,titleId,bodyId,seeAlso) values (2, 'Article', 72, 73, '1,Article;51,WebGUI;'); +insert into help (helpId,namespace,titleId,bodyId,seeAlso) values (51, 'WebGUI', 827, 828, '2,Article;3,DataForm;3,EventsCalendar;3,FAQ;3,FileManager;2,Item;3,LinkList;2,MessageBoard;7,Product;2,SiteMap;2,SyndicatedContent;33,WebGUI;2,USS;'); +insert into help (helpId,namespace,titleId,bodyId,seeAlso) values (3, 'EventsCalendar', 94, 95, '1,EventsCalendar;51,WebGUI;'); +insert into help (helpId,namespace,titleId,bodyId,seeAlso) values (3, 'FAQ', 76, 77, '1,FAQ;51,WebGUI;'); +insert into help (helpId,namespace,titleId,bodyId,seeAlso) values (3, 'FileManager', 75, 76, '1,FileManager;51,WebGUI;'); +insert into help (helpId,namespace,titleId,bodyId,seeAlso) values (4, 'EventsCalendar', 96, 97, '2,EventsCalendar;51,WebGUI;'); +insert into help (helpId,namespace,titleId,bodyId,seeAlso) values (2, 'Item', 73, 74, '1,Item;51,WebGUI;'); +insert into help (helpId,namespace,titleId,bodyId,seeAlso) values (3, 'LinkList', 75, 76, '1,LinkList;51,WebGUI;'); +insert into help (helpId,namespace,titleId,bodyId,seeAlso) values (2, 'MessageBoard', 73, 74, '75,WebGUI;76,WebGUI;73,WebGUI;77,WebGUI;72,WebGUI;74,WebGUI;1,MessageBoard;51,WebGUI;'); +insert into help (helpId,namespace,titleId,bodyId,seeAlso) values (2, 'SiteMap', 72, 73, '1,SiteMap;51,WebGUI;'); +insert into help (helpId,namespace,titleId,bodyId,seeAlso) values (2, 'USS', 74, 75, '1,USS;51,WebGUI;'); +insert into help (helpId,namespace,titleId,bodyId,seeAlso) values (3, 'USS', 76, 77, '1,USS;51,WebGUI;'); +insert into help (helpId,namespace,titleId,bodyId,seeAlso) values (52, 'WebGUI', 829, 830, '1,WebGUI;33,WebGUI;'); +insert into help (helpId,namespace,titleId,bodyId,seeAlso) values (53, 'WebGUI', 831, 832, '49,WebGUI;19,WebGUI;'); +insert into help (helpId,namespace,titleId,bodyId,seeAlso) values (54, 'WebGUI', 833, 834, '49,WebGUI;'); +insert into help (helpId,namespace,titleId,bodyId,seeAlso) values (55, 'WebGUI', 835, 836, '49,WebGUI;'); +insert into help (helpId,namespace,titleId,bodyId,seeAlso) values (56, 'WebGUI', 837, 838, '49,WebGUI;'); +insert into help (helpId,namespace,titleId,bodyId,seeAlso) values (57, 'WebGUI', 839, 840, '19,WebGUI;'); +insert into help (helpId,namespace,titleId,bodyId,seeAlso) values (58, 'WebGUI', 841, 842, '19,WebGUI;'); +insert into help (helpId,namespace,titleId,bodyId,seeAlso) values (59, 'WebGUI', 843, 844, '19,WebGUI;'); +insert into help (helpId,namespace,titleId,bodyId,seeAlso) values (60, 'WebGUI', 845, 846, '19,WebGUI;78,WebGUI;'); +insert into help (helpId,namespace,titleId,bodyId,seeAlso) values (2, 'SyndicatedContent', 72, 73, '1,SyndicatedContent;'); +insert into help (helpId,namespace,titleId,bodyId,seeAlso) values (1, 'HttpProxy', 10, 11, '21,WebGUI;'); +insert into help (helpId,namespace,titleId,bodyId,seeAlso) values (67, 'WebGUI', 968, 969, '65,WebGUI;'); +insert into help (helpId,namespace,titleId,bodyId,seeAlso) values (1, 'DataForm', 61, 71, '2,DataForm;4,DataForm;3,DataForm;21,WebGUI;'); +insert into help (helpId,namespace,titleId,bodyId,seeAlso) values (2, 'DataForm', 62, 72, '3,DataForm;1,DataForm;'); +insert into help (helpId,namespace,titleId,bodyId,seeAlso) values (2, 'Poll', 73, 74, '1,Poll;51,WebGUI;'); +insert into help (helpId,namespace,titleId,bodyId,seeAlso) values (61, 'WebGUI', 931, 932, '49,WebGUI;33,WebGUI;64,WebGUI;62,WebGUI;63,WebGUI;'); +insert into help (helpId,namespace,titleId,bodyId,seeAlso) values (62, 'WebGUI', 933, 934, '61,WebGUI;'); +insert into help (helpId,namespace,titleId,bodyId,seeAlso) values (63, 'WebGUI', 936, 937, '61,WebGUI;'); +insert into help (helpId,namespace,titleId,bodyId,seeAlso) values (64, 'WebGUI', 938, 939, '61,WebGUI;'); +insert into help (helpId,namespace,titleId,bodyId,seeAlso) values (3, 'DataForm', 82, 83, '2,DataForm;1,DataForm;51,WebGUI;'); +insert into help (helpId,namespace,titleId,bodyId,seeAlso) values (4, 'DataForm', 88, 89, '1,DataForm;'); +insert into help (helpId,namespace,titleId,bodyId,seeAlso) values (68, 'WebGUI', 997, 1000, '69,WebGUI;70,WebGUI;1,SQLReport;'); +insert into help (helpId,namespace,titleId,bodyId,seeAlso) values (69, 'WebGUI', 998, 1001, '68,WebGUI;70,WebGUI;1,SQLReport;'); +insert into help (helpId,namespace,titleId,bodyId,seeAlso) values (70, 'WebGUI', 999, 1002, '68,WebGUI;69,WebGUI;1,SQLReport;'); +insert into help (helpId,namespace,titleId,bodyId,seeAlso) values (71, 'WebGUI', 1054, 1055, '75,WebGUI;76,WebGUI;73,WebGUI;77,WebGUI;72,WebGUI;74,WebGUI;'); +insert into help (helpId,namespace,titleId,bodyId,seeAlso) values (72, 'WebGUI', 1056, 1057, '71,WebGUI;50,WebGUI;33,WebGUI;'); +insert into help (helpId,namespace,titleId,bodyId,seeAlso) values (73, 'WebGUI', 1058, 1059, '71,WebGUI;50,WebGUI;33,WebGUI;'); +insert into help (helpId,namespace,titleId,bodyId,seeAlso) values (74, 'WebGUI', 1060, 1061, '71,WebGUI;73,WebGUI;50,WebGUI;33,WebGUI;'); +insert into help (helpId,namespace,titleId,bodyId,seeAlso) values (75, 'WebGUI', 1062, 1063, '71,WebGUI;73,WebGUI;50,WebGUI;33,WebGUI;'); +insert into help (helpId,namespace,titleId,bodyId,seeAlso) values (76, 'WebGUI', 1065, 1066, '71,WebGUI;73,WebGUI;50,WebGUI;33,WebGUI;'); +insert into help (helpId,namespace,titleId,bodyId,seeAlso) values (77, 'WebGUI', 1067, 1068, '71,WebGUI;50,WebGUI;33,WebGUI;'); +insert into help (helpId,namespace,titleId,bodyId,seeAlso) values (3, 'MessageBoard', 78, 79, '71,WebGUI;1,MessageBoard;'); + + + diff --git a/lib/WebGUI/Macro/AdminBar.pm b/lib/WebGUI/Macro/AdminBar.pm index 042dfb7b6..0e23901dc 100644 --- a/lib/WebGUI/Macro/AdminBar.pm +++ b/lib/WebGUI/Macro/AdminBar.pm @@ -126,12 +126,6 @@ sub process { %hash ); } - if (WebGUI::Privilege::isInGroup(5)) { - %hash = ( - WebGUI::URL::page('op=listStyles')=>WebGUI::International::get(6), - %hash - ); - } if (WebGUI::Privilege::isInGroup(6)) { %hash = ( WebGUI::URL::gateway('packages')=>WebGUI::International::get(374), diff --git a/lib/WebGUI/Page.pm b/lib/WebGUI/Page.pm index 11f86e41e..dc7e34c0c 100644 --- a/lib/WebGUI/Page.pm +++ b/lib/WebGUI/Page.pm @@ -178,7 +178,7 @@ sub generate { return WebGUI::Privilege::noAccess() unless (WebGUI::Privilege::canViewPage()); my %var; $var{'page.canEdit'} = WebGUI::Privilege::canEditPage(); - $var{'page.toolbar'} = pageIcon() + $var{'page.controls'} = pageIcon() .deleteIcon('op=deletePage') .editIcon('op=editPage') .moveUpIcon('op=movePageUp') @@ -229,7 +229,7 @@ sub generate { push(@{$var{'position'.$wobject->{templatePosition}.'_loop'}},{ 'wobject.canView'=>WebGUI::Privilege::canViewWobject($wobject->{wobjectId}), 'wobject.canEdit'=>WebGUI::Privilege::canEditWobject($wobject->{wobjectId}), - 'wobject.toolbar'=>$wobjectToolbar, + 'wobject.controls'=>$wobjectToolbar, 'wobject.namespace'=>$wobject->{namespace}, 'wobject.id'=>$wobject->{wobjectId}, 'wobject.isInDateRange'=>$w->inDateRange,