Merge pull request #1739 from luisfernandosl/FIX_SIMPLIFIED_UI

FIX_SIMPLIFIED_UI "Traducciones faltantes." SOLVED
This commit is contained in:
julceslauhub
2013-05-20 07:31:36 -07:00
13 changed files with 114 additions and 123 deletions

View File

@@ -2,7 +2,7 @@
<?php
$scriptDir = dirname(__FILE__).'/';
define("PROCESSMAKER_PATH", $scriptDir);
define("WORKFLOW_PATH", $scriptDir . 'workflow/');
define("WORKFLOW_BIN_PATH", $scriptDir . 'workflow/engine/bin/');

View File

@@ -102,11 +102,11 @@ class AppNotes extends BaseAppNotes
//return array ( 'codError' => -100, 'rowsAffected' => 0, 'message' => $msg );
}
if ($msg != "") {
$response['success'] = 'failure';
$response['success'] = G::LoadTranslation("ID_FAILURE");
$response['message'] = $msg;
} else {
$response['success'] = 'success';
$response['message'] = 'Saved...';
$response['success'] = G::LoadTranslation("ID_SUCCESS");
$response['message'] = G::LoadTranslation("ID_SAVED2");
}
if ($notify) {
@@ -140,10 +140,10 @@ class AppNotes extends BaseAppNotes
$oCriteria->add( ConfigurationPeer::USR_UID, '' );
$oCriteria->add( ConfigurationPeer::APP_UID, '' );
if (ConfigurationPeer::doCount( $oCriteria ) == 0) {
$oConfiguration->create( array ('CFG_UID' => 'Emails','OBJ_UID' => '','CFG_VALUE' => '','PRO_UID' => '','USR_UID' => '','APP_UID' => '') );
$oConfiguration->create( array ('CFG_UID' => 'Emails', 'OBJ_UID' => '','CFG_VALUE' => '','PRO_UID' => '','USR_UID' => '','APP_UID' => '') );
$aConfiguration = array ();
} else {
$aConfiguration = $oConfiguration->load( 'Emails', '', '', '', '' );
$aConfiguration = $oConfiguration->load('Emails', '', '', '', '' );
if ($aConfiguration['CFG_VALUE'] != '') {
$aConfiguration = unserialize( $aConfiguration['CFG_VALUE'] );
$passwd = $aConfiguration['MESS_PASSWORD'];

View File

@@ -52,7 +52,7 @@ class Users extends BaseUsers
if ($this->validate()) {
$result = $this->save();
} else {
$e = new Exception( "Failed Validation in class " . get_class( $this ) . "." );
$e = new Exception(G::LoadTranslation("ID_FAILED_VALIDATION_IN_CLASS1", SYS_LANG, array("CLASS" => get_class($this))));
$e->aValidationFailures = $this->getValidationFailures();
throw ($e);
}
@@ -88,7 +88,7 @@ class Users extends BaseUsers
$this->setNew( false );
return $aFields;
} else {
throw (new Exception( "The row '" . $UsrUid . "' in table USER doesn't exist!" ));
throw (new Exception(G::LoadTranslation("ID_USER_UID_DOESNT_EXIST", SYS_LANG, array("USR_UID" => $UsrUid))));
}
} catch (PropelException $e) {
//capture invalid birthday date and replace by null
@@ -115,8 +115,8 @@ class Users extends BaseUsers
$result['USR_EMAIL'] = $oUser->getUsrEmail();
return $result;
} else {
// return $result;
throw (new Exception( "The row '" . $UsrUid . "' in table USER doesn't exist!" ));
// return $result;
throw (new Exception(G::LoadTranslation("ID_USER_UID_DOESNT_EXIST", SYS_LANG, array("USR_UID" => $UsrUid))));
}
} catch (Exception $oError) {
throw ($oError);
@@ -141,7 +141,7 @@ class Users extends BaseUsers
$aFields["USR_COUNTRY_NAME"] = (!empty($aIsoCountry["IC_NAME"]))? $aIsoCountry["IC_NAME"] : "";
$aFields["USR_CITY_NAME"] = (!empty($aIsoSubdivision["IS_NAME"]))? $aIsoSubdivision["IS_NAME"] : "";
$aFields["USR_LOCATION_NAME"] = (!empty($aIsoLocation["IL_NAME"]))? $aIsoLocation["IL_NAME"] : "";
require_once PATH_RBAC . "model/Roles.php";
$roles = new Roles();
$role = $roles->loadByCode($aFields['USR_ROLE']);
@@ -152,7 +152,7 @@ class Users extends BaseUsers
return $result;
} else {
//return $result;
throw (new Exception( "The row '" . $UsrUid . "' in table USER doesn't exist!" ));
throw (new Exception(G::LoadTranslation("ID_USER_UID_DOESNT_EXIST", SYS_LANG, array("USR_UID" => $UsrUid))));
}
} catch (Exception $oError) {
throw ($oError);
@@ -172,7 +172,7 @@ class Users extends BaseUsers
return $result;
} else {
$con->rollback();
throw (new Exception( "Failed Validation in class " . get_class( $this ) . "." ));
throw (new Exception(G::LoadTranslation("ID_FAILED_VALIDATION_IN_CLASS1", SYS_LANG, array("CLASS" => get_class($this)))));
}
} catch (Exception $e) {
$con->rollback();

View File

@@ -100,7 +100,7 @@ class AppProxy extends HttpProxyController
}
if (! isset( $appUid )) {
throw new Exception( 'Can\'t resolve the Apllication ID for this request.' );
throw new Exception(G::LoadTranslation("ID_CANT_RESOLVE_APPLICATION"));
}
$usrUid = (isset( $_SESSION['USER_LOGGED'] )) ? $_SESSION['USER_LOGGED'] : "";

