From e19c490e9ec094e4a69ba8625a78d0ca4eef9ee6 Mon Sep 17 00:00:00 2001 From: Rick Falkvinge Date: Mon, 4 Nov 2013 04:25:26 +0000 Subject: [PATCH] Added some CSS fixes before multi-image test on Mono --- Site5/Pages/v5/Financial/AttestCosts.aspx | 2 +- Site5/Pages/v5/Financial/AttestCosts.aspx.cs | 12 ++++++++---- .../Scripts/fancybox/jquery.fancybox-1.3.4.css | 18 +++++++++--------- 3 files changed, 18 insertions(+), 14 deletions(-) diff --git a/Site5/Pages/v5/Financial/AttestCosts.aspx b/Site5/Pages/v5/Financial/AttestCosts.aspx index e3f55b84..192f0d68 100644 --- a/Site5/Pages/v5/Financial/AttestCosts.aspx +++ b/Site5/Pages/v5/Financial/AttestCosts.aspx @@ -172,7 +172,7 @@ - " class="FancyBox_Gallery" rel="<%# Eval("BaseId") %>">  + " title="<%# Eval("Title") %>" class="FancyBox_Gallery" rel="<%# Eval("BaseId") %>">  diff --git a/Site5/Pages/v5/Financial/AttestCosts.aspx.cs b/Site5/Pages/v5/Financial/AttestCosts.aspx.cs index ff693006..66803f14 100644 --- a/Site5/Pages/v5/Financial/AttestCosts.aspx.cs +++ b/Site5/Pages/v5/Financial/AttestCosts.aspx.cs @@ -254,7 +254,7 @@ namespace Swarmops.Frontend.Pages.v5.Financial { if (_attestationRights.ContainsKey(expenseClaim.BudgetId) || expenseClaim.Budget.OwnerPersonId == Person.NobodyId) { - AddDocuments(expenseClaim.Documents, "E" + expenseClaim.Identity.ToString(CultureInfo.InvariantCulture)); + AddDocuments(expenseClaim.Documents, "E" + expenseClaim.Identity.ToString(CultureInfo.InvariantCulture), String.Format("Expense Claim #{0} by {1} - ", expenseClaim.Identity, expenseClaim.ClaimerCanonical) + "Receipt Image {0} of {1}"); } } } @@ -271,16 +271,19 @@ namespace Swarmops.Frontend.Pages.v5.Financial if (_attestationRights.ContainsKey(invoice.BudgetId) || invoice.Budget.OwnerPersonId == Person.NobodyId) { - AddDocuments(invoice.Documents, "I"+ invoice.Identity.ToString(CultureInfo.InvariantCulture)); + AddDocuments(invoice.Documents, "I" + invoice.Identity.ToString(CultureInfo.InvariantCulture), String.Format("Invoice #{0} from {1} - ", invoice.Identity, invoice.Supplier) + "Image {0} of {1}"); } } } - private void AddDocuments (Documents docs, string baseId) + private void AddDocuments (Documents docs, string baseId, string titleBase) { + int countTotal = docs.Count; + int count = 0; + foreach (Document document in docs) { - RepeatedDocument newDoc = new RepeatedDocument {DocId = document.Identity, BaseId = baseId}; + RepeatedDocument newDoc = new RepeatedDocument {DocId = document.Identity, BaseId = baseId, Title=String.Format(titleBase, ++count, countTotal)}; _documentList.Add(newDoc); } @@ -290,6 +293,7 @@ namespace Swarmops.Frontend.Pages.v5.Financial { public int DocId { get; set; } public string BaseId { get; set; } + public string Title { get; set; } } } } \ No newline at end of file diff --git a/Site5/Scripts/fancybox/jquery.fancybox-1.3.4.css b/Site5/Scripts/fancybox/jquery.fancybox-1.3.4.css index 6f53d8f4..08721cde 100644 --- a/Site5/Scripts/fancybox/jquery.fancybox-1.3.4.css +++ b/Site5/Scripts/fancybox/jquery.fancybox-1.3.4.css @@ -25,7 +25,7 @@ margin-left: -20px; cursor: pointer; overflow: hidden; - z-index: 1104; + z-index: 9104; display: none; } @@ -43,7 +43,7 @@ top: 0; left: 0; width: 100%; - z-index: 1100; + z-index: 9100; display: none; } @@ -60,7 +60,7 @@ top: 0; left: 0; padding: 20px; - z-index: 1101; + z-index: 9101; outline: none; display: none; } @@ -79,7 +79,7 @@ outline: none; position: relative; overflow: hidden; - z-index: 1102; + z-index: 9102; border: 0px solid #fff; } @@ -90,7 +90,7 @@ width: 100%; height: 100%; background: transparent; - z-index: 1101; + z-index: 9101; } #fancybox-close { @@ -101,7 +101,7 @@ height: 30px; background: transparent url('fancybox.png') -40px 0px; cursor: pointer; - z-index: 1103; + z-index: 9103; display: none; } @@ -138,7 +138,7 @@ cursor: pointer; outline: none; background: transparent url('blank.gif'); - z-index: 1102; + z-index: 9102; display: none; } @@ -158,7 +158,7 @@ height: 30px; margin-top: -15px; cursor: pointer; - z-index: 1102; + z-index: 9102; display: block; } @@ -192,7 +192,7 @@ border: 0; width: 20px; height: 20px; - z-index: 1001; + z-index: 9001; } #fancybox-bg-n {