Merge branch 'master' of github.com:colosa/processmaker
This commit is contained in:
@@ -1997,11 +1997,13 @@ class AppSolr
|
|||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
$typeSufix = '_ti';
|
$typeSufix = '_ti';
|
||||||
|
$value = str_replace( ',', '', $value );
|
||||||
$value = intval ($value);
|
$value = intval ($value);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case 'Real' :
|
case 'Real' :
|
||||||
$typeSufix = '_td';
|
$typeSufix = '_td';
|
||||||
|
$value = str_replace( ',', '', $value );
|
||||||
$value = floatval ($value);
|
$value = floatval ($value);
|
||||||
break;
|
break;
|
||||||
case 'date' :
|
case 'date' :
|
||||||
|
|||||||
@@ -16,8 +16,10 @@
|
|||||||
{literal}
|
{literal}
|
||||||
body {
|
body {
|
||||||
padding-top : 40px !important;
|
padding-top : 40px !important;
|
||||||
overflow : hidden;
|
overflow : scroll;
|
||||||
}
|
}
|
||||||
|
::-webkit-scrollbar {width: 6px; height: 4px; background: transparent ; }
|
||||||
|
::-webkit-scrollbar-thumb { background-color: #808080 ; -webkit-border-radius: 1ex; }
|
||||||
</style>
|
</style>
|
||||||
{/literal}
|
{/literal}
|
||||||
{/if}
|
{/if}
|
||||||
@@ -113,14 +115,24 @@
|
|||||||
<a class="menu user-actions" href="javascript:;" title="{$mnuNewCase.label}" id="_new">
|
<a class="menu user-actions" href="javascript:;" title="{$mnuNewCase.label}" id="_new">
|
||||||
<img src="{$mnuNewCase.icon}" alt="" />
|
<img src="{$mnuNewCase.icon}" alt="" />
|
||||||
</a>
|
</a>
|
||||||
|
{if count($processList) <= 6}
|
||||||
<ul class="menu-dropdown" style="width: 360px">
|
<ul class="menu-dropdown" style="width: 210px; height: auto; overflow-y: auto;">
|
||||||
{foreach from=$processList key=id item=proc}
|
{foreach from=$processList key=id item=proc}
|
||||||
<li>
|
<li>
|
||||||
<a href="javascript:;" onclick="appStart('{$proc.uid}', '{$proc.value}')" accesskey="s" title="" id="settings_link">{$proc.value}</a>
|
<a href="javascript:;" onclick="appStart('{$proc.uid}', '{$proc.value}')" accesskey="s" title="" id="settings_link">{$proc.value}</a>
|
||||||
</li>
|
</li>
|
||||||
{/foreach}
|
{/foreach}
|
||||||
</ul>
|
</ul>
|
||||||
|
{/if}
|
||||||
|
{if count($processList) > 6}
|
||||||
|
<ul class="menu-dropdown" style="width: 210px; height: 600%; overflow-y: auto;">
|
||||||
|
{foreach from=$processList key=id item=proc}
|
||||||
|
<li>
|
||||||
|
<a href="javascript:;" onclick="appStart('{$proc.uid}', '{$proc.value}')" accesskey="s" title="" id="settings_link">{$proc.value}</a>
|
||||||
|
</li>
|
||||||
|
{/foreach}
|
||||||
|
</ul>
|
||||||
|
{/if}
|
||||||
</li>
|
</li>
|
||||||
{/if}
|
{/if}
|
||||||
</ul>
|
</ul>
|
||||||
|
|||||||
Reference in New Issue
Block a user