From af8af9b2415d00d0daef5c855d1f1d3c1fd84f0f Mon Sep 17 00:00:00 2001 From: Mike Koch Date: Mon, 15 Aug 2016 16:35:41 -0400 Subject: [PATCH] Calendar uses new UI --- admin/calendar.php | 105 ++++++++++++++++++++++++++-------------- css/displays.css | 13 +++++ css/positions.css | 7 +++ inc/headerAdmin.inc.php | 2 + 4 files changed, 92 insertions(+), 35 deletions(-) create mode 100644 css/displays.css create mode 100644 css/positions.css diff --git a/admin/calendar.php b/admin/calendar.php index 314ae6a4..a1182dcf 100644 --- a/admin/calendar.php +++ b/admin/calendar.php @@ -37,6 +37,7 @@ define('PAGE_TITLE', 'ADMIN_CALENDAR'); require(HESK_PATH . 'hesk_settings.inc.php'); require(HESK_PATH . 'inc/common.inc.php'); require(HESK_PATH . 'inc/admin_functions.inc.php'); +require(HESK_PATH . 'inc/mail_functions.inc.php'); hesk_load_database_functions(); hesk_session_start(); @@ -75,51 +76,85 @@ require_once(HESK_PATH . 'inc/headerAdmin.inc.php'); /* Print main manage users page */ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php'); ?> - -
-
-
-
-

+
+
+
+
+
+

+ +

+
+ +
+
+
+
+ + +
+
    + +
  • +
    + +
    +
    + +
    +
  • + +
+
-
-
- - +
+
+

+ +

+
+ +
-
    - -
  • -
    - +
    +
    +
    + +
    +
    +
    -
    - +
    +
    -
  • - -
+
+
-
-
-

-
-
-
-
- -
-
- -
-
- +
+
+
+

+ +

+
+
+
+
+
+
+
@@ -138,7 +173,7 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
-
+
diff --git a/css/displays.css b/css/displays.css new file mode 100644 index 00000000..6a311eb7 --- /dev/null +++ b/css/displays.css @@ -0,0 +1,13 @@ +.hide-on-overflow { + overflow: hidden; + text-overflow: ellipsis; +} + +.no-wrap { + white-space: nowrap; +} + +.event-category { + border-radius: 4px; + padding: 5px; +} \ No newline at end of file diff --git a/css/positions.css b/css/positions.css new file mode 100644 index 00000000..70205742 --- /dev/null +++ b/css/positions.css @@ -0,0 +1,7 @@ +.move-down-20 { + margin-top: 20px; +} + +.move-right-20 { + margin-left: 20px; +} \ No newline at end of file diff --git a/inc/headerAdmin.inc.php b/inc/headerAdmin.inc.php index faec99cd..dfd117a3 100644 --- a/inc/headerAdmin.inc.php +++ b/inc/headerAdmin.inc.php @@ -60,6 +60,8 @@ $modsForHesk_settings = mfh_getSettings(); + +