From 423a45a3fb9ea7ae6bc8e7350d3ff0400dbda8f6 Mon Sep 17 00:00:00 2001 From: System Administrator Date: Thu, 28 Jan 2016 15:44:04 -0600 Subject: [PATCH 01/40] added sticky i hover popups. added a apply button at the top of the managebranch page. fixed the typo on sus page. --- webadmin/var/www/webadmin/SUS.php | 2 +- webadmin/var/www/webadmin/managebranch.php | 17 +++++++++++++---- webadmin/var/www/webadmin/scripts/ajax.js | 9 +++++++++ webadmin/var/www/webadmin/scripts/infoPanel.js | 5 ++--- webadmin/var/www/webadmin/theme/styles.css | 2 +- 5 files changed, 26 insertions(+), 9 deletions(-) diff --git a/webadmin/var/www/webadmin/SUS.php b/webadmin/var/www/webadmin/SUS.php index 587f0b6..10eb1cc 100644 --- a/webadmin/var/www/webadmin/SUS.php +++ b/webadmin/var/www/webadmin/SUS.php @@ -110,7 +110,7 @@ function validateField(fieldid, buttonid) getSetting("todoenrolled") != "true") { ?> Base URL - Base URL for the software update server (e.g. "https://sus.mycompany.corp") + Base URL for the software update server (e.g. "http://sus.mycompany.corp") " onKeyUp="validateField('baseurl', 'setbaseurl');" onChange="validateField('baseurl', 'setbaseurl');"/> diff --git a/webadmin/var/www/webadmin/managebranch.php b/webadmin/var/www/webadmin/managebranch.php index 0be2483..86e0d6d 100644 --- a/webadmin/var/www/webadmin/managebranch.php +++ b/webadmin/var/www/webadmin/managebranch.php @@ -1,4 +1,4 @@ -"; tableContents += ""; - tableContents += ""+pieces[0]+""; - tableContents += "\"Package"; + tableContents += ""+pieces[0]+""; + tableContents += "\"Package"; tableContents += ""+pieces[1]+""; tableContents += ""+pieces[2]+""; tableContents += ""; @@ -294,10 +294,19 @@ function filterPackages() +
+ +
+
+ + + +
+
diff --git a/webadmin/var/www/webadmin/scripts/ajax.js b/webadmin/var/www/webadmin/scripts/ajax.js index 52172a4..da8df96 100644 --- a/webadmin/var/www/webadmin/scripts/ajax.js +++ b/webadmin/var/www/webadmin/scripts/ajax.js @@ -22,3 +22,12 @@ function getPackageDetails(id) var result = http.responseText; return "
"+result+"
"; } + +function getPackageInfo(id) +{ + http = getHTTPObj(); + http.open("GET", "ajax.php?getprodinfo=true&id="+id, false); + http.send(); + return http.responseText; +} + diff --git a/webadmin/var/www/webadmin/scripts/infoPanel.js b/webadmin/var/www/webadmin/scripts/infoPanel.js index 3e86c9a..486532a 100644 --- a/webadmin/var/www/webadmin/scripts/infoPanel.js +++ b/webadmin/var/www/webadmin/scripts/infoPanel.js @@ -14,13 +14,12 @@ function browserObject(objid) } } -function CustomOver(text, id, id2) { +function CustomOver(text, title, id, id2) { var o1 = browserObject(id); var o2 = browserObject(id2); if (!o1 || !o2) { return; } - - return overlib(text, FOLLOWMOUSE, WIDTH, 100, BGCOLOR, "#1F448E", FGCOLOR, "#FFFFFF"); + return overlib(text, CAPTION, title, STICKY, WIDTH, 300, BGCOLOR, "#1F448E", FGCOLOR, "#FFFFFF"); } diff --git a/webadmin/var/www/webadmin/theme/styles.css b/webadmin/var/www/webadmin/theme/styles.css index 4e74751..470ec46 100644 --- a/webadmin/var/www/webadmin/theme/styles.css +++ b/webadmin/var/www/webadmin/theme/styles.css @@ -755,7 +755,7 @@ table { border-bottom: 1px solid #b5b3b4; border-top: 1px solid #b5b3b4; float: left; - width: 100%; + /* width: 100%; */ border-collapse: collapse; margin-bottom: 20px; } From 0b35716a73f217157af9c1c7f48438e64a16e97c Mon Sep 17 00:00:00 2001 From: Cole Goldsmith Date: Mon, 1 Feb 2016 13:41:41 -0600 Subject: [PATCH 02/40] First commit of new UI prototype --- webadmin/var/www/webadmin/about.php | 81 +- webadmin/var/www/webadmin/inc/footer.php | 14 +- webadmin/var/www/webadmin/inc/header.php | 148 +- .../var/www/webadmin/scripts/bootstrap.min.js | 7 + .../webadmin/scripts/jquery/jquery-2.2.0.js | 9831 +++++++++++++++++ .../var/www/webadmin/scripts/jquery/jquery.js | 7179 ------------ .../var/www/webadmin/theme/bootstrap.min.css | 6 + .../www/webadmin/theme/bootstrap.min.css.map | 1 + webadmin/var/www/webadmin/theme/styles.css | 119 +- 9 files changed, 10068 insertions(+), 7318 deletions(-) create mode 100644 webadmin/var/www/webadmin/scripts/bootstrap.min.js create mode 100755 webadmin/var/www/webadmin/scripts/jquery/jquery-2.2.0.js delete mode 100644 webadmin/var/www/webadmin/scripts/jquery/jquery.js create mode 100644 webadmin/var/www/webadmin/theme/bootstrap.min.css create mode 100644 webadmin/var/www/webadmin/theme/bootstrap.min.css.map diff --git a/webadmin/var/www/webadmin/about.php b/webadmin/var/www/webadmin/about.php index 5b6316b..4228b42 100644 --- a/webadmin/var/www/webadmin/about.php +++ b/webadmin/var/www/webadmin/about.php @@ -8,25 +8,11 @@ include "inc/header.php"; ?> - -

About

-

Open Source Acknowledgments


-
+

Reposado

https://github.com/wdas/reposado/


@@ -113,7 +99,7 @@

Additional License Information


-
+

Copyright (C) 2015, JAMF Software, LLC
All rights reserved.

@@ -121,33 +107,46 @@ Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:

+
+
+ +
+
+ 1. Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. +
+
+ 2. Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. +
+
+ 3. Neither the name of the JAMF Software, LLC nor the names of its contributors + may be used to endorse or promote products derived from this software without + specific prior written permission. +
+
-
    -
  • Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer.
  • -
    -
  • Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution.
  • -
    -
  • Neither the name of the JAMF Software, LLC nor the names of its contributors - may be used to endorse or promote products derived from this software without - specific prior written permission.
  • -

- -

- THIS SOFTWARE IS PROVIDED BY JAMF SOFTWARE, LLC "AS IS" AND ANY EXPRESS OR IMPLIED - WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY - AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JAMF SOFTWARE, LLC - BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE - OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. -

-
+
+ +
+
+

+ THIS SOFTWARE IS PROVIDED BY JAMF SOFTWARE, LLC "AS IS" AND ANY EXPRESS OR IMPLIED + WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY + AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JAMF SOFTWARE, LLC + BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE + OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + POSSIBILITY OF SUCH DAMAGE. +

+
+
+ + \ No newline at end of file diff --git a/webadmin/var/www/webadmin/inc/footer.php b/webadmin/var/www/webadmin/inc/footer.php index 05733e2..349e952 100644 --- a/webadmin/var/www/webadmin/inc/footer.php +++ b/webadmin/var/www/webadmin/inc/footer.php @@ -1,15 +1,5 @@ -
- - - -
- - - - - - - + + diff --git a/webadmin/var/www/webadmin/inc/header.php b/webadmin/var/www/webadmin/inc/header.php index 0bef763..e176bb8 100644 --- a/webadmin/var/www/webadmin/inc/header.php +++ b/webadmin/var/www/webadmin/inc/header.php @@ -17,10 +17,18 @@ <?php echo (isset($title) ? $title : "NetBoot/SUS/LDAP Proxy Server") ?> + + + + - + + + + + @@ -30,98 +38,74 @@ - - - - - - - - - - - - id="dual-navigation-page"> - -
- -
- - - -
- - - - -
- Click -
- Restart - Shut Down -
- Log Out -
- Handle +
- - + +
-