fernando/luos
1
0
Fork 0
Code Releases Activity

Merge remote branch 'upstream/master'

Browse Source
This commit is contained in:
Ralph Asendeteufrer
2012-10-02 12:45:52 -04:00
parent d6f1539a7b 242de817bf
commit 19a75a730c
8 changed files with 47 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
workflow/engine/classes/model/Content.php
View File

@@ -276,7 +276,7 @@ class Content extends BaseContent {
*
* @param array $langs
*/
function regenerateContent($langId)
function regenerateContent($langs)
{
//Search the language
$key = array_search('en',$langs);

6
workflow/engine/skinEngine/uxmodern/css/xtheme-gray.css
View File

@@ -1478,15 +1478,15 @@ body.x-body-masked .x-window-plain .x-window-mc {
body.x-pm-login-body{
width: 100%;
}
body.x-pm-login-body div.x-window{
body.x-pm-login-body div.x-window-login{
/*!important needed to change position, not appearance. Not allows JavaScrpit change Position.*/
left: 50% !important;
left: 50% !important;
margin-left: -185px !important; /*Left Location for Login Box. Must be a half from the width of login Box.*/
margin-top: -120px !important; /*Top Location for Login Box. Must be a half from height of login Box.*/
overflow: auto !important;
position: absolute !important;
top: 50% !important;
}
}
body.x-pm-login-body div.x-ie-shadow, body.x-pm-login-body div.x-shadow{
/*Disappears the shadow Login Box.*/
display: none !important;

4
workflow/engine/skinEngine/uxmodern/layout.html
View File

@@ -19,7 +19,7 @@
{if $user_logged neq ''}
{$msgVer}<label class="textBlue">{$userfullname} <a href="../users/myInfo">{$user}</a> | </label>
{if $switch_interface}
<label class="textBlue"><a href="../../uxs/home">{$switch_interface_label}</a> | </label>
<label class="textBlue"><a href="../../uxs/home">{$switch_interface_label}</a> | </label>
{/if}
<a href="{$linklogout}" class="tableOption">{$logout}</a>&nbsp;&nbsp;<br/>
<label class="textBlack"><b>{$rolename}</b> {$workspace_label} <b><u>{$workspace}</u></b> &nbsp; &nbsp; <br/>
@@ -65,7 +65,6 @@
</table>
</td>
</tr>
{if $footer neq ''}
<tr height="100%">
<td height="100%">
<div class="Footer">
@@ -73,7 +72,6 @@
</div>
</td>
</tr>
{/if}
</table>
</body>
</html>

43
workflow/engine/templates/main/login.js
View File

@@ -1,7 +1,7 @@
/*
* ProcessMaker Login
* Created on date Jul 15, 2011
*
*
* @author Erik Amaru Ortiz <erik@colosa.com>
*/
@@ -40,7 +40,7 @@ var Login = function() {
enableVirtualKeyboard : false,
enableForgotPassword : false,
fieldsWidth : 200,
/** Init method */
init : function() {
new Ext.KeyMap(document, {
@@ -49,18 +49,18 @@ var Login = function() {
Login.submit();
}
});
Ext.QuickTips.init();
Ext.form.Field.prototype.msgTarget = 'side';
this.enableVirtualKeyboard = virtualKeyboad;
this.enableForgotPassword = forgotPasswd;
this.initComponents();
this.window.show();
Ext.getCmp('userTxt').focus(true, 1000);
if (typeof errMsg != 'undefined') {
Ext.msgBoxSlider.msgTopCenter('alert', 'ERROR', errMsg, 10);
}
@@ -87,27 +87,27 @@ Login.initComponents = function()
fieldLabel: _('ID_USER'),
allowBlank: false
}
var usernameTxt = {
id : 'usernameTxt',
name : 'username',
fieldLabel: _('ID_USER'),
allowBlank: false
}
var emailTxt = {
id : 'emailTxt',
name : 'email',
fieldLabel: _('ID_EMAIL'),
allowBlank: false
}
var passwordTxt = {
fieldLabel: _('ID_PASSWORD'),
name : 'form[USR_PASSWORD]',
inputType : 'password',
allowBlank: false,
validationEvent : this.enableVirtualKeyboard == true ? 'blur' : 'keyup',
enableKeyEvents : true,
width: this.fieldsWidth, //this.enableVirtualKeyboard == true ? 183 : this.fieldsWidth,
@@ -116,7 +116,7 @@ Login.initComponents = function()
languageSelection: true
},
plugins: this.enableVirtualKeyboard == true ? new Ext.ux.plugins.VirtualKeyboard() : null,
listeners: {
render: function() {
this.capsWarningTooltip = new Ext.ToolTip({
@@ -132,7 +132,7 @@ Login.initComponents = function()
this.disable();
});
},
keypress: {
fn: function(field, e) {
if(this.forceVirtualKeyboard) {
@@ -161,7 +161,7 @@ Login.initComponents = function()
}
}
}
/*,
listeners : {
specialkey: function(f,e){
@@ -171,7 +171,7 @@ Login.initComponents = function()
}
}*/
}
var forgotPasswordLink = {
xtype: 'box',
autoEl: {
@@ -251,7 +251,7 @@ Login.initComponents = function()
this.form = new Ext.FormPanel(formConfig);
this.forgotPasswordForm = new Ext.FormPanel({
id : 'fp-form',
labelWidth: 80,
@@ -282,7 +282,7 @@ Login.initComponents = function()
handler: Login.restore
}]
});
this.forgotPasswordForm = new Ext.FormPanel({
id : 'fp-form',
labelWidth: 80,
@@ -315,6 +315,7 @@ Login.initComponents = function()
});
this.window = new Ext.Window({
cls: 'x-window-login',
layout: 'fit',
title: _('LOGIN'),
width: 380,
@@ -332,7 +333,7 @@ Login.initComponents = function()
items: []
})
});
this.fpWindow = new Ext.Window({
layout: 'fit',
title: _('ID_FORGOT_PASSWORD'),
@@ -405,7 +406,7 @@ Login.restore = function()
Login.sendFpRequest = function()
{
Ext.getCmp('login-statusbar2').showBusy();
if (!Login.forgotPasswordForm.getForm().isValid()) {
Ext.getCmp('login-statusbar2').setStatus({
text: _('ID_VALIDATION_ERRORS'),
@@ -414,7 +415,7 @@ Login.sendFpRequest = function()
});
return;
}
Login.forgotPasswordForm.getForm().submit({
method: 'POST',
waitTitle: '',
@@ -449,7 +450,7 @@ Login.sendFpRequest = function()
//Login.form.getForm().reset();
}
});
}
@@ -469,7 +470,7 @@ Login.submit = function()
Ext.getCmp('login-statusbar').showBusy();
if (!Login.form.getForm().isValid()) {
Ext.getCmp('login-statusbar').setStatus({
text: _('ID_VALIDATION_ERRORS'),

2
workflow/engine/templates/pmTables/edit.js
View File

@@ -160,7 +160,6 @@ Ext.onReady(function(){
editor: {
xtype: 'textfield',
allowBlank: true,
style:'text-transform: uppercase',
listeners:{
change: function(f,e){
this.setValue(this.getValue().toUpperCase());
@@ -546,7 +545,6 @@ Ext.onReady(function(){
emptyText: _("ID_SET_A_TABLE_NAME"),
width: 250,
stripCharsRe: /(\W+)/g,
style:'text-transform: uppercase',
listeners:{
change: function(){
this.setValue(this.getValue().toUpperCase())

7
workflow/engine/templates/pmTables/editReport.js
View File

@@ -277,13 +277,7 @@ Ext.onReady(function(){
editor: {
xtype: 'textfield',
allowBlank: true,
style:'text-transform: uppercase',
listeners:{
/*specialkey: function(f,e){
if(e.getKey()==e.ENTER){
this.setValue(this.getValue().toUpperCase());
}
}*/
change: function(f,e){
this.setValue(this.getValue().toUpperCase());
}
@@ -797,7 +791,6 @@ Ext.onReady(function(){
emptyText: _("ID_SET_A_TABLE_NAME"),
width: 250,
stripCharsRe: /(\W+)/g,
style:'text-transform: uppercase',
listeners:{
change: function(){
this.setValue(this.getValue().toUpperCase());

8
workflow/engine/xmlform/dynaforms/dynaforms_HtmlEditor.html
View File

@@ -6,16 +6,16 @@
<tr>
<td valign='top'>
<table cellspacing="0" cellpadding="0" border="0" width="100%">
<tr>
<td class='FormLabel' width="{$form_labelWidth}">{$HTML}</td>
<td class='FormFieldContent' >{$form.HTML}</td>
</tr>
<tr>
<td class='FormLabel' width="{$form_labelWidth}"></td>
<td class='FormButton'>
<span style="float:left;">{$form.PME_HTML_ENABLETEMPLATE}{$PME_HTML_ENABLETEMPLATE}</span><span style="float:right;">{$form.PME_REFRESH_VIEW}</span><span style="float:right;">{$form.PME_RESTORE_HTML}</span>
</td>
</tr>
<tr>
<td class='FormLabel' width="{$form_labelWidth}">{$HTML}</td>
<td class='FormFieldContent' >{$form.HTML}</td>
</tr>
<tr>
<td class='FormLabel' width="{$form_labelWidth}">{$HTML2}</td>
<td class='FormFieldContent' >{$form.HTML2}</td>

21
workflow/engine/xmlform/dynaforms/dynaforms_HtmlEditor.xml
View File

@@ -5,10 +5,6 @@
<URL type="phpvariable"/>
<HTML type="html" width="100%" height="350px" toolbarSet="toolbar2lines">
<en>HTML View</en>
</HTML>
<PME_HTML_ENABLETEMPLATE type="checkbox" value="1" defaultvalue="0" labelOnRight="0">
<en>Enable HTML Editing</en>
</PME_HTML_ENABLETEMPLATE>
@@ -21,6 +17,10 @@
<en>Refresh View</en>
</PME_REFRESH_VIEW>
<HTML type="html" width="100%" height="300px" toolbarSet="toolbar2lines">
<en>HTML View</en>
</HTML>
<HTML2 type="textarea" cols="120" rows="16" style="width:100%;" className="htmleditor">
<en>HTML Code</en>
</HTML2>
@@ -73,7 +73,18 @@ getField("PME_HTML_ENABLETEMPLATE","dynaforms_HtmlEditor").onclick=function()
{
/*getField("ENABLETEMPLATE","dynaforms_Properties").checked=this.checked;
dynaformEditor.saveProperties();*/
dynaformEditor.setEnableTemplate( this.checked );
if (getField("PME_HTML_ENABLETEMPLATE","dynaforms_HtmlEditor").checked == true) {
new leimnud.module.app.confirm().make(
{
label: "@G::LoadTranslation(ID_MSG_ENABLE_HTML_EDITING)",
size:{ w: 350, h: 150 },
action: function() { },
cancel: function() {
getField("PME_HTML_ENABLETEMPLATE","dynaforms_HtmlEditor").checked = false;
}
});
dynaformEditor.setEnableTemplate( this.checked );
}
}
]]></PME_RESIZE_JS>