Merge pull request dubeaud#234 from GroepDS-be/ui-fix

Ui fix
philippjenni · Feb 23, 2017 · a810c61 · a810c61
2 parents 77a72f0 + bfa52b9
commit a810c61
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 6 deletions.
diff --git 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
@@ -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;
         }
 
         /// <summary>
@@ -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
@@ -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
@@ -31,16 +31,16 @@
                             <span class="fa-stack fa-2x">
                                 <i class="fa fa-circle fa-stack-2x number"></i>
                                 <strong class="fa-stack-1x number-text">2</strong>
-                            </span>>&nbsp;
+                            </span>&nbsp;
                             <asp:Localize runat="server" ID="Step2_Localize" /></li>
                         <li>
                             <span class="fa-stack fa-2x">
                                 <i class="fa fa-circle fa-stack-2x number"></i>
                                 <strong class="fa-stack-1x number-text">3</strong>
-                            </span>>&nbsp;
+                            </span>&nbsp;
                             <asp:Localize runat="server" ID="Step3_Localize" /></li>
                     </ul>
-                    <p><a class="btn btn-primary btn-lg" href="http://bugnet.codeplex.com/documentation" role="button">
+                    <p><a class="btn btn-primary btn-lg" href="http://bugnet.codeplex.com/documentation" role="button" target="_blank">
                         <asp:Localize runat="server" ID="LearnMoreLocalize" meta:resourcekey="LearnMore" /></a></p>
                 </div>
                 <br>

diff --git a/src/BugNET_WAP/Site.Master b/src/BugNET_WAP/Site.Master
@@ -52,8 +52,9 @@
                         <i class="fa fa-bars"></i>
                     </button> 
                     <a class="navbar-brand navbar-brand-img" runat="server" href="~/">
-                        <img runat="server" src="~/images/logo.png" height="40" width="40" />
-                        BugNET</a>
+                        <img runat="server" src="~/images/logo.png" height="40" width="40" alt="" />
+                        <span class="site-name-text">BugNET</span>
+                    </a>
                 </div>
                 <div class="navbar-collapse collapse">
                     <asp:Literal ID="litMenu" Visible="true" runat="server"></asp:Literal>