diff --git a/admin/hooks/save-post.php b/admin/hooks/save-post.php index 74011077..22bcc173 100644 --- a/admin/hooks/save-post.php +++ b/admin/hooks/save-post.php @@ -36,12 +36,18 @@ function sportspress_save_post( $post_id ) { // Update staff array sportspress_update_post_meta_recursive( $post_id, 'sp_staff', sportspress_array_value( $_POST, 'sp_staff', array() ) ); + // Update format + update_post_meta( $post_id, 'sp_format', sportspress_array_value( $_POST, 'sp_format', 'league' ) ); + // Update league taxonomy wp_set_post_terms( $post_id, sportspress_array_value( $_POST, 'sp_league', 0 ), 'sp_league' ); // Update season taxonomy wp_set_post_terms( $post_id, sportspress_array_value( $_POST, 'sp_season', 0 ), 'sp_season' ); + // Update tournament taxonomy + wp_set_post_terms( $post_id, sportspress_array_value( $_POST, 'sp_tournament', 0 ), 'sp_tournament' ); + // Update venue taxonomy wp_set_post_terms( $post_id, sportspress_array_value( $_POST, 'sp_venue', 0 ), 'sp_venue' ); @@ -153,6 +159,9 @@ function sportspress_save_post( $post_id ) { // Update team array update_post_meta( $post_id, 'sp_team', sportspress_array_value( $_POST, 'sp_team', array() ) ); + // Update format + update_post_meta( $post_id, 'sp_format', sportspress_array_value( $_POST, 'sp_format', 'list' ) ); + // Update league taxonomy wp_set_post_terms( $post_id, sportspress_array_value( $_POST, 'sp_league', 0 ), 'sp_league' ); diff --git a/admin/post-types/event.php b/admin/post-types/event.php index 94790f0b..d0d694d1 100644 --- a/admin/post-types/event.php +++ b/admin/post-types/event.php @@ -47,6 +47,7 @@ function sportspress_event_meta_init( $post ) { remove_meta_box( 'sp_seasondiv', 'sp_event', 'side' ); add_meta_box( 'submitdiv', __( 'Event', 'sportspress' ), 'post_submit_meta_box', 'sp_event', 'side', 'high' ); + add_meta_box( 'sp_formatdiv', __( 'Format', 'sportspress' ), 'sportspress_event_format_meta', 'sp_event', 'side', 'high' ); add_meta_box( 'sp_detailsdiv', __( 'Details', 'sportspress' ), 'sportspress_event_details_meta', 'sp_event', 'side', 'high' ); add_meta_box( 'sp_teamdiv', __( 'Teams', 'sportspress' ), 'sportspress_event_team_meta', 'sp_event', 'side', 'default' ); if ( sizeof( $teams ) > 0 ) @@ -59,42 +60,75 @@ function sportspress_event_meta_init( $post ) { add_meta_box( 'sp_articlediv', __( 'Article', 'sportspress' ), 'sportspress_event_article_meta', 'sp_event', 'normal', 'high' ); } +function sportspress_event_format_meta( $post ) { + $format = get_post_meta( $post->ID, 'sp_format', true ); + ?> +
+ > +
> +
> +
+
+ ID, 'sp_type', null ); $league_id = sportspress_get_the_term_id( $post->ID, 'sp_league', 0 ); $season_id = sportspress_get_the_term_id( $post->ID, 'sp_season', 0 ); + $tournament_id = sportspress_get_the_term_id( $post->ID, 'sp_tournament', 0 ); $venue_id = sportspress_get_the_term_id( $post->ID, 'sp_venue', 0 ); ?>
-

-

- 'sp_league', - 'name' => 'sp_league', - 'selected' => $league_id, - 'values' => 'term_id', - 'show_option_none' => __( '-- Not set --', 'sportspress' ), - ); - if ( ! sportspress_dropdown_taxonomies( $args ) ): - sportspress_taxonomy_adder( 'sp_league', 'sp_team', __( 'Add New', 'sportspress' ) ); - endif; - ?> -

-

-

- 'sp_season', - 'name' => 'sp_season', - 'selected' => $season_id, - 'values' => 'term_id', - 'show_option_none' => __( '-- Not set --', 'sportspress' ), - ); - if ( ! sportspress_dropdown_taxonomies( $args ) ): - sportspress_taxonomy_adder( 'sp_season', 'sp_team', __( 'Add New', 'sportspress' ) ); - endif; - ?> -

+
+

+

+ 'sp_league', + 'name' => 'sp_league', + 'selected' => $league_id, + 'values' => 'term_id', + 'show_option_none' => __( '-- Not set --', 'sportspress' ), + ); + if ( ! sportspress_dropdown_taxonomies( $args ) ): + sportspress_taxonomy_adder( 'sp_league', 'sp_team', __( 'Add New', 'sportspress' ) ); + endif; + ?> +

+

+

+ 'sp_season', + 'name' => 'sp_season', + 'selected' => $season_id, + 'values' => 'term_id', + 'show_option_none' => __( '-- Not set --', 'sportspress' ), + ); + if ( ! sportspress_dropdown_taxonomies( $args ) ): + sportspress_taxonomy_adder( 'sp_season', 'sp_team', __( 'Add New', 'sportspress' ) ); + endif; + ?> +

