diff --git a/wp-content/themes/clarity/inc/admin/plugins/polls.php b/wp-content/themes/clarity/inc/admin/plugins/polls.php index 792fda214..bcedaa86e 100644 --- a/wp-content/themes/clarity/inc/admin/plugins/polls.php +++ b/wp-content/themes/clarity/inc/admin/plugins/polls.php @@ -6,31 +6,23 @@ */ // Check if plugin is activated -if ( in_array( 'totalpoll-lite/totalpoll.php', apply_filters( 'active_plugins', get_option( 'active_plugins' ) ) ) ) : - - /** - * BUG fix we have to Load Tiny MCE editor as this plugin needs it and throws a JS error without it. - */ - - add_action( 'admin_enqueue_scripts', 'load_tinymce' ); - - function load_tinymce() { - wp_enqueue_script( 'tinymce', 'https://cdnjs.cloudflare.com/ajax/libs/tinymce/4.5.6/tinymce.min.js' ); - } +if ( in_array( 'totalpoll-lite/plugin.php', apply_filters( 'active_plugins', get_option( 'active_plugins' ) ) ) ) : /** * Remove (for editors) options and settings not needed. */ - add_action( 'do_meta_boxes', 'remove_poll_meta_boxes_and_tabs' ); + add_action( 'admin_menu', 'remove_poll_meta_boxes_and_tabs' ); // Remove everything that an editor doesn't need to see. function remove_poll_meta_boxes_and_tabs() { if ( ! current_user_can( 'administrator' ) ) { - echo ''; - echo ''; - remove_meta_box( 'postimagediv', 'poll', 'side' ); - remove_meta_box( 'postexcerpt', 'poll', 'normal' ); + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; } } @@ -39,8 +31,13 @@ function remove_poll_meta_boxes_and_tabs() { function remove_menu_links() { if ( ! current_user_can( 'administrator' ) ) { - remove_submenu_page( 'edit.php?post_type=poll', 'tp-about' ); - remove_submenu_page( 'edit.php?post_type=poll', 'tp-support' ); + remove_submenu_page( 'edit.php?post_type=poll', 'upgrade-to-pro' ); + remove_submenu_page( 'edit.php?post_type=poll', 'options' ); + remove_submenu_page( 'edit.php?post_type=poll', 'extensions' ); + remove_submenu_page( 'edit.php?post_type=poll', 'templates' ); + remove_submenu_page( 'edit.php?post_type=poll', 'log' ); + remove_submenu_page( 'edit.php?post_type=poll', 'insights' ); + remove_submenu_page( 'edit.php?post_type=poll', 'entries' ); } } diff --git a/wp-content/themes/clarity/inc/admin/users/add-agency-admin.php b/wp-content/themes/clarity/inc/admin/users/add-agency-admin.php index f4e095b98..68190ae3c 100644 --- a/wp-content/themes/clarity/inc/admin/users/add-agency-admin.php +++ b/wp-content/themes/clarity/inc/admin/users/add-agency-admin.php @@ -15,7 +15,7 @@ $capabilities = array( - 'news' => true, + 'news' => true, // management 'edit_dashboard' => true, 'homepage_all_access' => true, @@ -161,6 +161,12 @@ 'read_private_regional_pages' => true, 'publish_regional_news' => true, 'publish_regional_pages' => true, + + // allow greater permissions managing polls plugin + 'edit_polls' => true, + 'edit_poll' => true, + 'create_polls' => true, + 'publish_polls' => true, ); diff --git a/wp-content/themes/clarity/src/components/c-polls/style.styl b/wp-content/themes/clarity/src/components/c-polls/style.styl index 3123ba48e..aaae0f320 100644 --- a/wp-content/themes/clarity/src/components/c-polls/style.styl +++ b/wp-content/themes/clarity/src/components/c-polls/style.styl @@ -9,7 +9,7 @@ // Needs to be outside of this specific component's scope so it is global and will affect wherever the shortcode is used on the site. .totalpoll-button, .totalpoll-button-primary, .totalpoll-button-vote { cursor: pointer !important; - font-size: $innerCore !important; + font-size: $outerCore !important; box-shadow: 0 2px 0 #003518 !important; padding: 14px 24px 10px !important; text-decoration: none !important; @@ -19,6 +19,20 @@ border-radius: 0 !important; } +.totalpoll-container, .totalpoll-button, .totalpoll-buttons-results { + color: white !important; +} + +.totalpoll-question-choices-item-checked .totalpoll-question-choices-item-control, .totalpoll-question-choices-item-checked:hover .totalpoll-question-choices-item-control, .totalpoll-question-choices-item-checked:focus .totalpoll-question-choices-item-control { + background-color: $defaultAgencyColour !important; + border: none; +} + +.totalpoll-message-error { + color: white !important; + background-color: #932214 !important; +} + .totalpoll-choices { border: 2px solid $border !important; } @@ -42,3 +56,11 @@ h4 { font-size: $mantle !important; } + +.totalpoll-question-choices-item-votes-text { + font-size: $outerCore !important; +} + +.totalpoll-question-content, .totalpoll-question-choices-item-label{ + font-size: $outerCore !important; +} \ No newline at end of file diff --git a/wp-content/themes/clarity/src/components/c-polls/view.php b/wp-content/themes/clarity/src/components/c-polls/view.php index c8ad8735f..8ad106d17 100644 --- a/wp-content/themes/clarity/src/components/c-polls/view.php +++ b/wp-content/themes/clarity/src/components/c-polls/view.php @@ -1,13 +1,10 @@ - + -
- -
-
+