Add a Segment Management Page #23885
+1,074
−252
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -50,6 +50,45 @@ table.entityTable { | |
| } | ||
| } | ||
| } | ||
|
|
||
| th.entityTable_Numeric { | ||
| text-align: right !important; | ||
| } | ||
| td.entityTable_Numeric { | ||
| text-align: right; | ||
| font-variant-numeric: tabular-nums; | ||
| } | ||
|
|
||
| .entityTable_Sparkline { | ||
| padding: 0; | ||
| width: 100px; | ||
| } | ||
| } | ||
|
|
||
| .entityTable_StarCell, | ||
| table.entityTable tbody tr .entityTable_StarCell { | ||
| width: 40px; | ||
| padding-right: 0; | ||
| } | ||
|
|
||
| .entityTable_Filler, | ||
| table.entityTable tbody tr .entityTable_Filler { | ||
| padding: 0; | ||
| } | ||
|
|
||
| .entityTable_ActionCell, | ||
| table.entityTable tbody tr .entityTable_ActionCell { | ||
| padding: 0 16px; | ||
| } | ||
|
|
||
| .entityTable_ActionCell-1, | ||
| table.entityTable tbody tr .entityTable_ActionCell-1 { | ||
| width: 80px; | ||
| } | ||
|
|
||
| .entityTable_ActionCell-3, | ||
| table.entityTable tbody tr .entityTable_ActionCell-3 { | ||
| width: 170px; | ||
| } | ||
|
|
||
| .table-action { | ||
|
|
@@ -71,6 +110,15 @@ table.entityTable { | |
| box-shadow: 0 1px 2px 0 rgba(0,0,0,0.16), 0 1px 5px 0 rgba(0,0,0,0.12); | ||
| cursor: pointer; | ||
| } | ||
|
|
||
| &[data-state="disabled"] { | ||
| opacity: 0.2; | ||
| cursor: not-allowed; | ||
| } | ||
|
|
||
| .entityTable_ActionCell & { | ||
| display: inline-block; | ||
| } | ||
| } | ||
|
|
||
| .card .tableActionBar { | ||
|
|
@@ -82,6 +130,11 @@ table.entityTable { | |
| } | ||
| } | ||
|
|
||
| .tableFooterLabel { | ||
| margin-bottom: 16px; | ||
| font-style: italic; | ||
| } | ||
|
|
||
| .tableActionBar { | ||
| a, | ||
| button { | ||
|
|
@@ -105,12 +158,14 @@ table.entityTable { | |
| text-transform: uppercase; | ||
| vertical-align: middle; | ||
| -webkit-tap-highlight-color: transparent; | ||
|
|
||
| &:hover { | ||
| text-decoration: none; | ||
| } | ||
| } | ||
|
|
||
| button:first-child, | ||
| a:first-child { | ||
| background-color: @theme-color-brand !important; | ||
| color: @color-white; | ||
| } | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,3 +2,22 @@ img.sparklineImg { | |
| width: 100px; | ||
| height: 25px; | ||
| } | ||
|
|
||
| .sparklineEvolution { | ||
| color: black; | ||
| font-size: 12px; | ||
| white-space: nowrap; | ||
| } | ||
|
|
||
| .sparklineEvolution-positive { | ||
| color: green; | ||
| } | ||
|
|
||
| .sparklineEvolution-negative { | ||
| color: red; | ||
| } | ||
|
|
||
| .sparklineEvolution_icon { | ||
| margin-right: 1em; | ||
| vertical-align: middle; | ||
| } | ||
|
Comment on lines
+6
to
+23
Contributor
Author
There was a problem hiding this comment. ℹ️ Inspired from the "All Websites" design, but now available everywhere. 
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -83,6 +83,7 @@ declare global { | |
| interface PiwikHelperGlobal { | ||
| escape(text: string): string; | ||
| redirect(params?: any); | ||
| getCurrentQueryStringWithParametersModified(newparams: string); | ||
|
Contributor
Author
There was a problem hiding this comment. ℹ️ This function already exists (and is useful!) but it is now available outside of the piwikHelper. |
||
| htmlDecode(encoded: string): string; | ||
| htmlEntities(value: string): string; | ||
| modalConfirm(element: JQuery|HTMLElement|string, callbacks?: ModalConfirmCallbacks, options?: ModalConfirmOptions); | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -1565,4 +1565,35 @@ | |
| </row> | ||
| </widgets> | ||
| </row> | ||
| <row> | ||
| <uniqueId>General_Visitors.CoreHome_Segments</uniqueId> | ||
| <category> | ||
| <id>General_Visitors</id> | ||
| <name>Visitors</name> | ||
| <order>5</order> | ||
| <icon>icon-reporting-visitors</icon> | ||
| <help><p>The Visitors pages tell you things about who your visitors are. Things like where your visitors came from, what devices and browsers they're using and when they generally visit your website. Understand, in the aggregate, who your audience is, and look for outliers to see how your audience could grow.</p><p>In addition to general information about your visitors, you can also use the <a href="#" onclick="this.href=broadcast.buildReportingUrl('category=General_Visitors&subcategory=Live_VisitorLog')">Visits Log</a> to see what occurred in every individual visit.</p></help> | ||
| <widget/> | ||
| </category> | ||
| <subcategory> | ||
| <id>CoreHome_Segments</id> | ||
| <name>Segments</name> | ||
| <order>99</order> | ||
| <help/> | ||
| </subcategory> | ||
| <widgets> | ||
| <row> | ||
| <name>Segments</name> | ||
| <module>SegmentEditor</module> | ||
| <action>manageSegments</action> | ||
| <order>99</order> | ||
| <parameters> | ||
| <module>SegmentEditor</module> | ||
| <action>manageSegments</action> | ||
| </parameters> | ||
| <uniqueId>widgetSegmentEditormanageSegments</uniqueId> | ||
| <isWide>0</isWide> | ||
| </row> | ||
| </widgets> | ||
| </row> | ||
| </result> | ||
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -22,7 +22,7 @@ public function configureAdminMenu(MenuAdmin $menu) | |
| $idSite = $this->getIdSite($userPreferences->getDefaultWebsiteId()); | ||
|
|
||
| if (Piwik::isUserHasWriteAccess($idSite)) { | ||
| $menu->addMeasurableItem('Goals_Goals', $this->urlForAction('manage', array('idSite' => $idSite)), 15); | ||
|
Contributor
Author
There was a problem hiding this comment. ℹ️ Goals item should be higher in the Administration Menu. It is more obvious now that we add a "Segments" item. |
||
| } | ||
| } | ||
|
|
||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -59,7 +59,12 @@ h1, | |
| } | ||
| } | ||
|
|
||
| .card-introduction { | ||
| max-width: 900px; | ||
| } | ||
|
|
||
| .card-table + .tableActionBar, | ||
| .tableFooterLabel + .tableActionBar { | ||
| margin: 0 0 0 -20px; | ||
| } | ||
|
|
||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -153,7 +153,7 @@ public function getClientSideTranslationKeys(&$translationKeys) | |
| $translationKeys[] = 'ScheduledReports_ReportIncludeNWebsites'; | ||
| $translationKeys[] = 'SegmentEditor_LoadingSegmentedDataMayTakeSomeTime'; | ||
| $translationKeys[] = 'General_Download'; | ||
| $translationKeys[] = 'ScheduledReports_HelpSegmentManagement'; | ||
| $translationKeys[] = 'SegmentEditor_AddNewSegment'; | ||
| $translationKeys[] = 'ScheduledReports_SentToMe'; | ||
| $translationKeys[] = 'ScheduledReports_AlsoSendReportToTheseEmails'; | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -36,7 +36,7 @@ | |
| "ReportUpdated": "Report updated", | ||
| "ReportAdded": "Report added", | ||
| "Segment_Deletion_Error": "This segment cannot be deleted or made invisible to other users because it is used to generate email report(s) %s. Please retry after removing this segment from this report(s).", | ||
| "HelpSegmentManagement": "You can select an existing custom segment to apply to data in this scheduled report. You may create and edit custom segments in the dedicated segments management page %1$s(click here to open)%2$s.", | ||
| "SegmentAppliedToReports": "The segment '%s' is applied to the reports.", | ||
| "SegmentDeleted": "Segment deleted", | ||
| "SendReportNow": "Send Report now", | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ℹ️ This argument already exists and it is
falseby default. I only made it available in a higher level.