+
+
+

+

+ 'sp_tournament', + 'name' => 'sp_tournament', + 'selected' => $tournament_id, + 'values' => 'term_id', + 'show_option_none' => __( '-- Not set --', 'sportspress' ), + ); + if ( ! sportspress_dropdown_taxonomies( $args ) ): + sportspress_taxonomy_adder( 'sp_tournament', 'sp_team', __( 'Add New', 'sportspress' ) ); + endif; + ?> +

+

'', + 'sp_datetime' => '', 'title' => __( 'Event', 'sportspress' ), 'sp_team' => __( 'Teams', 'sportspress' ), 'sp_league' => __( 'League', 'sportspress' ), 'sp_season' => __( 'Season', 'sportspress' ), 'sp_venue' => __( 'Venue', 'sportspress' ), - 'sp_datetime' => '', 'sp_views' => __( 'Views', 'sportspress' ), ); return $columns; @@ -225,4 +259,4 @@ function sportspress_event_edit_sortable_columns( $columns ) { $columns['sp_datetime'] = 'sp_datetime'; return $columns; } -add_filter( 'manage_edit-sp_event_sortable_columns', 'sportspress_event_edit_sortable_columns' ); +//add_filter( 'manage_edit-sp_event_sortable_columns', 'sportspress_event_edit_sortable_columns' ); diff --git a/admin/post-types/list.php b/admin/post-types/list.php index 7d92e72f..36de7749 100644 --- a/admin/post-types/list.php +++ b/admin/post-types/list.php @@ -47,16 +47,28 @@ function sportspress_list_meta_init( $post ) { remove_meta_box( 'sp_seasondiv', 'sp_list', 'side' ); remove_meta_box( 'sp_leaguediv', 'sp_list', 'side' ); - add_meta_box( 'sp_playerdiv', __( 'Players', 'sportspress' ), 'sportspress_list_player_meta', 'sp_list', 'side', 'high' ); + add_meta_box( 'sp_formatdiv', __( 'Format', 'sportspress' ), 'sportspress_list_format_meta', 'sp_list', 'side', 'high' ); + add_meta_box( 'sp_detailsdiv', __( 'Details', 'sportspress' ), 'sportspress_list_details_meta', 'sp_list', 'side', 'high' ); if ( $players && $players != array(0) ): add_meta_box( 'sp_statsdiv', __( 'Player List', 'sportspress' ), 'sportspress_list_stats_meta', 'sp_list', 'normal', 'high' ); endif; - add_meta_box( 'sp_detailsdiv', __( 'Details', 'sportspress' ), 'sportspress_list_details_meta', 'sp_list', 'normal', 'high' ); + add_meta_box( 'sp_descriptiondiv', __( 'Description', 'sportspress' ), 'sportspress_list_description_meta', 'sp_list', 'normal', 'high' ); } -function sportspress_list_player_meta( $post ) { +function sportspress_list_format_meta( $post ) { + $format = get_post_meta( $post->ID, 'sp_format', true ); + ?> +

