UX Sync Thu 1
This commit is contained in:
+9
@@ -1230,6 +1230,15 @@ namespace Resources {
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized string similar to This action is no longer available..
|
||||
/// </summary>
|
||||
internal static string Global_Error_Concurrency {
|
||||
get {
|
||||
return ResourceManager.GetString("Global_Error_Concurrency", resourceCulture);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized string similar to Unable to connect WebSocket. Live updates will not be available..
|
||||
/// </summary>
|
||||
|
||||
@@ -1072,6 +1072,10 @@
|
||||
<value>No records</value>
|
||||
<comment>There are no records of the requested type</comment>
|
||||
</data>
|
||||
<data name="Global_Error_Concurrency" xml:space="preserve">
|
||||
<value>This action is no longer available.</value>
|
||||
<comment>This message is displayed when another user does something just before this user, so that this user's indended action can't be completed. Example: Somebody else denies an expense claim 2 milliseconds before this user tries to approve the same expense claim. The database updates, but the user interface and user won't have time to react.</comment>
|
||||
</data>
|
||||
<data name="Global_Item" xml:space="preserve">
|
||||
<value>Item</value>
|
||||
<comment>As in "record", "list item", something listed</comment>
|
||||
|
||||
@@ -353,12 +353,11 @@
|
||||
function onDenyRecord() {
|
||||
var reason = $('#<%=this.TextDenyReason.ClientID%>').val();
|
||||
|
||||
// hide yes/no icons, show denied icon, but set it to "loading" icon until completed
|
||||
// hide yes/no icons, show waiting
|
||||
|
||||
$('#IconApproval' + recordId).hide();
|
||||
$('#IconApproval' + recordId).fadeOut(1000,0.01);
|
||||
$('#IconDenial' + recordId).hide();
|
||||
$('#IconDenied' + recordId).attr('src', '/Images/Abstract/ajaxloader-48x36px.gif');
|
||||
$('#IconDenied' + recordId).show();
|
||||
$('#IconWait' + recordId).hide();
|
||||
<%= this.DialogDeny.ClientID %>_close();
|
||||
|
||||
SwarmopsJS.ajaxCall(
|
||||
@@ -366,10 +365,8 @@
|
||||
{ recordId: recordId, reason: reason },
|
||||
$.proxy(function(result) {
|
||||
if (result.Success) {
|
||||
$(this).attr("src", "/Images/Icons/iconshock-red-cross-circled-128x96px.png");
|
||||
$(this).fadeIn(); // was visible already, but this will create an effect as it changes image
|
||||
$('.row' + $(this).attr('baseid')).animate({ color: "#CCC" }, 500);
|
||||
$('.row' + $(this).attr('baseid')).css('text-decoration', 'line-through');
|
||||
$(this).fadeTo(1000, 1);
|
||||
$('.row' + $(this).attr('baseid')).addClass("action-list-item-denied");
|
||||
} else {
|
||||
// Failure can happen for many reasons, all bad, so we're just reloading the
|
||||
// entire grid to cover our bases
|
||||
|
||||
@@ -137,7 +137,7 @@
|
||||
<asp:Literal runat="server" ID="LiteralDescriptionThStart" /><asp:Label ID="LabelGridHeaderDescription" runat="server" Text="XYZ Description" /><asp:Literal runat="server" ID="LiteralDescriptionThClose" Text="</th>" />
|
||||
<asp:Literal runat="server" ID="LiteralBudgetThStart" /><asp:Label ID="LabelGridHeaderBudget" runat="server" Text="XYZ Budget" /><asp:Literal runat="server" ID="LiteralBudgetThClose" Text="</th>" />
|
||||
<asp:Literal runat="server" ID="LiteralExtraTags" />
|
||||
<th data-options="field:'amountRequested',width:80,align:'right',sortable:true,order:'asc'"><asp:Label ID="LabelGridHeaderRequested" runat="server" Text="XYZ Requested" /></th>
|
||||
<th data-options="field:'amountRequested',width:90,align:'right',sortable:true,order:'asc'"><asp:Label ID="LabelGridHeaderRequested" runat="server" Text="XYZ Requested" /></th>
|
||||
<th data-options="field:'dox',width:40,align:'center'"><asp:Label ID="LabelGridHeaderDocs" runat="server" Text="Doxyz" /></th>
|
||||
<th data-options="field:'actions',width:68,align:'center'"><asp:Label ID="LabelGridHeaderAction" runat="server" Text="Axyztion" /></th>
|
||||
</tr>
|
||||
|
||||
@@ -1015,17 +1015,17 @@ input.entryError, span.entryError, div.entryError {
|
||||
display: none;
|
||||
}
|
||||
|
||||
.action-list-item-completed {
|
||||
.action-list-item-completed, .action-list-item-denied {
|
||||
-webkit-transition: all 0.50s;
|
||||
transition: all 0.50s;
|
||||
color: #ccc;
|
||||
text-decoration: line-through;
|
||||
}
|
||||
|
||||
.action-list-item-disabled {
|
||||
.action-list-item-disabled, .action-list-item-approved {
|
||||
-webkit-transition: all 0.50s;
|
||||
transition: all 0.50s;
|
||||
color: #aaa;
|
||||
color: #aaa !important;
|
||||
}
|
||||
|
||||
.action-icon-disabled {
|
||||
@@ -1036,11 +1036,6 @@ input.entryError, span.entryError, div.entryError {
|
||||
background:transparent !important;
|
||||
}
|
||||
|
||||
.action-list-item-approved {
|
||||
color: #aaa !important;
|
||||
transition: all 0.50s;
|
||||
-webkit-transition: all 0.50s;
|
||||
}
|
||||
|
||||
/* DISPLAY FIELDS */
|
||||
|
||||
|
||||
Reference in New Issue
Block a user