From 8d56b779160e1f59bae28e2a80ac97e0d5397e00 Mon Sep 17 00:00:00 2001 From: Subrata Sarkar Date: Wed, 9 Nov 2016 15:44:02 +0530 Subject: [PATCH 1/5] Fixed alignment issue of sitelogo --- src/BugNET_WAP/Content/Site.css | 12 +++++++++++- src/BugNET_WAP/Site.Master | 5 +++-- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/src/BugNET_WAP/Content/Site.css b/src/BugNET_WAP/Content/Site.css index 5aa535b0..7bfad99d 100644 --- a/src/BugNET_WAP/Content/Site.css +++ b/src/BugNET_WAP/Content/Site.css @@ -11,7 +11,17 @@ } .navbar-inverse .navbar-brand-img { - padding: 5px 15px 15px 15px; + padding: 7px 15px 15px 15px; +} + +.navbar-inverse .navbar-brand-img img, .navbar-inverse .navbar-brand-img span.site-name-text { + display: inline-block; +} + +.navbar-inverse .navbar-brand-img span.site-name-text { + position: relative; + top: 2px; + left: 8px; } .navbar-inverse .navbar-toggle { diff --git a/src/BugNET_WAP/Site.Master b/src/BugNET_WAP/Site.Master index b4cd8faf..908a833e 100644 --- a/src/BugNET_WAP/Site.Master +++ b/src/BugNET_WAP/Site.Master @@ -52,8 +52,9 @@ - - BugNET + + BugNET +
From 0b5df3a3d77080fd71b2b73f20d8a3ed7e6e17c9 Mon Sep 17 00:00:00 2001 From: Subrata Sarkar Date: Wed, 23 Nov 2016 10:45:10 +0530 Subject: [PATCH 2/5] Added database.jfm file into to .gitignore --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index 9313a41d..4e279764 100644 --- a/.gitignore +++ b/.gitignore @@ -6,6 +6,8 @@ *.user *.userosscache *.sln.docstates +*.jfm +*.database.jfm # Build results [Dd]ebug/ From 182596d2c59664eccae8830488812dcf183b8193 Mon Sep 17 00:00:00 2001 From: Subrata Sarkar Date: Wed, 23 Nov 2016 11:40:46 +0530 Subject: [PATCH 3/5] Added target=_blank for Learn More button --- src/BugNET_WAP/Default.aspx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/BugNET_WAP/Default.aspx b/src/BugNET_WAP/Default.aspx index 96c9afb0..0b9e40c6 100644 --- a/src/BugNET_WAP/Default.aspx +++ b/src/BugNET_WAP/Default.aspx @@ -40,7 +40,7 @@ >  -

+


From afceb7feb347fa0487a1dfd5e6f443c2a03e1b6c Mon Sep 17 00:00:00 2001 From: Subrata Sarkar Date: Wed, 23 Nov 2016 12:15:39 +0530 Subject: [PATCH 4/5] Removed additional '>' (issue #230) --- src/BugNET_WAP/Default.aspx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/BugNET_WAP/Default.aspx b/src/BugNET_WAP/Default.aspx index 0b9e40c6..5b95134a 100644 --- a/src/BugNET_WAP/Default.aspx +++ b/src/BugNET_WAP/Default.aspx @@ -31,13 +31,13 @@ 2 - >  +  
  • 3 - >  +  

    • From bfa52b95435c0e4755e553e461b3b5bd338f62b7 Mon Sep 17 00:00:00 2001 From: Subrata Sarkar Date: Fri, 25 Nov 2016 15:05:19 +0530 Subject: [PATCH 5/5] Issue #232: Back button on Wizard step 1 fixed. --- src/BugNET_WAP/Administration/Projects/AddProject.aspx.cs | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/BugNET_WAP/Administration/Projects/AddProject.aspx.cs b/src/BugNET_WAP/Administration/Projects/AddProject.aspx.cs index d7907063..cbdf347b 100644 --- a/src/BugNET_WAP/Administration/Projects/AddProject.aspx.cs +++ b/src/BugNET_WAP/Administration/Projects/AddProject.aspx.cs @@ -41,6 +41,9 @@ private void LoadWizardStep() plhWizardStep.Controls.Add(_ctlWizardStep); ((IEditProjectControl)_ctlWizardStep).Initialize(); lblStepNumber.Text = String.Format("{2} {0} {3} {1}", StepIndex + 1, _wizardSteps.Count, GetLocalResourceObject("Step"), GetLocalResourceObject("Of")); + + //Hide BACK button on StepIndex = 0 (Wizard step 1 of 10) + btnBack.Visible = StepIndex != 0; } ///

    @@ -119,7 +122,9 @@ protected void btnNext_Click(object sender, EventArgs e) if (((IEditProjectControl)_ctlWizardStep).Update()) { ProjectId = ((IEditProjectControl)_ctlWizardStep).ProjectId; + StepIndex++; + if (StepIndex == _wizardSteps.Count) Response.Redirect("ProjectList.aspx"); else