From 0f9e7547eefcc9b2c1d36a48b427e21395352f51 Mon Sep 17 00:00:00 2001 From: ultimatemember Date: Sun, 21 Dec 2014 17:47:37 +0200 Subject: [PATCH] Follow up: Welcome tab --- admin/assets/css/um-admin-misc.css | 15 ++ admin/assets/css/um-admin-redux.css | 3 +- .../ReduxFramework/ReduxCore/framework.php | 13 +- admin/core/um-admin-enqueue.php | 2 +- admin/core/um-admin-redux.php | 18 ++- admin/templates/about.php | 134 ++++++++---------- admin/templates/about_header.php | 3 +- admin/templates/start.php | 1 - admin/um-admin-init.php | 4 - assets/css/um-styles.css | 14 ++ core/um-actions-wpadmin.php | 103 +++++++++++++- i18n/ultimatemember-en_US.mo | Bin 582 -> 0 bytes {i18n => i18ns}/ultimatemember-en_US.po | 0 um-init.php | 2 +- 14 files changed, 218 insertions(+), 94 deletions(-) delete mode 100644 i18n/ultimatemember-en_US.mo rename {i18n => i18ns}/ultimatemember-en_US.po (100%) diff --git a/admin/assets/css/um-admin-misc.css b/admin/assets/css/um-admin-misc.css index 11e05f7d..4fb92b1d 100644 --- a/admin/assets/css/um-admin-misc.css +++ b/admin/assets/css/um-admin-misc.css @@ -2,6 +2,21 @@ - Welcome */ +.um-about-wrap * { + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; +} + +.um-about-wrap a.um-about-icon { + margin: 0 0 0 15px !important; + padding: 0 !important; + text-decoration: none !important; + color: #777 !important; + font-size: 22px !important; +} + +.um-about-wrap a.um-about-icon:hover {color: #3ba1da !important} + .um-badge { color: #fff; background: none !important; diff --git a/admin/assets/css/um-admin-redux.css b/admin/assets/css/um-admin-redux.css index 32bbac04..15ee00c4 100644 --- a/admin/assets/css/um-admin-redux.css +++ b/admin/assets/css/um-admin-redux.css @@ -70,9 +70,10 @@ #redux-share {margin-top: 11px !important} #redux-share a { + margin: 0 15px 0 0 !important; + text-decoration: none !important; color: #777 !important; font-size: 22px !important; - margin: 0 15px 0 0 !important; } #redux-share a:hover {color: #3ba1da !important} diff --git a/admin/core/lib/ReduxFramework/ReduxCore/framework.php b/admin/core/lib/ReduxFramework/ReduxCore/framework.php index 9614712b..0e4360ab 100644 --- a/admin/core/lib/ReduxFramework/ReduxCore/framework.php +++ b/admin/core/lib/ReduxFramework/ReduxCore/framework.php @@ -188,6 +188,9 @@ $this->slug = 'ultimatemember'; + $this->about_tabs['about'] = 'About'; + $this->about_tabs['start'] = 'Getting Started'; + // Disregard WP AJAX 'heartbeat'call. Why waste resources? if ( isset( $_POST ) && isset( $_POST['action'] ) && $_POST['action'] == 'heartbeat' ) { @@ -1299,9 +1302,7 @@ * @return void */ public function _options_page() { - - $um_admin = new UM_Admin_API(); - + $this->import_export->in_field(); if ( $this->args['menu_type'] == 'submenu' ) { @@ -1310,7 +1311,7 @@ add_menu_page( __('Ultimate Member', $this->slug), __('Ultimate Member', $this->slug), 'manage_options', $this->slug, array(&$this, 'admin_page'), 'dashicons-admin-users', '50.78578'); - foreach( $um_admin->about_tabs as $k => $tab ) { + foreach( $this->about_tabs as $k => $tab ) { add_submenu_page( '_'. $k . '_um', sprintf(__('%s | Ultimate Member', $this->slug), $tab), sprintf(__('%s | Ultimate Member', $this->slug), $tab), 'manage_options', $this->slug . '-' . $k, array(&$this, 'admin_page') ); @@ -4317,9 +4318,7 @@ } public function admin_page(){ - - $um_admin = new UM_Admin_API(); - + $page = $_REQUEST['page']; if ( $page == 'ultimatemember' ) { diff --git a/admin/core/um-admin-enqueue.php b/admin/core/um-admin-enqueue.php index 5b5d27ba..a7475c8e 100644 --- a/admin/core/um-admin-enqueue.php +++ b/admin/core/um-admin-enqueue.php @@ -14,7 +14,7 @@ class UM_Admin_Enqueue { add_filter('enter_title_here', array(&$this, 'enter_title_here') ); - add_filter('admin_footer_text', array(&$this, 'admin_footer_text') ); + add_filter('admin_footer_text', array(&$this, 'admin_footer_text'), 1111 ); } diff --git a/admin/core/um-admin-redux.php b/admin/core/um-admin-redux.php index a9cee43a..831df42d 100644 --- a/admin/core/um-admin-redux.php +++ b/admin/core/um-admin-redux.php @@ -115,22 +115,32 @@ // SOCIAL ICONS -> Setup custom links in the footer for quick links in your panel footer icons. $this->args['share_icons'][] = array( - 'url' => 'https://facebook.com/ultimatememberplugin', + 'url' => '', + 'title' => 'GitHub Repository', + 'icon' => 'um-icon-github' + ); + $this->args['share_icons'][] = array( + 'url' => '', + 'title' => 'Roadmap', + 'icon' => 'um-icon-trello' + ); + $this->args['share_icons'][] = array( + 'url' => '', 'title' => 'Like us on Facebook', 'icon' => 'um-icon-facebook' ); $this->args['share_icons'][] = array( - 'url' => 'https://twitter.com/umplugin', + 'url' => '', 'title' => 'Follow us on Twitter', 'icon' => 'um-icon-twitter' ); $this->args['share_icons'][] = array( - 'url' => 'https://plus.google.com/+UltimateMember/', + 'url' => '', 'title' => 'Follow us on Google+', 'icon' => 'um-icon-google-plus' ); $this->args['share_icons'][] = array( - 'url' => 'https://youtube.com/user/umplugin', + 'url' => '', 'title' => 'We\'re on YouTube', 'icon' => 'um-icon-youtube-alt' ); diff --git a/admin/templates/about.php b/admin/templates/about.php index 9cb27749..e7fbc110 100644 --- a/admin/templates/about.php +++ b/admin/templates/about.php @@ -1,97 +1,85 @@ -
- -
-

Introducing Twenty Fifteen

-
- -
- -
-
-

Our newest default theme, Twenty Fifteen, is a blog-focused theme designed for clarity.

-

Twenty Fifteen has flawless language support, with help from Google’s Noto font family.

-

The straightforward typography is readable on any screen size.

-

Your content always takes center stage, whether viewed on a phone, tablet, laptop, or desktop computer.

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

Distraction-free writing

+

Introducing Ultimate Member

-
- -
-

Just write.

-

Sometimes, you just need to concentrate on putting your thoughts into words. Try turning on distraction-free writing mode. When you start typing, all the distractions will fade away, letting you focus solely on your writing. All your editing tools instantly return when you need them.

-
-
- -
- -
-

The Finer Points

- -
-
-

Choose a language

-

Right now, WordPress 4.1 is already translated into 40 languages, with more always in progress. You can switch to any translation on the General Settings screen.

-
- -
-

Vine embeds

-

Embedding videos from Vine is as simple as pasting a URL onto its own line in a post. See the full list of supported embeds.

-
- -
-

Log out everywhere

-

If you’ve ever worried you forgot to sign out from a shared computer, you can now go to your profile and log out everywhere.

-
- -
-

Plugin recommendations

-

The plugin installer suggests plugins for you to try. Recommendations are based on the plugins you and other users have installed.

-
+ +

Create beautiful community websites with WordPress!

+ +

We'd like to thank you for installing Ultimate Member and we hope you enjoy using the plugin on your site. We created Ultimate Member with the aim of building a lightweight and powerful plugin that makes it extremely easy to make community and membership sites with WordPress.

+ +

We have big plans for Ultimate Member and we hope you will join us on our journey to creating the most popular community/membership plugin. If you’d like to get involved in improving the plugin you can join our community forum and discuss Ultimate Member with other users, provide feedback and make suggestions on how to improve the plugin. We also have an official GitHub repository where you can contribute directly to the plugin.

-
-

Under the Hood

- -
+ +

Key Features

+ +
+
-

Complex Queries

-

Metadata, date, and term queries now support advanced conditional logic, like nested clauses and multiple operators — A AND ( B OR C ).

- -

Customizer API

-

Expanded JavaScript APIs in the customizer enable a new media experience as well as dynamic and contextual controls, sections, and panels.

+

Front-end Registration & Login

+

Create unlimited, custom frontend registration & login forms easily with our drag-and-drop form builder.

+ +
+

User Profiles

+

Instant front-end user profiles that look beautiful. Allow users to view/edit profile from frontend, view each other's profile and more.

+
+
-

<title> tags in themes

-

add_theme_support( 'title-tag' ) tells WordPress to handle the complexities of document titles.

- -

Developer Reference

-

Continued improvements to inline code documentation have made the developer reference more complete than ever.

+

Membership Levels

+

Create unlimited, custom membership levels and set up permissions for each membership level easily.

+ +
+

Profile Fields

+

Create unlimited profile fields from image and file upload to ratings, checkboxes, and more, plus support for conditional fields

+
+ +
+

Member Directories

+

Create member directories with our directory creator and make them show the member levels you want.

+
+ +
+

Content Restriction

+

Global and individual (per page/post) content restriction settings have been built to give you flexibility on what content should be visible, and who exactly can see it.

+
+ +
+

Conditional Menus

+

Show different menu links to logged in users, logged out users, and individual member levels with our conditional menu feature.

+
+ +
+

Mobile Adaptive

+

Ultimate Member has been built with a mobile adaptive approach meaning the front-end features have a different layout depending on the device size.

+
+ +
+

Advanced Form Builder

+

Use our advanced drag and drop form builder to easily create unique registration, login and profiles with multiple-column support.

+
+
Go to Plugin Dashboard → + +
+ + args['share_icons'] as $k => $arr ) { ?> + +
+
diff --git a/admin/templates/about_header.php b/admin/templates/about_header.php index 97f0cbc7..8f5a61c2 100644 --- a/admin/templates/about_header.php +++ b/admin/templates/about_header.php @@ -1,3 +1,4 @@ +

Welcome to Ultimate Member

@@ -7,7 +8,7 @@

- about_tabs as $k => $tab ) { + about_tabs as $k => $tab ) { if ( $k == $template ) { $active = 'nav-tab-active'; diff --git a/admin/templates/start.php b/admin/templates/start.php index 0c5ec57a..1bdef5b3 100644 --- a/admin/templates/start.php +++ b/admin/templates/start.php @@ -1,4 +1,3 @@ -
diff --git a/admin/um-admin-init.php b/admin/um-admin-init.php index 70295881..4e725e2c 100644 --- a/admin/um-admin-init.php +++ b/admin/um-admin-init.php @@ -15,10 +15,6 @@ class UM_Admin_API { require_once( um_path . 'admin/core/um-admin-redux.php' ); } - - $this->about_tabs['about'] = 'About'; - $this->about_tabs['start'] = 'Getting Started'; - } /*** diff --git a/assets/css/um-styles.css b/assets/css/um-styles.css index b6bd28c7..0c4f535a 100644 --- a/assets/css/um-styles.css +++ b/assets/css/um-styles.css @@ -88,12 +88,26 @@ .um-col-133 {float: right;width: 30%;min-height: 1px;height: auto;} +#wp-admin-bar-um_parent .ab-icon:before{ + font-family: "dashicons" !important; + content: "\f110" !important; + top: 3px !important; +} + +@media screen and (max-width: 782px) { + #wpadminbar li#wp-admin-bar-um_parent { + display: block; + } +} + /* - Font Icons */ .um-raty i {font-size: 26px} + .um-field-half .um-raty i {font-size: 21px} + .um-field-tri .um-raty i {font-size: 21px} .um-button i { diff --git a/core/um-actions-wpadmin.php b/core/um-actions-wpadmin.php index 84cd4770..6ab7f28d 100644 --- a/core/um-actions-wpadmin.php +++ b/core/um-actions-wpadmin.php @@ -22,4 +22,105 @@ return true; } } - add_filter( 'show_admin_bar' , 'um_control_admin_bar'); \ No newline at end of file + add_filter( 'show_admin_bar' , 'um_control_admin_bar'); + + /*** + *** @show admin bar menu for plugin + ***/ + add_action('admin_bar_menu', 'um_plugin_admin_bar', 1000); + function um_plugin_admin_bar() { + + global $wp_admin_bar; + + if( !is_super_admin() || !is_admin_bar_showing() || is_admin() ) return; + + $args = array( + 'id' => 'um_parent', + 'title' => 'Ultimate Member', + 'href' => admin_url('admin.php?page=ultimatemember-about'), + 'meta' => array( ) + ); + + $wp_admin_bar->add_node( $args ); + + $args = array( + 'parent' => 'um_parent', + 'id' => 'um_sub1', + 'title' => 'About this plugin', + 'href' => admin_url('admin.php?page=ultimatemember-about'), + 'meta' => array( ) + ); + + $wp_admin_bar->add_node( $args ); + + $args = array( + 'parent' => 'um_parent', + 'id' => 'um_sub2', + 'title' => 'Getting Started', + 'href' => admin_url('admin.php?page=ultimatemember-start'), + 'meta' => array( ) + ); + + $wp_admin_bar->add_node( $args ); + + $args = array( + 'parent' => 'um_parent', + 'id' => 'um_sub3', + 'title' => 'Dashboard', + 'href' => admin_url('admin.php?page=ultimatemember'), + 'meta' => array( ) + ); + + $wp_admin_bar->add_node( $args ); + + $args = array( + 'parent' => 'um_parent', + 'id' => 'um_sub4', + 'title' => 'Settings', + 'href' => admin_url('admin.php?page=um_options'), + 'meta' => array( ) + ); + + $wp_admin_bar->add_node( $args ); + + $args = array( + 'parent' => 'um_parent', + 'id' => 'um_sub5', + 'title' => 'Forms', + 'href' => admin_url('edit.php?post_type=um_form'), + 'meta' => array( ) + ); + + $wp_admin_bar->add_node( $args ); + + $args = array( + 'parent' => 'um_parent', + 'id' => 'um_sub6', + 'title' => 'Member Levels', + 'href' => admin_url('edit.php?post_type=um_role'), + 'meta' => array( ) + ); + + $wp_admin_bar->add_node( $args ); + + $args = array( + 'parent' => 'um_parent', + 'id' => 'um_sub7', + 'title' => 'Member Directories', + 'href' => admin_url('edit.php?post_type=um_directory'), + 'meta' => array( ) + ); + + $wp_admin_bar->add_node( $args ); + + $args = array( + 'parent' => 'um_parent', + 'id' => 'um_sub8', + 'title' => 'Members', + 'href' => admin_url('users.php'), + 'meta' => array( ) + ); + + $wp_admin_bar->add_node( $args ); + + } \ No newline at end of file diff --git a/i18n/ultimatemember-en_US.mo b/i18n/ultimatemember-en_US.mo deleted file mode 100644 index 84427fb0152d975e41c85f4de62b8b59a1ebf45e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 582 zcmaJ-!EV$r5ZwZ&h!bZHgTw(uCrv`pE?yRuZd+8bE23_;>TTsFL)OT#Bin)YL-@UZ zODB!gJ%AYL$sYU7%zJb9;@O`O#~$M)<2B%!mnh=4Q_Hvl?sr?<2dD?A;n|qsg+?XAl^NG zqubxsReqs-5U|-yHx%W%b5i4(b&VHbcom%bSvG~?I(uW_)eO?N(_NpH?OaLoK{IdX TLGhoneypot = 'request'; - + } /***