Changeset 2459836
- Timestamp:
- 01/20/2021 05:00:43 PM (5 years ago)
- Location:
- upstream/trunk
- Files:
-
- 1 added
- 12 edited
-
includes.php (modified) (1 diff)
-
includes/admin/class-up-admin-project-columns.php (modified) (1 diff)
-
includes/admin/options/class-up-options-general.php (modified) (2 diffs)
-
readme.txt (modified) (2 diffs)
-
templates/single-project.php (modified) (3 diffs)
-
templates/single-project/bugs.php (modified) (1 diff)
-
templates/single-project/details.php (modified) (8 diffs)
-
templates/single-project/discussion.php (modified) (1 diff)
-
templates/single-project/files.php (modified) (1 diff)
-
templates/single-project/milestones.php (modified) (1 diff)
-
templates/single-project/progress.php (added)
-
templates/single-project/tasks.php (modified) (1 diff)
-
upstream.php (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
upstream/trunk/includes.php
r2435596 r2459836 1 1 <?php 2 define('UPSTREAM_VERSION', '1.39. 0');2 define('UPSTREAM_VERSION', '1.39.1'); 3 3 4 4 global $upstream_addon_requirements; -
upstream/trunk/includes/admin/class-up-admin-project-columns.php
r2417454 r2459836 188 188 if (!isset(self::$usersCache[$owner_id])) { 189 189 $user = get_user_by('id', $owner_id); 190 self::$usersCache[$user->ID] = $user->display_name; 190 if (isset($user) && $user) { 191 self::$usersCache[$user->ID] = $user->display_name; 192 } 191 193 unset($user); 192 194 } 193 195 194 echo self::$usersCache[$owner_id]; 196 if (isset(self::$usersCache[$owner_id])) { 197 echo self::$usersCache[$owner_id]; 198 } else { 199 echo self::$noneTag; 200 } 195 201 } else { 196 202 echo self::$noneTag; -
upstream/trunk/includes/admin/options/class-up-options-general.php
r2417454 r2459836 392 392 ], 393 393 [ 394 'name' => __('Collapse Project Progress box', 'upstream'), 395 'id' => 'collapse_project_progress', 396 'type' => 'radio_inline', 397 'desc' => __( 398 'Choose whether to collapse the Project progress box automatically when a user opens a project page.', 399 'upstream' 400 ), 401 'default' => '0', 402 'options' => [ 403 0 => __('No', 'upstream'), 404 1 => __('Yes', 'upstream'), 405 ], 406 ], 407 [ 394 408 'name' => __('Collapse Project Milestones box', 'upstream'), 395 409 'id' => 'collapse_project_milestones', … … 471 485 'desc' => __('Options to toggle different sections and features.', 'upstream'), 472 486 'before_row' => '<hr>', 487 ], 488 [ 489 'name' => __('Disable Project Progress box', 'upstream'), 490 'id' => 'disable_project_progress', 491 'type' => 'radio_inline', 492 'desc' => __( 493 'Choose whether to disable the Project progress box on the front end.', 494 'upstream' 495 ), 496 'default' => '0', 497 'options' => [ 498 0 => __('No', 'upstream'), 499 1 => __('Yes', 'upstream'), 500 ], 473 501 ], 474 502 [ -
upstream/trunk/readme.txt
r2435596 r2459836 5 5 Tested up to: 5.6 6 6 Requires PHP: 5.6.20 7 Stable tag: 1.39. 07 Stable tag: 1.39.1 8 8 License: GPL-3 9 9 License URI: https://www.gnu.org/licenses/gpl-3.0.html … … 142 142 The format is based on [Keep a Changelog](http://keepachangelog.com) 143 143 and this project adheres to [Semantic Versioning](http://semver.org). 144 145 = [1.39.1] - 2021-01-20 = 146 * Added progress box to front end with graphs 147 * Fix minor collapse bug in front end 148 * Fix warnings when project owner is deleted 144 149 145 150 = [1.39.0] - 2020-12-07 = -
upstream/trunk/templates/single-project.php
r2410501 r2459836 92 92 $displayOverviewSection = ! isset($options['disable_project_overview']) || (bool)$options['disable_project_overview'] === false; 93 93 $displayDetailsSection = ! isset($options['disable_project_details']) || (bool)$options['disable_project_details'] === false; 94 $displayProgressSection = ! isset($options['disable_project_progress']) || (bool)$options['disable_project_progress'] === false; 94 95 95 96 /** … … 114 115 $sections = [ 115 116 'details', 116 /* 'progress',*/117 117 'milestones', 118 118 'tasks', … … 122 122 ]; 123 123 $sections = apply_filters('upstream_panel_sections', $sections); 124 125 if ($displayProgressSection) { 126 array_splice($sections, 1, 0, 'progress'); 127 } 124 128 125 129 /* Apply the order to the panels. */ -
upstream/trunk/templates/single-project/bugs.php
r2190820 r2459836 13 13 $collapseBoxState = \UpStream\Frontend\getSectionCollapseState('bugs'); 14 14 15 if ( ! is_null($collapseBoxState)) {15 if ( $collapseBoxState !== false) { 16 16 $collapseBox = $collapseBoxState === 'closed'; 17 17 } -
upstream/trunk/templates/single-project/details.php
r2418972 r2459836 60 60 <div class="x_content" style="display: <?php echo $collapseDetails ? 'none' : 'block'; ?>;"> 61 61 <div class="row"> 62 <div class="col-xs-12 col-sm-6 col-md-2 col-lg-2 ">62 <div class="col-xs-12 col-sm-6 col-md-2 col-lg-2 upstream-pd-id"> 63 63 <p class="title"><?php esc_html_e('ID', 'upstream'); ?></p> 64 64 <span><?php echo $project_id; ?></span> … … 66 66 67 67 <?php if (!empty($projectTimeframe)): ?> 68 <div class="col-xs-12 col-sm-6 col-md-2 col-lg-2 ">68 <div class="col-xs-12 col-sm-6 col-md-2 col-lg-2 upstream-pd-timeframe"> 69 69 <p class="title"><?php esc_html_e('Timeframe', 'upstream'); ?></p> 70 70 <?php if (upstream_override_access_field(true, UPSTREAM_ITEM_TYPE_PROJECT, $project_id, null, 0, 'start', UPSTREAM_PERMISSIONS_ACTION_VIEW) && … … 78 78 79 79 <?php if (!$isClientsDisabled && $project->client_id > 0): ?> 80 <div class="col-xs-12 col-sm-6 col-md-2 col-lg-2 ">80 <div class="col-xs-12 col-sm-6 col-md-2 col-lg-2 upstream-pd-client"> 81 81 <p class="title"><?php echo esc_html(upstream_client_label()); ?></p> 82 82 <span><?php echo $project->client_id > 0 && !empty($project->clientName) ? esc_html($project->clientName) : '<i class="text-muted">(' . esc_html__( … … 87 87 <?php endif; ?> 88 88 89 <div class="col-xs-12 col-sm-6 col-md-2 col-lg-2 ">89 <div class="col-xs-12 col-sm-6 col-md-2 col-lg-2 upstream-pd-progress"> 90 90 <p class="title"><?php esc_html_e('Progress', 'upstream'); ?></p> 91 91 <span> … … 98 98 </div> 99 99 <?php if ($project->owner_id > 0): ?> 100 <div class="col-xs-12 col-sm-6 col-md-2 col-lg-2 ">100 <div class="col-xs-12 col-sm-6 col-md-2 col-lg-2 upstream-pd-owner"> 101 101 <p class="title"><?php esc_html_e('Owner', 'upstream'); ?></p> 102 102 <?php if (upstream_override_access_field(true, UPSTREAM_ITEM_TYPE_PROJECT, $project_id, null, 0, 'progress', UPSTREAM_PERMISSIONS_ACTION_VIEW)): ?> … … 112 112 113 113 <?php if (!$isClientsDisabled && $project->client_id > 0): ?> 114 <div class="col-xs-12 col-sm-6 col-md-2 col-lg-2 ">114 <div class="col-xs-12 col-sm-6 col-md-2 col-lg-2 upstream-pd-clientusers"> 115 115 <p class="title"><?php printf(__('%s Users', 'upstream'), esc_html(upstream_client_label())); ?></p> 116 116 <?php if (is_array($project->clientUsers) && count($project->clientUsers) > 0): ?> … … 122 122 <?php endif; ?> 123 123 124 <div class="col-xs-12 col-sm-6 col-md-2 col-lg-2 ">124 <div class="col-xs-12 col-sm-6 col-md-2 col-lg-2 upstream-pd-members"> 125 125 <p class="title"><?php esc_html_e('Members', 'upstream'); ?></p> 126 126 <?php upstream_output_project_members(); ?> … … 130 130 </div> 131 131 <?php if (!empty($project->description)): ?> 132 <div >132 <div class="upstream-pd-description"> 133 133 <p class="title"><?php esc_html_e('Description', 'upstream'); ?></p> 134 134 <?php if (upstream_override_access_field(true, UPSTREAM_ITEM_TYPE_PROJECT, $project_id, null, 0, 'description', UPSTREAM_PERMISSIONS_ACTION_VIEW)): ?> -
upstream/trunk/templates/single-project/discussion.php
r2216956 r2459836 14 14 $projectId = upstream_post_id(); 15 15 16 if ( ! is_null($collapseBoxState)) {16 if ( $collapseBoxState !== false) { 17 17 $collapseBox = $collapseBoxState === 'closed'; 18 18 } -
upstream/trunk/templates/single-project/files.php
r2190820 r2459836 13 13 $collapseBoxState = \UpStream\Frontend\getSectionCollapseState('files'); 14 14 15 if ( ! is_null($collapseBoxState)) {15 if ( $collapseBoxState !== false) { 16 16 $collapseBox = $collapseBoxState === 'closed'; 17 17 } -
upstream/trunk/templates/single-project/milestones.php
r2190820 r2459836 13 13 $collapseBoxState = \UpStream\Frontend\getSectionCollapseState('milestones'); 14 14 15 if ( ! is_null($collapseBoxState)) {15 if ( $collapseBoxState !== false) { 16 16 $collapseBox = $collapseBoxState === 'closed'; 17 17 } -
upstream/trunk/templates/single-project/tasks.php
r2260686 r2459836 13 13 $collapseBoxState = \UpStream\Frontend\getSectionCollapseState('tasks'); 14 14 15 if ( ! is_null($collapseBoxState)) {15 if ( $collapseBoxState !== false) { 16 16 $collapseBox = $collapseBoxState === 'closed'; 17 17 } -
upstream/trunk/upstream.php
r2435596 r2459836 5 5 * Author: UpStream 6 6 * Author URI: https://upstreamplugin.com 7 * Version: 1.39. 07 * Version: 1.39.1 8 8 * Text Domain: upstream 9 9 * Domain Path: /languages
Note: See TracChangeset
for help on using the changeset viewer.