From 8fedd547618640bed7ac9b520b35089aa84eb878 Mon Sep 17 00:00:00 2001 From: Erik Amaru Ortiz Date: Mon, 27 Feb 2012 11:06:11 -0400 Subject: [PATCH] BUG 0000 User Experience (single app option added) 2nd commit - dynamic screen width detection to collapse or not the breadcrumb for single apps interface - fixed webkit compatibilities on css - fixed draft apps titles on list --- .../skinEngine/simplified/css/topbar.css | 5 +++ workflow/engine/skinEngine/uxs/css/style.css | 9 +++-- .../engine/templates/home/applications.html | 8 +++-- workflow/engine/templates/home/index.html | 35 +++++++++++++++---- .../engine/templates/home/indexSingle.html | 3 +- 5 files changed, 47 insertions(+), 13 deletions(-) diff --git a/workflow/engine/skinEngine/simplified/css/topbar.css b/workflow/engine/skinEngine/simplified/css/topbar.css index da0753b2e..008e66135 100644 --- a/workflow/engine/skinEngine/simplified/css/topbar.css +++ b/workflow/engine/skinEngine/simplified/css/topbar.css @@ -479,6 +479,11 @@ div.topbar ul li.account a.menu { div.topbar ul li a.menu:hover { background-color: rgba(255,255,255,.1); } + +div.topbar ul li a.active { + background-color: rgba(255,255,255,.1); +} + div.topbar ul li a.menu span.menu-label { } div.topbar ul li a.menu span.menu-label:after { diff --git a/workflow/engine/skinEngine/uxs/css/style.css b/workflow/engine/skinEngine/uxs/css/style.css index b4b81993a..ce449f256 100644 --- a/workflow/engine/skinEngine/uxs/css/style.css +++ b/workflow/engine/skinEngine/uxs/css/style.css @@ -715,13 +715,15 @@ form.formDefault .FormTitle,form.formDefault .FormSubTitle{ } form.formDefault .FormTitle { - -moz-border-bottom-colors: none; + -moz-border-bottom-colors: none; -moz-border-image: none; -moz-border-left-colors: none; -moz-border-right-colors: none; -moz-border-top-colors: none; + background: linear-gradient(#829AA8, #405A6A) repeat scroll 0 0 transparent; background: -moz-linear-gradient(#829AA8, #405A6A) repeat scroll 0 0 transparent; - background: -webkit-linear-gradient(#829AA8,#405A6A); + /*background: -webkit-linear-gradient(#829AA8,#405A6A);*/ + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#829aa8), to(#405a6a)); /* Webkit */ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#829aa8',endColorstr='#405a6a'); border-color: #677C89 #677C89 #6B808D; border-radius: 5px 5px 0 0; @@ -737,7 +739,8 @@ form.formDefault .FormTitle form.formDefault .FormSubTitle { background: -moz-linear-gradient(#FAFAFA, #E0E0E0) repeat scroll 0 0 transparent; - background: -webkit-linear-gradient(#FAFAFA,#E0E0E0); + /*background: -webkit-linear-gradient(#FAFAFA,#E0E0E0);*/ + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#FAFAFA), to(#E0E0E0)); /* Webkit */ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#FAFAFA',endColorstr='#E0E0E0'); border-top-left-radius: 1px; border-top-right-radius: 1px; diff --git a/workflow/engine/templates/home/applications.html b/workflow/engine/templates/home/applications.html index b91250456..2be3e212f 100644 --- a/workflow/engine/templates/home/applications.html +++ b/workflow/engine/templates/home/applications.html @@ -1,6 +1,5 @@ {foreach from=$cases key=id item=APP}
  • - #{$APP.APP_NUMBER} @@ -18,7 +17,12 @@ {$APP.APP_TITLE}

    -

    From {$APP.APP_DEL_PREVIOUS_USER}, send at {$APP.DEL_DELEGATE_DATE}

    +

    + {if $APP.APP_DEL_PREVIOUS_USER != ''} + From {$APP.APP_DEL_PREVIOUS_USER}, send at + {/if} + {$APP.DEL_DELEGATE_DATE} +

    {$APP.APP_PRO_TITLE}
    {$APP.APP_TAS_TITLE}

    diff --git a/workflow/engine/templates/home/index.html b/workflow/engine/templates/home/index.html index e16603b02..2c1040610 100644 --- a/workflow/engine/templates/home/index.html +++ b/workflow/engine/templates/home/index.html @@ -58,6 +58,20 @@ } }); } + + /*function setActive(o) + { + if (o.id == 'inboxOp') { + o.setAttribute('class', 'active'); + } + else { + o.setAttribute('class', ''); + } + }*/ + + //$("div.topbar ul li a"). + + {/literal} @@ -73,28 +87,28 @@