View File

@@ -190,13 +190,13 @@ class Home extends Controller
// setting main list title
switch ($httpData->t) {
case 'todo':
$title = 'My Inbox';
$title = G::LoadTranslation("ID_MY_INBOX");
break;
case 'draft':
$title = 'My Drafts';
$title = G::LoadTranslation("ID_MY_DRAFTS");
break;
case 'unassigned':
$title = 'Unassigned Inbox';
$title = G::LoadTranslation("ID_UNASSIGNED_INBOX");
break;
default:
$title = ucwords( $httpData->t );
@@ -548,10 +548,10 @@ class Home extends Controller
switch ($action) {
case "simple_search":
case "search":
//In search action, the query to obtain all process is too slow, so we need to query directly to
//In search action, the query to obtain all process is too slow, so we need to query directly to
//process and content tables, and for that reason we need the current language in AppCacheView.
G::loadClass("configuration");
$oConf = new Configurations;
$oConf = new Configurations;
$oConf->loadConfig($x, "APP_CACHE_VIEW_ENGINE", "", "", "", "");
$appCacheViewEngine = $oConf->aConfig;
$lang = isset($appCacheViewEngine["LANG"])? $appCacheViewEngine["LANG"] : "en";

View File

@@ -2,8 +2,8 @@
<html lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=2.0, user-scalable=yes" />
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=2.0, user-scalable=yes" />
<link rel="stylesheet" href="/css/simplified.css" media="screen" rel="stylesheet" type="text/css" />
<link rel="stylesheet" href="/js/jquery/css/smoothness/jquery-ui-1.8.17.custom.css" type="text/css">
<!--<link rel="stylesheet" href="/js/jquery/css/redmond/jquery-ui-1.7.2.custom.css" type="text/css">-->
@@ -81,10 +81,10 @@
height:192,
modal: true,
buttons: {
"Add Note": function() {
{/literal}"{translate label="ID_ADD_NOTE"}"{literal}: function() {
var sendMail = document.getElementById('chkSendMail').checked;
sendMail = (sendMail == true) ? '1' : '0';
$(this).dialog("close");
$(this).dialog("close");
$.post(
'../appProxy/postNote',
{appUid : appUid,
@@ -96,19 +96,15 @@
);
//redirect('home/startCase?id='+id);
},
Cancel: function() {
{/literal}"{translate label="ID_CANCEL"}"{literal}: function() {
$(this).dialog( "close" );
}
}
});
}
//updateNt(appUid);
}
);
}
function updateNt(appUid)
@@ -120,19 +116,19 @@
data = jQuery.parseJSON(resp);
content = $('div#m_'+appUid);
content.html('');
for (i=0; i<data.notes.length; i++) {
r = data.notes[i];
s = '<div class="appMessage"><table border="0"><tr>' +
'<td width="50" valign="top">'+
'<img border="0" src="../users/users_ViewPhotoGrid?pUID='+r.USR_UID+'" width="40" height="40"/>' +
'</td><td>' +
'<h3>'+r.USR_FIRSTNAME+' '+r.USR_LASTNAME+' ('+r.USR_USERNAME+')</h3>' +
'<p><pre>'+r.NOTE_CONTENT+'</pre>' +
'<div class="appMessageDate">Posted at '+r.NOTE_DATE+'</div>' +
'<div class="appMessageDate">{translate label="ID_POSTED_AT"} '+r.NOTE_DATE+'</div>' +
'</td></tr></table></div>';
content.append(s);
$('#n_'+appUid).show('slow');
}
@@ -153,10 +149,10 @@
if(jQuery.trim(html) != ''){
$("#commentlist").append(html);
$('#loadmorebutton').html('Load More');
$('#loadmorebutton').html( {/literal}"{translate label="ID_LOAD_MORE"}"{literal} );
}
else {
$('#loadmorebutton').replaceWith('<center>No more applications to show.</center>');
$('#loadmorebutton').replaceWith(<center>{/literal}"{translate label="ID_NO_MORE_APPLICATIONS"}"{literal}</center>);
}
}
});
@@ -171,10 +167,10 @@
var listType = '{$listType}';
var noPerms = '{$noPerms}';
</script>
</head>
<body onload="resize()" onresize="resize()" >
<body onload="resize()" onresize="resize()" >
<center>
<div class="content-header" style="text-align:left">
<h1 style="padding: 10px">{$title} ({$cases_count})</h1>
@@ -184,19 +180,19 @@
{if $cases_count > $appListLimit}
<center>
<a href="#" style="color:#1F98C7; font-size:12px; font-weight:bold;" id="loadmorebutton">Load More</a>
<a href="#" style="color:#1F98C7; font-size:12px; font-weight:bold;" id="loadmorebutton">{translate label="ID_LOAD_MORE"}</a>
</center>
{/if}
</div>
</center>
<div id="dialog-add-note" title="Case Note" style="display:none">
<div id="dialog-add-note" title="{translate label="ID_CASE_NOTE"}" style="display:none">
<p><!-- <span class="ui-icon ui-icon-document" style="float:left; margin:0 7px 20px 0;"></span> -->
<span id="startAppTitle"/>
<textarea id="note_text" rows="2" cols="22"></textarea>
<div class="x-form-check-wrap" id="ext-gen160" style="font-size:11px">
<input type="checkbox" name="chkSendMail" id="chkSendMail" autocomplete="off" class=" x-form-checkbox x-form-field" checked="">
<label class="x-form-cb-label" for="chkSendMail" id="ext-gen161">Send email (Case Participants)</label>
<label class="x-form-cb-label" for="chkSendMail" id="ext-gen161">{translate label="ID_SEND_EMAIL_CASE_PARTICIPANTS"}</label>
</div>
</p>
</div>

