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/ 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 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/Default.aspx b/src/BugNET_WAP/Default.aspx index 96c9afb0..5b95134a 100644 --- a/src/BugNET_WAP/Default.aspx +++ b/src/BugNET_WAP/Default.aspx @@ -31,16 +31,16 @@ 2 - >  +  
  • 3 - >  +  
  • -

    +


    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 +