some bug fixes

docs/changelog/6.x.x.txt

@@ -1,4 +1,5 @@
 6.99.2
+ - Added UI Levels to asset toolbar icons, as discussed in Community IRC.
  - Data Forms now send email as HTML. 
  - Added full drag bar to the top of each asset as discussed in Community IRC.
  - fixed a bug in the project management app that was causing a no privilege error when trying to display the view.
@@ -24,7 +25,7 @@
    page.
  - Added a context menu to the last item in the crumb trail in the asset
    manager as discussed in Community IRC.
- - Login boxes are now Section 508 compliant.
+ - Login boxes are now Section 508 compliant as discussed in Community IRC.
 
 6.99.1
  - Bugfixes on dashboard to fix template errors.

docs/upgrades/templates-6.99.2/article_with_files.tmpl

@@ -0,0 +1,57 @@
+#PBtmpl0000000000000207
+#create
+#namespace:Article
+#url:article-with-files
+#title:Article with Files
+#menuTitle:Article with Files
+<a name="id<tmpl_var assetId>" id="id<tmpl_var assetId>"></a>
+
+<tmpl_if session.var.adminOn>
+	<p><tmpl_var controls></p>
+</tmpl_if>
+
+<tmpl_if displayTitle>
+	<h2><tmpl_var title></h2>
+</tmpl_if>
+
+<tmpl_if pagination.isFirstPage>
+</tmpl_if>
+
+<tmpl_if description>
+	<tmpl_var description>
+</tmpl_if>
+
+<tmpl_if pagination.isLastPage>
+	<tmpl_if linkUrl>
+	<tmpl_if linkTitle>
+		<p />
+		<a href="<tmpl_var linkUrl>"><tmpl_var linkTitle></a>
+	</tmpl_if>
+	</tmpl_if>
+	<tmpl_loop attachment_loop>
+		<p style="display:inline;vertical-align:middle;"><a href="<tmpl_var url>"><img src="<tmpl_var icon>" style="vertical-align:middle;border: 0px;" alt="<tmpl_var filename>" /> <tmpl_var filename></a></p><br />
+	</tmpl_loop>
+</tmpl_if>
+
+<tmpl_if pagination.pageCount.isMultiple>
+<tmpl_var pagination.previousPage>
+&#183;
+<tmpl_var pagination.pageList.upTo20>
+&#183;
+<tmpl_var pagination.nextPage>
+</tmpl_if>
+
+<tmpl_if pagination.isFirstPage>
+</tmpl_if>
+
+<tmpl_if pagination.isLastPage>
+<tmpl_if allowDiscussion>
+	<p>
+	<table width="100%" cellspacing="2" cellpadding="1" border="0">
+	<tr>
+	<td align="center" width="50%" class="tableMenu"><a href="<tmpl_var replies.URL>"><tmpl_var replies.label> (<tmpl_var replies.count>)</a></td>
+	<td align="center" width="50%" class="tableMenu"><a href="<tmpl_var post.url>"><tmpl_var post.label></a></td>
+	</tr>
+	</table>
+</tmpl_if>
+</tmpl_if>

docs/upgrades/upgrade_6.99.1-6.99.2.pl

@@ -22,12 +22,35 @@ my $session = start(); # this line required
 
 # upgrade functions go here
 updateTT();
+addToolbarUiLevels();
 
 finish($session); # this line required
 
 
+#-------------------------------------------------
+sub addToolbarUiLevels {
+   	print "\tAdding asset toolbar UI levels.\n" unless ($quiet);
+	$session->config->set("assetToolbarUiLevel", {
+        "edit" => 1,
+        "delete" => 1,
+        "cut" => 1,
+        "copy" => 1,
+        "shortcut" => 5,
+        "editBranch" => 9,
+        "lock" => 5,
+        "export" => 9,
+        "changeUrl" => 9,
+        "promote" => 3,
+        "demote" => 3,
+        "manage" => 5,
+        "revisions" => 5,
+        "view" => 1
+        });
+}
+
 #-------------------------------------------------
 sub updateTT {
+   print "\tUpdating the Time Tracking System.\n" unless ($quiet);
    my $tableList = [
             "create table TT_projectTasks (
                 taskId varchar(22) binary not null,
@@ -60,7 +83,6 @@ sub updateTT {
 			"alter table TT_timeEntry drop column lastUpdateDate"
           ];
 
-   print "\tUpdating the Time Tracking System.\n" unless ($quiet);
    foreach (@{$tableList}) {
       $session->db->write($_);
    }