View File

@@ -2,8 +2,8 @@
<html lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=2.0, user-scalable=yes" />
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=2.0, user-scalable=yes" />
<link rel="stylesheet" href="/css/simplified.css" media="screen" rel="stylesheet" type="text/css" />
<link rel="stylesheet" href="/js/jquery/css/smoothness/jquery-ui-1.8.17.custom.css" type="text/css">
<!--<link rel="stylesheet" href="/js/jquery/css/redmond/jquery-ui-1.7.2.custom.css" type="text/css">-->
@@ -50,7 +50,7 @@
background: -ms-linear-gradient(top, #ffffff 0%,#f6f6f6 47%,#dbdbdb 100%); /* IE10+ */
background: linear-gradient(to bottom, #ffffff 0%,#f6f6f6 47%,#dbdbdb 100%); /* W3C */
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ffffff', endColorstr='#dbdbdb',GradientType=0 ); /* IE6-9 */
border: 1px solid #FFFFFF;
color: #565656;
text-decoration: none;
@@ -94,7 +94,7 @@
$("#searchText").val(null);
redirect();
}
function redirect()
{
var src = $("#iframex", window.parent.document).attr('src');
@@ -150,10 +150,10 @@
height:192,
modal: true,
buttons: {
"Add Note": function() {
{/literal}"{translate label="ID_ADD_NOTE"}"{literal}: function() {
var sendMail = document.getElementById('chkSendMail').checked;
sendMail = (sendMail == true) ? '1' : '0';
$(this).dialog("close");
$(this).dialog( "close" );
$.post(
'../appProxy/postNote',
{appUid : appUid,
@@ -165,8 +165,8 @@
);
//redirect('home/startCase?id='+id);
},
Cancel: function() {
$(this).dialog( "close" );
{/literal}"{translate label="ID_CANCEL"}"{literal}: function() {
$(this).dialog("close");
}
}
});
@@ -219,7 +219,7 @@
'</td><td>' +
'<h3>'+r.USR_FIRSTNAME+' '+r.USR_LASTNAME+' ('+r.USR_USERNAME+')</h3>' +
'<p><pre>'+r.NOTE_CONTENT+'</pre>' +
'<div class="appMessageDate">Posted at '+r.NOTE_DATE+'</div>' +
'<div class="appMessageDate">{translate label="ID_POSTED_AT"} '+r.NOTE_DATE+'</div>' +
'</td></tr></table></div>';
content.append(s);
@@ -239,13 +239,13 @@
url: "getApps?t="+listType+"&start="+appListStart+"&limit="+appListLimit,
success: function(html){
appListStart += appListLimit;
if(jQuery.trim(html) != ''){
$("#commentlist").append(html);
$('#loadmorebutton').html('Load More');
$('#loadmorebutton').html( {/literal}"{translate label="ID_LOAD_MORE"}"{literal} );
}
else {
$('#loadmorebutton').replaceWith('<center>No more applications to show.</center>');
$('#loadmorebutton').replaceWith(<center>{/literal}"{translate label="ID_NO_MORE_APPLICATIONS"}"{literal}</center>);
}
}
});
@@ -313,8 +313,8 @@
<div style = "float: right;"><b>{$searchTitle}:</b>
<input type="text" size="27" maxlength="60" value="" id='searchText' placeholder="{$searchTitle}...">
</div>
</div>
<div id='panelDown' style = "display: none; width: 95%;">
@@ -354,19 +354,19 @@
{if $cases_count > $appListLimit}
<center>
<a href="#" style="color:#1F98C7; font-size:12px; font-weight:bold;" id="loadmorebutton">Load More</a>
<a href="#" style="color:#1F98C7; font-size:12px; font-weight:bold;" id="loadmorebutton">{translate label="ID_LOAD_MORE"}</a>
</center>
{/if}
</div>
</center>
<div id="dialog-add-note" title="Case Note" style="display:none">
<div id="dialog-add-note" title="{translate label="ID_CASE_NOTE"}" style="display:none">
<p><!-- <span class="ui-icon ui-icon-document" style="float:left; margin:0 7px 20px 0;"></span> -->
<span id="startAppTitle"/>
<textarea id="note_text" rows="2" cols="22"></textarea>
<div class="x-form-check-wrap" id="ext-gen160" style="font-size:11px">
<input type="checkbox" name="chkSendMail" id="chkSendMail" autocomplete="off" class=" x-form-checkbox x-form-field" checked="">
<label class="x-form-cb-label" for="chkSendMail" id="ext-gen161">Send email (Case Participants)</label>
<label class="x-form-cb-label" for="chkSendMail" id="ext-gen161">{translate label="ID_SEND_EMAIL_CASE_PARTICIPANTS"}</label>
</div>
</p>
</div>

View File

@@ -3,15 +3,15 @@
<span class="commentnumber">
#{$APP.APP_NUMBER}
</span>
<span id="n_{$APP.APP_UID}" class="notes-link" style="display:{if $APP.NOTES_COUNT neq 0}block{else}none{/if}">
<a href="#" onclick="showNt('{$APP.APP_UID}'); return false;"><img src="/images/simplified/messages-grey.png" height="20" width="20" border="0"></a>
</span>
<span class="notes-plus-link">
<a href="#" onclick="addNt('{$APP.APP_UID}', '{$APP.PRO_UID}', '{$APP.TAS_UID}'); return false;"><img src="/images/simplified/messages-grey-plus.png" height="21" width="21" border="0"></a>
</span>
<p>
<cite>
<a href="../cases/cases_Open?APP_UID={$APP.APP_UID}&DEL_INDEX={$APP.DEL_INDEX}&action=todo">{$APP.APP_TITLE}</a>
@@ -25,7 +25,7 @@
</p>
<p>{$APP.APP_PRO_TITLE}
<br/>{$APP.APP_TAS_TITLE}</p>
<div id="m_{$APP.APP_UID}" class="appMessages">
{if $APP.NOTES_COUNT neq 0}
{foreach from=$APP.NOTES_LIST key=k item=NOTE}
@@ -38,7 +38,7 @@
<td>
<h3>{$NOTE.USR_FIRSTNAME} {$NOTE.USR_LASTNAME} ({$NOTE.USR_USERNAME})</h3>
<p><pre>{$NOTE.NOTE_CONTENT}</pre>
<div class="appMessageDate">Posted at {$NOTE.NOTE_DATE}</div>
<div class="appMessageDate">{translate label="ID_POSTED_AT"} {$NOTE.NOTE_DATE}</div>
</td>
</tr>
</table>

View File

@@ -1,7 +1,7 @@
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=2.0, user-scalable=yes" />
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=2.0, user-scalable=yes" />
<link rel="shortcut icon" href="/images/favicon.ico" type="image/x-icon"/>
<!--<link rel="stylesheet" href="/js/jquery/css/redmond/jquery-ui-1.7.2.custom.css" type="text/css">-->
@@ -10,7 +10,7 @@
<script type="text/javascript" src="/js/jquery/jquery-1.7.1.min.js"></script>
<script type="text/javascript" src="/js/jquery/jquery-ui-1.8.17.min.js"></script>
{if $clientBrowser neq 'msie'}
<style>
{literal}
@@ -31,11 +31,11 @@
var h = $(window).height() - 42;
$('iframe').height(h)
}
function redirect(url)
{
var $iframe = $('#iframex');
$iframe.attr('src', url);
$iframe.attr('src', url);
return false;
}
@@ -48,37 +48,38 @@
height:160,
modal: true,
buttons: {
"Start Case": function() {
{/literal}"{translate label="ID_CASE_START"}"{literal}: function() {
$( this ).dialog( "close" );
redirect('home/startCase?id='+id);
},
Cancel: function() {
{/literal}"{translate label="ID_CANCEL"}"{literal}: function() {
$( this ).dialog( "close" );
}
}
});
}
/*function setActive(o)
/*function setActive(o)
{
if (o.id == 'inboxOp') {
o.setAttribute('class', 'active');
}
else {
o.setAttribute('class', '');
o.setAttribute('class', '');
}
}*/
//$("div.topbar ul li a").
</script>
{/literal}
</head>
<body onload="resize()" onresize="resize()" >
<body onload="resize()" onresize="resize()" >
<div class="global-nav">
<!-- start topbar -->
<!-- start topbar -->
<div class="topbar" id="corpBar">
<div class="topbar-bg"></div>
<div class="topbar-inner">
@@ -106,7 +107,7 @@
</li>
{/foreach}
{/if}
{if $canStartCase neq false && count($mnuNewCase) > 0}
<li class="account">
<a class="menu user-actions" href="javascript:;" title="{$mnuNewCase.label}" id="_new">
@@ -122,7 +123,7 @@
</ul>
</li>
{/if}
</ul>
</ul>
<ul class="nav secondary-nav">
<li class="account">
@@ -135,9 +136,9 @@
<!--<li><a href="#" accesskey="s" id="settings_link">Settings</a></li>
<li><a href="#" accesskey="?" id="help_link">Help</a></li>-->
{if $userUxType eq 'SWITCHABLE'}
<li><a href="{$switchLink}" accesskey="?" id="help_link">Switch Interface</a></li>
<li><a href="{$switchLink}" accesskey="?" id="help_link">{translate label="ID_SWITCH_INTERFACE"}</a></li>
{/if}
<li><a href="home/login" accesskey="l" id="sign_out_link">Sign out</a></li>
<li><a href="home/login" accesskey="l" id="sign_out_link">{translate label="ID_SIGN_OUT"}</a></li>
</ul>
</li>
</ul>
@@ -145,18 +146,18 @@
</div> <!-- /fixed-container -->
</div> <!-- /topbar-inner -->
</div>
<!-- end topbar -->
<!-- end topbar -->
</div>
<iframe id="iframex" name="iframex" src="home/appList" width="100%" height="800" scrolling="yes" frameborder="0"></iframe>
<div id="dialog-confirm" title="Confirm" style="display:none">
<p>
Start a new case for:<br/>
{translate label="ID_START_A_NEW_CASE_FOR"}<br/>
<span class="ui-icon ui-icon-document" style="float:left; margin:0 7px 20px 0;"></span><span id="startAppTitle"/></p>
</div>
{literal}
{literal}
<script type="text/javascript">
// Javascript to toggle the dropdowns
$(document).ready(function(){
@@ -179,7 +180,7 @@
return false;
});
// To hide some actived menu clicking on inner iframe content
$('iframe').load(function(){
var iframeDoc = $('iframe').contents().get(0);
@@ -191,7 +192,7 @@
})
$('ul.primary-nav').children('li').children('a').click(function(i, el){
$('ul.primary-nav').children('li').children('a').attr('class', 'menu user-actions');
$(this).attr('class', 'menu user-actions active');

View File

@@ -1,7 +1,7 @@
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=2.0, user-scalable=yes" />
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=2.0, user-scalable=yes" />
<link rel="shortcut icon" href="/images/favicon.ico" type="image/x-icon"/>
<link rel="stylesheet" href="/js/jquery/css/smoothness/jquery-ui-1.8.17.custom.css" type="text/css">
@@ -11,7 +11,7 @@
<script type="text/javascript" src="/js/jquery/jquery-ui-1.8.17.min.js"></script>
<script type="text/javascript" src="/js/jquery/xbreadcrumbs.js"></script>
{literal}
<style>
body {
@@ -35,13 +35,13 @@
var ux_env = {ver: '1.0'};
//var simplified = {};
function resize()
function resize()
{
var h = $(window).height() - 42;
$('iframe').height(h)
}
function setCurrent(id)
function setCurrent(id)
{
$('#' + id).trigger('click');
}
@@ -50,11 +50,11 @@
{/literal}
</head>
<body onload="resize()" onresize="resize()" >
<body onload="resize()" onresize="resize()" >
<div style="top:40px;"/>
<div id="global-nav-2" class="global-nav-2">
<!-- start topbar -->
<ul class="xbreadcrumbs" id="breadcrumbs-1">
{if count($steps) > 0}
{foreach from=$steps key=i item=step}
@@ -66,17 +66,16 @@
<li></li>
{/if}
</ul>
<a id="signout-link" href="home/login" title="Sign out"><img src="/images/simplified/logout-grey.png" /></a>
<a id="signout-link" href="home/login" title="{translate label="ID_SIGN_OUT"}"><img src="/images/simplified/logout-grey.png" /></a>
<!-- end topbar -->
</div>
<iframe id="iframex" name="iframex" src="{$default_url}" width="100%" height="800" scrolling="yes" frameborder="0"></iframe>
<div id="dialog-confirm" title="Confirm" style="display:none">
<p>
Start a new case for:<br/>
{translate label="ID_START_A_NEW_CASE_FOR"}<br/>
<span class="ui-icon ui-icon-document" style="float:left; margin:0 7px 20px 0;"></span><span id="startAppTitle"/></p>
</div>

View File

@@ -19,7 +19,7 @@
height: 140px;
margin-top: -140px;
margin-left: -210px;
overflow: none;
overflow: none;
}
</style>
@@ -37,16 +37,16 @@
<td valign='top'>
<table cellspacing="0" cellpadding="0" border="0" width="100%">
<tr>
<td class='FormTitle' colspan="2" align=""><span id='form[TITLE]' name='form[TITLE]' >Login</span></td>
<td class='FormTitle' colspan="2" align=""><span id='form[TITLE]' name='form[TITLE]' >{translate label="ID_LOGIN"}</span></td>
</tr>
<tr>
<td class='FormLabel' width="40%">User</td>
<td class='FormLabel' width="40%">{translate label="ID_USER"}</td>
<td class='FormFieldContent' width='240' >
<input class="module_app_input___gray" name="form[USR_USERNAME]" type="text" size="30" maxlength="50" value=""/>
</td>
</tr>
<tr>
<td class='FormLabel' width="40%">Password</td>
<td class='FormLabel' width="40%">{translate label="ID_PASSWORD"}</td>
<td class='FormFieldContent' width='240' >
<input class="module_app_input___gray" name="form[USR_PASSWORD]" type ="password" size="31" maxlength="50" value=""/>
</td>
@@ -58,7 +58,7 @@
<tr>
<td class='FormButton' colspan="2" align="">
<br/>
<input class='module_app_button___gray ' name="form[BSUBMIT]" type='submit' value="Login" />
<input class='module_app_button___gray ' name="form[BSUBMIT]" type='submit' value="{translate label="ID_LOGIN"}" />
</td>
</tr>
</table>
@@ -73,5 +73,3 @@
</body>
</html>

View File

@@ -11,29 +11,29 @@
function start() {
//Fade in the Popup
$('#login').fadeIn(1000);
//Set the center alignment padding + border see css style
var popMargTop = ($('#login').height() + 24) / 2;
var popMargLeft = ($('#login').width() + 24) / 2;
var popMargLeft = ($('#login').width() + 24) / 2;
if (!jQuery.browser.msie) {
$('#login').css({
$('#login').css({
'margin-top' : -popMargTop,
'margin-left' : -popMargLeft
});
// Add the mask to body
$('body').append('<div id="mask"></div>');
$('#mask').fadeIn(0);
}
else {
$('#login').css({
$('#login').css({
'margin-top' : (($(window).height()/2) - 140)
});
}
return false;
}
start();
//$('#login').fadeIn(1000);
});
@@ -47,9 +47,9 @@
$('#login').width(w-50);
var popMargTop = ($('#login').height() + 24) / 2;
var popMargLeft = ($('#login').width() + 5) / 2;
$('#login').css({
var popMargLeft = ($('#login').width() + 5) / 2;
$('#login').css({
'margin-top' : -popMargTop,
'margin-left' : -popMargLeft
});
@@ -64,13 +64,13 @@
<center>
<form method="post" action="../login/authentication">
<div id="login" class="login_form">
<h1>Sign In</h1>
<h1>{translate label="ID_SIGN_IN"}</h1>
<div class="login_message">{$msg}</div>
<table border=0 width="100%" cellspacing="0" cellpadding="0" class="formbody">
<tr>
<td><label for="login_field">Username</label></td>
<td><label for="login_field">{translate label="ID_USERNAME"}</label></td>
</tr>
<tr>
<td>
@@ -78,7 +78,7 @@
</td>
</tr>
<tr>
<td><label for="password">Password</label></td>
<td><label for="password">{translate label="ID_PASSWORD"}</label></td>
</tr>
<tr>
<td>
@@ -87,16 +87,13 @@
</tr>
<tr>
<td align="center">
<label class="submit_btn"><input type="submit" value="Log in" tabindex="3" name="commit" /></label>
<label class="submit_btn"><input type="submit" value="{translate label="ID_LOGIN"}" tabindex="3" name="commit" /></label>
</td>
</tr>
</table>
</div>
</div>
</form>
</center>
</body>
</html>

View File

@@ -9,7 +9,7 @@
@media only screen and (min-device-width: 768px) {
.uxs { width: 550px; }
}
</style>
<script>
$(document).ready(function() {
@@ -27,12 +27,12 @@
<center>
<div class="uxs" style="text-align:left">
<table cellspacing="0" cellpadding="0" border="0" width="100%">
<tr><td class="Title">Information</td></tr>
<tr><td class="Title">{translate label="ID_INFORMATION"}</td></tr>
</table>
<h2></h2>
<h3>You are now finished. Please refresh your view to see if you have any more work pending.</h3>
<h3>{translate label="ID_FINISHED_REFRESH_VIEW_SEE_SLOPE_WORK"}</h3>
<center>
<button id="btnRefresh">Refresh view</button>
<button id="btnRefresh">{translate label="ID_REFRESH_VIEW"}</button>
</center>
</div>
</center>