release prep - ui updates, readme update, etc.

NullDesk · Jun 30, 2015 · d736839 · d736839
1 parent f8ffbdb
commit d736839
Show file tree

Hide file tree

Showing 13 changed files with 99 additions and 80 deletions.
diff --git a/README.md b/README.md
@@ -8,60 +8,24 @@ TicketDesk is an issue tracking system for IT Help Desks.
 
 TicketDesk is efficient and designed to do only one thing, facilitate communications between help desk staff and end users. The overriding design goal is to be as simple and frictionless for both users and help desk staff as is possible.
 
-<img src="http://download.codeplex.com/download?ProjectName=TicketDesk&DownloadId=193983" title="TicketDesk 2"  />
+<img src="https://raw.githubusercontent.com/NullDesk/TicketDesk/develop/td25.png" title="TicketDesk 2.5"  />
 
 Documenation
 ===========
 Documentation can be found in the [TicketDesk GitHub Wiki](https://github.com/StephenRedd/TicketDesk/wiki)
 
-You can read more about ongoing TicketDesk development [on my site](http://www.reddnet.net/ticketdesk/).
-
-Source Notes:
+Developer Notes:
 ===========
 
-The current shipping version is [TicektDesk 2.1](https://github.com/StephenRedd/TicketDesk/releases/tag/td2-v2.1.3). 
+[TicketDesk 2.5 is in beta](https://github.com/StephenRedd/TicketDesk/releases/tag/td2-v2.5.0). We are on track for an August 1<sup>st</sup> stable release. 
 
-TicketDesk 2.5 is in development. There have been some delays, but we're working very hard 
-ensure a much smoother setup and configuration system, bullet-proof email, and reliable 
-integration for users wanting to cloud deploy to Microsoft Azure. 
+View a working [demo of TicketDesk 2.5 here](http://ticketdesk2.azurewebsites.net/). The demo is automatically deployed by continuous integration from the development branch.
 
-- TicketDesk 2.1 requires Visual Studio 2012 or higher with .Net Framework 4.5 
+The current stable version is [TicektDesk 2.1](https://github.com/StephenRedd/TicketDesk/releases/tag/td2-v2.1.3). 
 
 - TicketDesk 2.5 requires Visual Studio 2013 with .Net Framework 4.5.2 or higher.
   - Visual Studio 2013 with Update 4 or higher is required for Azure publishing
+
+- TicketDesk 2.1 requires Visual Studio 2012 or higher with .Net Framework 4.5
 
-Current Development Information
-===========
-
-A [demo of TicketDesk 2.5 alpha](http://ticketdesk2.azurewebsites.net/) is available. It is just an alpha, so expect rough-edges
-
-TicketDesk 2.5 is a full technology platfrom update. 
-
- - Asp.net MVC 5x with Razor Views
- - Entity Framework 6x Code-First
- - Aspnet.Identity
- - Bootstrap / HTML5 / CSS3
- - OWIN/Katana Pipeline
- - Simple Injector (IoC / DI)
-
-TicketDesk 2.5 will contain a small set of new features:
-
- - Watch / Follow Tickets
- - On-Screen first-run setup wizard
- - Advanced Admin Tools
-   - Search Configuration
-   - Database Management
-   - Demo / Seed Data Management
-   - Improved Email Settings and Diagnostics
- - Azure Deployability and Scaling (optional) 
-   - Email distribution managed by Azure WebJobs
-   - Search powered by Azure Search Services
-   - Attachments Stored in Azure Storage
-   - Data hosted in Azure SQL
-
-Limitations:
-> TicketDesk 2.5 will NOT include direct support for on-premise Active Directory integration. 
-It will ship initially with support only for local user accounts, but a TD 2.6 update will 
-follow immediately afterwards to add support for several organizational authentication 
-options (WS-Federation, OpenID Connect, Azure AD, etc.).  
 
diff --git a/TicketDesk/TicketDesk.Web.Client/Content/Site.css b/TicketDesk/TicketDesk.Web.Client/Content/Site.css
@@ -20,7 +20,7 @@ html {
 
 body {
     background-color: #fff;
-    font-size: 10pt;
+    font-size: 11pt;
     font-family: Calibri, Tahoma, Verdana, Helvetica, Sans-Serif;
 }
 
@@ -59,6 +59,8 @@ body {
 .body-content > footer {
     height: 30px;
     border-top: 1px solid #B3CBDF;
+
+    font-size: 9pt;
 }
 
 /*Bootstrap Extensions*/
@@ -163,6 +165,7 @@ input[type="checkbox"].input-validation-error {
 /*Home page*/
 .right-side-box {
     height: 100%;
+    font-size: 10pt;
 }
 
 .left-side-box {
@@ -178,6 +181,7 @@ p {
 /*Ticket Center*/
 #ticketList {
     border-collapse: collapse;
+    font-size: 10pt;
 }
 
     #ticketList table td {

diff --git a/TicketDesk/TicketDesk.Web.Client/Scripts/ticketdesk/admin-edit-user.js b/TicketDesk/TicketDesk.Web.Client/Scripts/ticketdesk/admin-edit-user.js
@@ -3,7 +3,6 @@
         var config;
         var activate = function (tdConfig) {
             config = tdConfig;
-            $('[data-toggle="tooltip"]').tooltip();
             $('#userroles').select2();
             $('#userroles').on('change', function(e) {
                 var options = $(this).find('option:selected');

diff --git a/TicketDesk/TicketDesk.Web.Client/Scripts/ticketdesk/edit-ticket.js b/TicketDesk/TicketDesk.Web.Client/Scripts/ticketdesk/edit-ticket.js
@@ -18,7 +18,6 @@
             config = tdConfig;
             configureDetails();
             loadActivityButtons();
-            $('[data-toggle="tooltip"]').tooltip();
 
         };
 

diff --git a/TicketDesk/TicketDesk.Web.Client/TicketDesk.Web.Client.csproj b/TicketDesk/TicketDesk.Web.Client/TicketDesk.Web.Client.csproj
@@ -373,9 +373,6 @@
     <Content Include="Fonts\fontawesome-webfont.ttf" />
     <Content Include="Fonts\fontawesome-webfont.eot" />
     <Content Include="Fonts\FontAwesome.otf" />
-    <None Include="Properties\PublishProfiles\azure.pubxml">
-      <SubType>Designer</SubType>
-    </None>
     <Content Include="Properties\webjobs-list.json" />
     <Content Include="Scripts\jquery.clickable-0.1.9.min.js.map">
       <DependentUpon>jquery.clickable-0.1.9.min.js</DependentUpon>
@@ -540,6 +537,7 @@
   <ItemGroup>
     <Folder Include="App_Data\" />
     <Folder Include="Infrastructure\Filters\" />
+    <Folder Include="Properties\PublishProfiles\" />
     <Folder Include="Views\ProjectSelector\" />
   </ItemGroup>
   <ItemGroup>

diff --git a/TicketDesk/TicketDesk.Web.Client/Views/Home/Index.cshtml b/TicketDesk/TicketDesk.Web.Client/Views/Home/Index.cshtml
@@ -19,33 +19,66 @@
 
 <main role="main" class="row">
     <article class="col-md-8 left-side-box">
-        <h2>Welcome to TicketDesk 2.5 <span class="small">(alpha)</span></h2>
+        <a class="hidden-md hidden-lg" href="https://github.com/nulldesk/ticketdesk"><img style="position: absolute; top: -20px; right: 0; border: 0;" src="https://camo.githubusercontent.com/a6677b08c955af8400f44c6298f40e7d19cc5b2d/68747470733a2f2f73332e616d617a6f6e6177732e636f6d2f6769746875622f726962626f6e732f666f726b6d655f72696768745f677261795f3664366436642e706e67" alt="Fork me on GitHub" data-canonical-src="https://s3.amazonaws.com/github/ribbons/forkme_right_gray_6d6d6d.png"></a>
 
-        <p class="alert alert-danger">
-            Legacy DB Upgrades are supported. Feel free to test this feature, but please do not upgrade a production TD 2.1 database without a reliable backup first!
-        </p>
-        <p class="alert alert-info">
-            User management has been completed, and work is in progress on back-end support and administration for multiple projects. There have also been some general UI improvements across the whole system.<br/><br/>TicketDesk 2.5 is on-track for a June 30th beta release.</p>
+        <div class="container-responsive">
+            <fieldset style="min-height: 350px; padding-right: 25px;">
+                <legend>
+                    Welcome to TicketDesk 2.5 <span class="small">(beta)</span>
+                </legend>
+                @if (!string.IsNullOrEmpty(Environment.GetEnvironmentVariable("WEBSITE_SITE_NAME")))
+                {
+                    <div class="alert alert-info">
+                        <h5>Congratulations! You appear to be running in Azure.</h5>
+                    </div>
+                }
+                <p>
+                    It has been a long road, but at last TicketDesk 2.5 is nearly ready for production use. The beta should be stable enough to evaluate and test. There are a number of rough edges still, but we are working hard to fix those up before the final release.
+                </p>
+                <div class="">
 
-        <div class="well well-sm">
-            @if (!string.IsNullOrEmpty(Environment.GetEnvironmentVariable("WEBSITE_SITE_NAME")))
-            {
-                <h3>Congratulations! You appear to be running in Azure.</h3>
-            }
-            <h3>Logins:</h3>
-            <p>
-                Login with one of the following:
-                <ul>admin@example.com</ul>
-                <ul>staff@example.com</ul>
-                <ul>user@example.com</ul>
-                Password is "123456" for all three users.
-            </p>
-            @*@Html.ActionLink("Create Search Index", "Indexer");*@
+                    <p>Please keep the following in mind while evaluating the beta:</p>
+                    <ul class="text-muted">
+                        <li>
+                            TicketDesk 2.5 can upgrade v2.1.4 databases, but please make a backup first!
+                        </li>
+                        <li>
+                            TicketDesk 2.5 does not support Active Directory integration.
+                        </li>
+                        <li>
+                            If you find bugs, please log the issue on the
+                            <a href="https://github.com/NullDesk/TicketDesk/issues">TicketDesk GitHub issue tracker</a>
+                        </li>
+                        <li>This page will be replaced with a simple user-dashboard before the final release.</li>
+                    </ul>
+                    <div>
+                        <p>
+                            For documentation and configuration information, please visit the <a href="https://github.com/NullDesk/TicketDesk/wiki">GitHub Wiki</a>
+                        </p>
+                        <hr/>
+                        <p>
+                            TicketDesk 2.5 is scheduled for final release on August 1<sup>st</sup> 2015.
+                        </p>
 
+                    </div>
+                </div>
+
+
+            </fieldset>
+
+
         </div>
     </article>
     <aside class="col-md-4 right-side-box">
+        <a class="hidden-xs hidden-sm" href="https://github.com/nulldesk/ticketdesk"><img style="position: absolute; top: -20px; right: 0; border: 0;" src="https://camo.githubusercontent.com/a6677b08c955af8400f44c6298f40e7d19cc5b2d/68747470733a2f2f73332e616d617a6f6e6177732e636f6d2f6769746875622f726962626f6e732f666f726b6d655f72696768745f677261795f3664366436642e706e67" alt="Fork me on GitHub" data-canonical-src="https://s3.amazonaws.com/github/ribbons/forkme_right_gray_6d6d6d.png"></a>
         <h3>TD 2.5 Change List</h3>
+        <strong>Feature Updates</strong>
+        <ul>
+            <li>Online Setup (frist-run-setup)</li>
+            <li>Multiple Projects</li>
+            <li>Multiple rich text editor options</li>
+            <li>Responsive UI (small screen device support)</li>
+        </ul>
         <strong>Technology Update</strong>
         <ul>
             <li>Entity Framework 6x code-first</li>
@@ -59,7 +92,7 @@
                     <li>Azure WebSite</li>
                     <li>Azure Storage</li>
                     <li>Azure Search Services</li>
-                    <li>Azure SQL</li>
+                    <li>Azure SQL Database</li>
                 </ul>
             </li>
         </ul>

diff --git a/TicketDesk/TicketDesk.Web.Client/Views/ProjectSettings/Index.cshtml b/TicketDesk/TicketDesk.Web.Client/Views/ProjectSettings/Index.cshtml
@@ -11,7 +11,6 @@
     <script type="text/javascript">
         $(document).ready(function () {
             $(".clickable").clickable();
-            $('[data-toggle="tooltip"]').tooltip();
         });
     </script>
 }

diff --git a/TicketDesk/TicketDesk.Web.Client/Views/PushNotificationSettings/Index.cshtml b/TicketDesk/TicketDesk.Web.Client/Views/PushNotificationSettings/Index.cshtml
@@ -25,7 +25,6 @@
 {
     <script type="text/javascript">
         $(document).ready(function () {
-            $('[data-toggle="tooltip"]').tooltip();
             $('#useCurrentUrlButton').on('click', function () {
                 $('#siteRootUrl').val('@ViewBag.CurrentRootUrl');
             });

diff --git a/TicketDesk/TicketDesk.Web.Client/Views/Shared/_Layout.cshtml b/TicketDesk/TicketDesk.Web.Client/Views/Shared/_Layout.cshtml
@@ -42,17 +42,35 @@
             </script>
         }
     }
+
 </head>
 <body>
     <nav id="mainNav" class="navbar navbar-default " role="navigation">
         <div class="navbar-header">
             <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#main-menu-collapse">
+
                 <span class="sr-only">Toggle navigation</span>
                 <span class="icon-bar"></span>
                 <span class="icon-bar"></span>
                 <span class="icon-bar"></span>
             </button>
-            @Html.ActionLink(" ", "Index", "Home", new { area = "" }, new { @class = "navbar-brand pull-left" })
+
+            <div class="pull-right" style="margin: 0 5px;">
+
+                <a href="@Url.Action("Index", "TicketCenter", new {area = ""})"
+                   data-toggle="tooltip"
+                   data-placement="bottom"
+                   title="Ticket Center"
+                   class="@Html.IsActiveRoute("Index", "TicketCenter") btn btn-default navbar-btn hidden-sm hidden-md hidden-lg"><i class="fa fa-ticket"></i></a>
+                <a href="@Url.Action("New", "Ticket", new {area = ""})"
+                   data-toggle="tooltip"
+                   data-placement="bottom"
+                   title="New Ticket"
+                   class="@Html.IsActiveRoute("New", "Ticket") btn btn-default navbar-btn hidden-sm hidden-md hidden-lg "><i class="fa fa-plus"></i></a>
+            </div>
+            @Html.ActionLink(" ", "Index", "Home", new { area = "" }, new { @class = "navbar-brand" })
+
+
         </div>
         <div>
             <div id="main-menu-collapse" class="collapse navbar-collapse">
@@ -103,17 +121,23 @@
     </nav>
     <div class="body-content">
         @RenderBody()
-        <footer class="">
-            <p>TicketDesk 2.5 : &copy; @DateTime.Now.Year - Stephen M. Redd</p>
+        <footer>
+            <p class="text-muted">
+                <a href="https://github.com/NullDesk/TicketDesk">TicketDesk</a> v2.5 | &copy; 2008 - @DateTime.Now.Year | NullDesk Solutions (Stephen M. Redd)
+            </p>
         </footer>
     </div>
 
     @Scripts.Render("~/bundles/common")
     @RenderSection("scripts", required: false)
 
 
+    <script type="text/javascript">
+        $(document).ready(function () {
+            $('[data-toggle="tooltip"]').tooltip();
+        });
 
-
+    </script>
 
 
 </body>

diff --git a/TicketDesk/TicketDesk.Web.Client/Views/TicketCenter/Index.cshtml b/TicketDesk/TicketDesk.Web.Client/Views/TicketCenter/Index.cshtml
@@ -42,7 +42,7 @@
             $.ajaxSetup({ cache: false });
             ticketCenter.filters.setupFilterForm();
             ticketCenter.makeClicky();
-            $('[data-toggle="tooltip"]').tooltip();
+           
 
         });
 

diff --git a/TicketDesk/TicketDesk.Web.Identity/Migrations/Configuration.cs b/TicketDesk/TicketDesk.Web.Identity/Migrations/Configuration.cs
@@ -79,7 +79,7 @@ public static void InitializeStockUsers(TdIdentityContext context)
                 };
                 if (userManager.FindById("64165817-9cb5-472f-8bfb-6a35ca54be6a") == null)
                 {
-                    var adminRoles = new[] { "TdAdministrators", "TdHelpDeskUsers", "TdInternalUsers" };
+                    var adminRoles = new[] { "TdAdministrators"};
                     userManager.Create(admin, "123456");
 
                     foreach (var rname in adminRoles)

diff --git a/TicketDesk/TicketDesk.Web.Identity/Migrations/DemoIdentityDataManager.cs b/TicketDesk/TicketDesk.Web.Identity/Migrations/DemoIdentityDataManager.cs
@@ -52,8 +52,8 @@ public static void SetupDemoIdentityData(TdIdentityContext context)
             var users = new[] { admin, staff, reguser };
             var rolesNames = new Dictionary<string, string[]>
             {
-                {"[email protected]", new[] {"TdAdministrators", "TdHelpDeskUsers", "TdInternalUsers"}},
-                {"[email protected]", new[] {"TdHelpDeskUsers", "TdInternalUsers"}},
+                {"[email protected]", new[] {"TdAdministrators"}},
+                {"[email protected]", new[] {"TdHelpDeskUsers"}},
                 {"[email protected]", new[] {"TdInternalUsers"}}
             };
             foreach (var tdUser in users)

diff --git a/td25.png b/td25.png