diff --git a/config/alfresco/templates/client/task_resource_panel.ftl b/config/alfresco/templates/client/task_resource_panel.ftl index 5a0baf4857..9938c9cef9 100644 --- a/config/alfresco/templates/client/task_resource_panel.ftl +++ b/config/alfresco/templates/client/task_resource_panel.ftl @@ -1,27 +1,14 @@ + <#list task.packageResources as res> - - - - - - - - - - - - - - - - - - - - - - - + + +
ICONDocument NAMESomething
ICONDocument NAMESomething
ICONDocument NAMESomething
ICONDocument NAMESomething
ICONDocument NAMESomething + <#if res.isDocument> + ${res.name} + <#else> + ${res.name} + +
\ No newline at end of file diff --git a/config/alfresco/templates/webscripts/org/alfresco/portlets/mytasks_get_html.ftl b/config/alfresco/templates/webscripts/org/alfresco/portlets/mytasks_get_html.ftl index 1f3ed908de..41d3a3e2c5 100644 --- a/config/alfresco/templates/webscripts/org/alfresco/portlets/mytasks_get_html.ftl +++ b/config/alfresco/templates/webscripts/org/alfresco/portlets/mytasks_get_html.ftl @@ -80,7 +80,7 @@
- +
@@ -92,7 +92,11 @@
Status:${t.properties["bpm:status"]}
Priority:${t.properties["bpm:priority"]}
Start Date:${t.startDate?date}
- + + <#list t.transitions as wt> + + +
ApproveReject
${wt.label}
@@ -233,7 +237,7 @@ a.filterLinkSelected:link, a.filterLinkSelected:visited border-top: 1px solid #0092DD; border-bottom: 1px solid #CCD4DB; border-right: 1px solid #CCD4DB; - background-color: #F8FCFD; + background-color: #FEF8BC; margin: 4px 0px 0px 16px; width: 400px; height: 80px; @@ -249,18 +253,45 @@ a.filterLinkSelected:link, a.filterLinkSelected:visited display: inline; } -.taskResources td +a.resourceLink:link, a.resourceLink:visited +{ + color: #5A5741; + font-family: Trebuchet MS, Arial, Helvetica, sans-serif; +} + +.resourceLink { color: #5A5741; font-family: Trebuchet MS, Arial, Helvetica, sans-serif; } .taskActions td +{ + padding: 4px; +} + +a.taskAction:link, a.taskAction:visited { color: #5A5741; - font-size: 14px; + font-size: 13px; font-weight: bold; font-family: Trebuchet MS, Arial, Helvetica, sans-serif; + border: 1px solid #F6F1BA; + padding-left: 4px; + padding-right: 4px; +} + +a.taskAction:hover +{ + font-size: 13px; + font-weight: bold; + font-family: Trebuchet MS, Arial, Helvetica, sans-serif; + border: 1px solid #F6F1BA; + padding-left: 4px; + padding-right: 4px; + color: #FFFFFF; + background-color: #FDB64F; + text-decoration: none; } .taskMetadata diff --git a/config/alfresco/templates/webscripts/org/alfresco/portlets/mywebforms_get_html.ftl b/config/alfresco/templates/webscripts/org/alfresco/portlets/mywebforms_get_html.ftl index 76bc9d9734..fab08f3659 100644 --- a/config/alfresco/templates/webscripts/org/alfresco/portlets/mywebforms_get_html.ftl +++ b/config/alfresco/templates/webscripts/org/alfresco/portlets/mywebforms_get_html.ftl @@ -16,6 +16,7 @@ <#list wp.childAssocs["wca:webuser"] as user> <#if user.properties["wca:username"] = person.properties.userName> <#assign projectcount=projectcount+1> + <#-- construct the sandbox name based on the webproject and current username --> <#assign sandbox=wp.properties["wca:avmstore"] + "--" + person.properties.userName>
diff --git a/source/web/images/filetypes/gif.png b/source/web/images/filetypes/gif.png new file mode 100644 index 0000000000..2d61f9a202 Binary files /dev/null and b/source/web/images/filetypes/gif.png differ diff --git a/source/web/images/filetypes/html.png b/source/web/images/filetypes/html.png new file mode 100644 index 0000000000..c18c3c792a Binary files /dev/null and b/source/web/images/filetypes/html.png differ diff --git a/source/web/images/filetypes64/gif.png b/source/web/images/filetypes64/gif.png new file mode 100644 index 0000000000..ecdcfc81b6 Binary files /dev/null and b/source/web/images/filetypes64/gif.png differ diff --git a/source/web/images/filetypes64/html.png b/source/web/images/filetypes64/html.png new file mode 100644 index 0000000000..a583a5a58e Binary files /dev/null and b/source/web/images/filetypes64/html.png differ diff --git a/source/web/scripts/ajax/doclist.js b/source/web/scripts/ajax/doclist.js index a0df8f8db6..12305c8aa6 100644 --- a/source/web/scripts/ajax/doclist.js +++ b/source/web/scripts/ajax/doclist.js @@ -83,7 +83,7 @@ var MyDocs = { detail.setStyle('height', detail.defHeight); info.setStyle('opacity', 0); img.defSrc = img.src; - img.bigSrc = img.src.replace(/filetypes\//, 'filetypes64/').replace(/.gif/, '.png'); + img.bigSrc = img.src.replace(/filetypes\//, 'filetypes64/').replace(/.gif$/, '.png'); resource.defHeight = 1; resource.setStyle('height', resource.defHeight); diff --git a/source/web/scripts/ajax/mytasks.js b/source/web/scripts/ajax/mytasks.js index fae68eec9b..64b1c7690b 100644 --- a/source/web/scripts/ajax/mytasks.js +++ b/source/web/scripts/ajax/mytasks.js @@ -157,7 +157,7 @@ var MyTasks = { // slide and fade in the details panel animDetail[i] = { - 'height': [detailHeight, detail.defHeight + 140], + 'height': [detailHeight, detail.defHeight + 132], 'opacity': [detail.getStyle('opacity'), 1]}; // close other open tasks and toggle this one if it's already open