+ > +
> +
+
+ ID, 'sp_league', 0 ); $season_id = sportspress_get_the_term_id( $post->ID, 'sp_season', 0 ); $team_id = get_post_meta( $post->ID, 'sp_team', true ); @@ -151,6 +163,6 @@ function sportspress_list_stats_meta( $post ) { sportspress_nonce(); } -function sportspress_list_details_meta( $post ) { +function sportspress_list_description_meta( $post ) { wp_editor( $post->post_content, 'content' ); } diff --git a/assets/css/admin.css b/assets/css/admin.css index 5e321ba7..cc0d86c4 100644 --- a/assets/css/admin.css +++ b/assets/css/admin.css @@ -40,15 +40,81 @@ .sp-icon-megaphone:before { content: "\f155"; } +.sp-icon-smile:before { + content: "\f328"; +} +.sp-icon-trophy:before { + content: "\f313"; +} #adminmenu #toplevel_page_sportspress .menu-icon-generic div.wp-menu-image:before, #adminmenu #menu-posts-sp_event .menu-icon-sp_event div.wp-menu-image:before, #adminmenu #menu-posts-sp_team .menu-icon-sp_team div.wp-menu-image:before, #adminmenu #menu-posts-sp_player .menu-icon-sp_player div.wp-menu-image:before, -#adminmenu #menu-posts-sp_sponsor .menu-icon-sp_sponsor div.wp-menu-image:before { +#adminmenu #menu-posts-sp_sponsor .menu-icon-sp_sponsor div.wp-menu-image:before, +.post-format-icon:before { font-family: sportspress, dashicons !important; } +.post-state-format.post-format-league:before, .post-format-icon.post-format-league:before, a.post-state-format.format-league:before { + content: "\f227"; +} + +.post-state-format.post-format-tournament:before, .post-format-icon.post-format-tournament:before, a.post-state-format.format-tournament:before { + content: "\f313"; +} + +.post-state-format.post-format-friendly:before, .post-format-icon.post-format-friendly:before, a.post-state-format.format-friendly:before { + content: "\f328"; +} + +.post-state-format.post-format-list:before, .post-format-icon.post-format-list:before, a.post-state-format.format-list:before { + content: "\f163"; +} + +.fixed .column-sp_datetime { + width: 10%; +} + +table.wp-list-table .sp_datetime_head, table.wp-list-table .sp_team_head, table.wp-list-table .sp_player_head { + display: block; + text-indent: -9999px; + position: relative; + height: 1em; + width: 1em; + margin: 0 auto; +} + +table.wp-list-table .sp_datetime_head:after, table.wp-list-table .sp_team_head:after, table.wp-list-table .sp_player_head:after { + font-family: sportspress, dashicons !important; + speak: none; + font-weight: 400; + font-variant: normal; + text-transform: none; + line-height: 1; + -webkit-font-smoothing: antialiased; + margin: 0; + text-indent: 0; + position: absolute; + top: 0; + left: 0; + width: 100%; + height: 100%; + text-align: center; +} + +table.wp-list-table .sp_datetime_head:after { + content: "\f145"; +} + +table.wp-list-table .sp_team_head:after { + content: "\f334"; +} + +table.wp-list-table .sp_player_head:after { + content: "\f307"; +} + #sportspress_dashboard_status .inside { padding: 0; margin: 0; @@ -290,6 +356,10 @@ table.widefat td.column-sp_number .sp-flag { max-width: 20px; } +table.widefat td.sp-outcome .chosen-container { + width: 100%; +} + #sp_venue-adder h4, #sp_team-adder h4, #sp_season-adder h4, @@ -386,6 +456,104 @@ table.widefat td.column-sp_number .sp-flag { -webkit-transition: none; } +/* TipTip */ + +.tips { + cursor: help !important; +} + +#tiptip_holder { + display: none; + position: absolute; + top: 0; + left: 0; + z-index: 99999; +} + +#tiptip_holder.tip_top { + padding-bottom: 5px; +} + +#tiptip_holder.tip_bottom { + padding-top: 5px; +} + +#tiptip_holder.tip_right { + padding-left: 5px; +} + +#tiptip_holder.tip_left { + padding-right: 5px; +} + +#tiptip_content { + font-size: 11px; + color: #fff; + padding: .5em; + background: #464646; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; + -webkit-box-shadow: 1px 1px 3px rgba(0,0,0,.1); + -moz-box-shadow: 1px 1px 3px rgba(0,0,0,.1); + box-shadow: 1px 1px 3px rgba(0,0,0,.1); + text-align: center; +} + +#tiptip_arrow, #tiptip_arrow_inner { + position: absolute; + border-color: transparent; + border-style: solid; + border-width: 6px; + height: 0; + width: 0; +} + +#tiptip_holder.tip_top #tiptip_arrow { + border-top-color: #fff; + border-top-color: rgba(255,255,255,0.25); +} + +#tiptip_holder.tip_bottom #tiptip_arrow { + border-bottom-color: #fff; + border-bottom-color: rgba(255,255,255,0.25); +} + +#tiptip_holder.tip_right #tiptip_arrow { + border-right-color: #fff; + border-right-color: rgba(255,255,255,0.25); +} + +#tiptip_holder.tip_left #tiptip_arrow { + border-left-color: #fff; + border-left-color: rgba(255,255,255,0.25); +} + +#tiptip_holder.tip_top #tiptip_arrow_inner { + margin-top: -7px; + margin-left: -6px; + border-top-color: #464646; +} + +#tiptip_holder.tip_bottom #tiptip_arrow_inner { + margin-top: -5px; + margin-left: -6px; + border-bottom-color: #464646; +} + +#tiptip_holder.tip_right #tiptip_arrow_inner { + margin-top: -6px; + margin-left: -5px; + border-right-color: #464646; +} + +#tiptip_holder.tip_left #tiptip_arrow_inner { + margin-top: -6px; + margin-left: -7px; + border-left-color: #464646; +} + +/* Media Queries */ @media only screen and (max-width: 768px) { .form-field .sp-location-picker { diff --git a/assets/fonts/sportspress.eot b/assets/fonts/sportspress.eot index 09a820df..f3ea2af9 100755 Binary files a/assets/fonts/sportspress.eot and b/assets/fonts/sportspress.eot differ diff --git a/assets/fonts/sportspress.svg b/assets/fonts/sportspress.svg index b862c490..3b1d125f 100755 --- a/assets/fonts/sportspress.svg +++ b/assets/fonts/sportspress.svg @@ -7,9 +7,12 @@ + + + \ No newline at end of file diff --git a/assets/fonts/sportspress.ttf b/assets/fonts/sportspress.ttf index 30941815..95a7c4f6 100755 Binary files a/assets/fonts/sportspress.ttf and b/assets/fonts/sportspress.ttf differ diff --git a/assets/fonts/sportspress.woff b/assets/fonts/sportspress.woff index e1537195..dfe81dd1 100755 Binary files a/assets/fonts/sportspress.woff and b/assets/fonts/sportspress.woff differ