Fixing inconsistencies.
This commit is contained in:
JT Smith
parent
679a5bc92b
commit
d9c2c3bcf7
3 changed files with 26 additions and 3 deletions
|
|
@ -7,6 +7,22 @@ upgrading from one version to the next, or even between multiple
|
|||
versions. Be sure to heed the warnings contained herein as they will
|
||||
save you many hours of grief.
|
||||
|
||||
4.9.0
|
||||
--------------------------------------------------------------------
|
||||
* If you created any templates using the previous two beta versions
|
||||
(4.7.0 or 4.8.0) then you'll need to tweak your templates as
|
||||
the template language has changed slightly for greater
|
||||
flexibility.
|
||||
|
||||
|
||||
4.8.0
|
||||
--------------------------------------------------------------------
|
||||
* If you are an administrator, but your userId is not 3 you will
|
||||
notice that all the forms in WebGUI are shortened
|
||||
considerably. This is due to the new UI Levels. If you wish
|
||||
see all the form elements then use the user manager to edit
|
||||
your user profile and set your UI Level to 9.
|
||||
|
||||
4.7.0
|
||||
--------------------------------------------------------------------
|
||||
* WebGUI::HTMLForm->radioList has been changed to correct an API
|
||||
|
|
|
|||
|
|
@ -930,6 +930,12 @@ update FileManager set templateId=2 where displayThumbnails=1;
|
|||
alter table FileManager drop column displayThumbnails;
|
||||
INSERT INTO template VALUES (1,'Default File Manager','<tmpl_if displayTitle>\r\n <h1><tmpl_var title></h1>\r\n</tmpl_if>\r\n\r\n<tmpl_if description>\r\n <tmpl_var description><p/>\r\n</tmpl_if>\r\n\r\n<tmpl_if session.scratch.search>\r\n <tmpl_var search.form>\r\n</tmpl_if>\r\n<table cellpadding=\"3\" cellspacing=\"1\" border=\"0\" width=\"100%\">\r\n\r\n<tr>\r\n <td colspan=\"3\" align=\"right\" class=\"tableMenu\">\r\n <a href=\"<tmpl_var search.url>\"><tmpl_var search.label></a>\r\n <tmpl_if session.var.adminOn>\r\n · <a href=\"<tmpl_var addfile.url>\"><tmpl_var addfile.label></a>\r\n </tmpl_if>\r\n </td>\r\n</tr>\r\n\r\n<tr>\r\n <td class=\"tableHeader\"><a href=\"<tmpl_var titleColumn.url>\"><tmpl_var titleColumn.label></a></td>\r\n <td class=\"tableHeader\"><a href=\"<tmpl_var descriptionColumn.url>\"><tmpl_var descriptionColumn.label></a></td>\r\n <td class=\"tableHeader\"><a href=\"<tmpl_var dateColumn.url>\"><tmpl_var dateColumn.label></a></td>\r\n</tr>\r\n\r\n<tmpl_loop file_loop>\r\n <tmpl_if file.canView>\r\n <tr>\r\n <td class=\"tableData\" valign=\"top\">\r\n <tmpl_if session.var.adminOn>\r\n <tmpl_var file.controls>\r\n </tmpl_if>\r\n <a href=\"<tmpl_var file.version1.url>\"><tmpl_var file.title></a>\r\n · \r\n <a href=\"<tmpl_var file.version1.url\">\"><img src=\"<tmpl_var file.version1.icon>\" border=\"0\" width=\"16\" height=\"16\" align=\"middle\" /><tmpl_var file.version1.type>/<tmpl_var file.version1.size></a>\r\n <tmpl_if file.version2.name>\r\n · \r\n <a href=\"<tmpl_var file.version2.url\">\"><img src=\"<tmpl_var file.version2.icon>\" border=0 width=\"16\" height=\"16\" align=\"middle\" /><tmpl_var file.version2.type>/<tmpl_var file.version2.size></a>\r\n </tmpl_if>\r\n <tmpl_if file.version3.name>\r\n · \r\n <a href=\"<tmpl_var file.version3.url\">\"><img src=\"<tmpl_var file.version3.icon>\" border=\"0\" width=\"16\" height=\"16\" align=\"middle\" /><tmpl_var file.version3.type>/<tmpl_var file.version3.size></a>\r\n </tmpl_if>\r\n </td>\r\n <td class=\"tableData\" valign=\"top\">\r\n <tmpl_var file.description>\r\n </td>\r\n <td class=\"tableData\" valign=\"top\">\r\n <tmpl_var file.date>\r\n </td>\r\n </tr>\r\n </tmpl_if>\r\n</tmpl_loop>\r\n\r\n<tmpl_if noresults>\r\n <tr><td class=\"tableData\" colspan=\"3\"><tmpl_var noresults.message></td></tr>\r\n</tmpl_if>\r\n\r\n</table>\r\n\r\n<tmpl_if multiplePages>\r\n <div class=\"pagination\">\r\n <tmpl_var previousPage> · <tmpl_var pageList> · <tmpl_var nextPage>\r\n </div>\r\n</tmpl_if>','FileManager');
|
||||
INSERT INTO template VALUES (2,'List with Thumbnails','<tmpl_if displayTitle>\r\n <h1><tmpl_var title></h1>\r\n</tmpl_if>\r\n\r\n<tmpl_if description>\r\n <tmpl_var description><p/>\r\n</tmpl_if>\r\n\r\n<tmpl_if session.scratch.search>\r\n <tmpl_var search.form>\r\n</tmpl_if>\r\n<table cellpadding=\"3\" cellspacing=\"1\" border=\"0\" width=\"100%\">\r\n\r\n<tr>\r\n <td colspan=\"3\" align=\"right\" class=\"tableMenu\">\r\n <a href=\"<tmpl_var search.url>\"><tmpl_var search.label></a>\r\n <tmpl_if session.var.adminOn>\r\n · <a href=\"<tmpl_var addfile.url>\"><tmpl_var addfile.label></a>\r\n </tmpl_if>\r\n </td>\r\n</tr>\r\n\r\n<tr>\r\n <td class=\"tableHeader\"><a href=\"<tmpl_var titleColumn.url>\"><tmpl_var titleColumn.label></a></td>\r\n <td class=\"tableHeader\"><a href=\"<tmpl_var descriptionColumn.url>\"><tmpl_var descriptionColumn.label></a></td>\r\n <td class=\"tableHeader\"><a href=\"<tmpl_var dateColumn.url>\"><tmpl_var dateColumn.label></a></td>\r\n</tr>\r\n\r\n<tmpl_loop file_loop>\r\n <tmpl_if file.canView>\r\n <tr>\r\n <td class=\"tableData\" valign=\"top\">\r\n <tmpl_if session.var.adminOn>\r\n <tmpl_var file.controls>\r\n </tmpl_if>\r\n <a href=\"<tmpl_var file.version1.url>\"><tmpl_var file.title></a>\r\n · \r\n <a href=\"<tmpl_var file.version1.url\">\"><img src=\"<tmpl_var file.version1.icon>\" border=\"0\" width=\"16\" height=\"16\" align=\"middle\" /><tmpl_var file.version1.type>/<tmpl_var file.version1.size></a>\r\n <tmpl_if file.version2.name>\r\n · \r\n <a href=\"<tmpl_var file.version2.url\">\"><img src=\"<tmpl_var file.version2.icon>\" border=0 width=\"16\" height=\"16\" align=\"middle\" /><tmpl_var file.version2.type>/<tmpl_var file.version2.size></a>\r\n </tmpl_if>\r\n <tmpl_if file.version3.name>\r\n · \r\n <a href=\"<tmpl_var file.version3.url\">\"><img src=\"<tmpl_var file.version3.icon>\" border=\"0\" width=\"16\" height=\"16\" align=\"middle\" /><tmpl_var file.version3.type>/<tmpl_var file.version3.size></a>\r\n </tmpl_if>\r\n </td>\r\n <td class=\"tableData\" valign=\"top\">\r\n <tmpl_if file.version1.isImage>\r\n <img src=\"<tmpl_var file.version1.thumbnail>\" border=0 align=\"middle\" hspace=\"3\">\r\n </tmpl_if>\r\n <tmpl_var file.description>\r\n </td>\r\n <td class=\"tableData\" valign=\"top\">\r\n <tmpl_var file.date>\r\n </td>\r\n </tr>\r\n </tmpl_if>\r\n</tmpl_loop>\r\n\r\n<tmpl_if noresults>\r\n <tr><td class=\"tableData\" colspan=\"3\"><tmpl_var noresults.message></td></tr>\r\n</tmpl_if>\r\n\r\n</table>\r\n\r\n<tmpl_if multiplePages>\r\n <div class=\"pagination\">\r\n <tmpl_var previousPage> · <tmpl_var pageList> · <tmpl_var nextPage>\r\n </div>\r\n</tmpl_if>','FileManager');
|
||||
delete from template where templateId<5 and namespace='Article';
|
||||
INSERT INTO template VALUES (1,'Default Article','<tmpl_if displayTitle>\r\n <h1><tmpl_var title></h1>\r\n</tmpl_if>\r\n\r\n<tmpl_if image.url>\r\n <table width=\"100%\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\"><tr><td class=\"content\">\r\n <img src=\"<tmpl_var image.url>\" align=\"right\" border=\"0\">\r\n</tmpl_if>\r\n\r\n<tmpl_if description>\r\n <tmpl_var description><p/>\r\n</tmpl_if>\r\n\r\n<tmpl_if linkUrl>\r\n <tmpl_if linkTitle>\r\n <p><a href=\"<tmpl_var linkUrl>\"><tmpl_var linkTitle></a>\r\n </tmpl_if>\r\n</tmpl_if>\r\n\r\n<tmpl_var attachment.box>\r\n\r\n<tmpl_if image.url>\r\n </td></tr></table>\r\n</tmpl_if>\r\n\r\n<tmpl_if allowDiscussion>\r\n <p><table width=\"100%\" cellspacing=\"2\" cellpadding=\"1\" border=\"0\">\r\n <tr><td align=\"center\" width=\"50%\" class=\"tableMenu\"><a href=\"<tmpl_var replies.URL>\"><tmpl_var replies.label> (<tmpl_var replies.count>)</a></td>\r\n <td align=\"center\" width=\"50%\" class=\"tableMenu\"><a href=\"<tmpl_var post.url>\"><tmpl_var post.label></a></td></tr>\r\n </table>\r\n</tmpl_if>\r\n','Article');
|
||||
INSERT INTO template VALUES (2,'Center Image','<tmpl_if displayTitle>\r\n <h1><tmpl_var title></h1>\r\n</tmpl_if>\r\n\r\n<tmpl_if image.url>\r\n <div align=\"center\"><img src=\"<tmpl_var image.url>\" border=\"0\"></div>\r\n</tmpl_if>\r\n\r\n<tmpl_if description>\r\n <tmpl_var description><p/>\r\n</tmpl_if>\r\n\r\n<tmpl_if linkurl>\r\n <tmpl_if linktitle>\r\n <p><a href=\"<tmpl_var linkUrl>\"><tmpl_var linkTitle></a>\r\n </tmpl_if>\r\n</tmpl_if>\r\n\r\n<tmpl_var attachment.box>\r\n\r\n\r\n<tmpl_if allowDiscussion>\r\n <p><table width=\"100%\" cellspacing=\"2\" cellpadding=\"1\" border=\"0\">\r\n <tr><td align=\"center\" width=\"50%\" class=\"tableMenu\"><a href=\"<tmpl_var replies.URL>\"><tmpl_var replies.label> (<tmpl_var replies.count>)</a></td>\r\n <td align=\"center\" width=\"50%\" class=\"tableMenu\"><a href=\"<tmpl_var post.url>\"><tmpl_var post.label></a></td></tr>\r\n </table>\r\n</tmpl_if>\r\n','Article');
|
||||
INSERT INTO template VALUES (3,'Left Align Image','<tmpl_if displayTitle>\r\n <h1><tmpl_var title></h1>\r\n</tmpl_if>\r\n\r\n<tmpl_if image.url>\r\n <table width=\"100%\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\"><tr><td class=\"content\">\r\n <img src=\"<tmpl_var image.url>\" align=\"left\" border=\"0\">\r\n</tmpl_if>\r\n\r\n<tmpl_if description>\r\n <tmpl_var description><p/>\r\n</tmpl_if>\r\n\r\n<tmpl_if linkurl>\r\n <tmpl_if linktitle>\r\n <p><a href=\"<tmpl_var linkUrl>\"><tmpl_var linkTitle></a>\r\n </tmpl_if>\r\n</tmpl_if>\r\n\r\n<tmpl_var attachment.box>\r\n\r\n<tmpl_if image.url>\r\n </td></tr></table>\r\n</tmpl_if>\r\n\r\n<tmpl_if allowDiscussion>\r\n <p><table width=\"100%\" cellspacing=\"2\" cellpadding=\"1\" border=\"0\">\r\n <tr><td align=\"center\" width=\"50%\" class=\"tableMenu\"><a href=\"<tmpl_var replies.URL>\"><tmpl_var replies.label> (<tmpl_var replies.count>)</a></td>\r\n <td align=\"center\" width=\"50%\" class=\"tableMenu\"><a href=\"<tmpl_var post.url>\"><tmpl_var post.label></a></td></tr>\r\n </table>\r\n</tmpl_if>\r\n','Article');
|
||||
INSERT INTO template VALUES (4,'Linked Image with Caption','<tmpl_if displayTitle>\r\n <h1><tmpl_var title></h1>\r\n</tmpl_if>\r\n\r\n<tmpl_if image.url>\r\n <table width=\"100%\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\"><tr><td class=\"content\">\r\n <table align=\"right\"><tr><td align=\"center\">\r\n <tmpl_if linkUrl>\r\n <a href=\"<tmpl_var linkUrl>\">\r\n <img src=\"<tmpl_var image.url>\" border=\"0\">\r\n <br /><tmpl_var linkTitle></a>\r\n <tmpl_else>\r\n <img src=\"<tmpl_var image.url>\" border=\"0\">\r\n <br /> <tmpl_var linkTitle>\r\n </tmpl_if>\r\n </td></tr></table>\r\n</tmpl_if>\r\n\r\n<tmpl_if description>\r\n <tmpl_var description><p/>\r\n</tmpl_if>\r\n\r\n\r\n<tmpl_var attachment.box>\r\n\r\n<tmpl_if image.url>\r\n </td></tr></table>\r\n</tmpl_if>\r\n\r\n<tmpl_if allowDiscussion>\r\n <p><table width=\"100%\" cellspacing=\"2\" cellpadding=\"1\" border=\"0\">\r\n <tr><td align=\"center\" width=\"50%\" class=\"tableMenu\"><a href=\"<tmpl_var replies.URL>\"><tmpl_var replies.label> (<tmpl_var replies.count>)</a></td>\r\n <td align=\"center\" width=\"50%\" class=\"tableMenu\"><a href=\"<tmpl_var post.url>\"><tmpl_var post.label></a></td></tr>\r\n </table>\r\n</tmpl_if>\r\n','Article');
|
||||
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -144,8 +144,8 @@ sub www_view {
|
|||
my ($file, %var);
|
||||
if ($_[0]->get("image") ne "") {
|
||||
$file = WebGUI::Attachment->new($_[0]->get("image"),$_[0]->get("wobjectId"));
|
||||
$var{image} = $file->getURL;
|
||||
$var{thumbnail} = $file->getThumbnail;
|
||||
$var{"image.url"} = $file->getURL;
|
||||
$var{"image.thumbnail"} = $file->getThumbnail;
|
||||
}
|
||||
$var{description} = $_[0]->description;
|
||||
if ($_[0]->get("convertCarriageReturns")) {
|
||||
|
|
@ -156,13 +156,14 @@ sub www_view {
|
|||
$var{"attachment.box"} = $file->box;
|
||||
$var{"attachment.icon"} = $file->getIcon;
|
||||
$var{"attachment.url"} = $file->getURL;
|
||||
$var{"attachment.name"} = $file->getFilename;
|
||||
}
|
||||
($var{"replies.count"}) = WebGUI::SQL->quickArray("select count(*) from discussion where wobjectId=".$_[0]->get("wobjectId"));
|
||||
$var{"replies.URL"} = WebGUI::URL::page('func=showMessage&wid='.$_[0]->get("wobjectId"));
|
||||
$var{"replies.label"} = WebGUI::International::get(28,$namespace);
|
||||
$var{"post.URL"} = WebGUI::URL::page('func=post&mid=new&wid='.$_[0]->get("wobjectId"));
|
||||
$var{"post.label"} = WebGUI::International::get(24,$namespace);
|
||||
return $_[0]->processMacros($_[0]->displayTitle.$_[0]->processTemplate($_[0]->get("templateId"),\%var));
|
||||
return $_[0]->processMacros($_[0]->processTemplate($_[0]->get("templateId"),\%var));
|
||||
}
|
||||
|
||||
1;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue