diff options
author | Thomas Steur <tsteur@users.noreply.github.com> | 2016-08-29 04:30:52 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-08-29 04:30:52 +0300 |
commit | 0c9c30b731ccbacf47e154b9f7a590af49e3d799 (patch) | |
tree | c5cf2f6437bb2ee7f3675350ee4b0b6acbbae7d3 /plugins/SegmentEditor/templates | |
parent | bfdf0bed670f247bf9b1d466e3bcf651e98ab634 (diff) |
Better UI for Piwik 3, more responsive, faster, lots of other fixes (#10397)
* improved ui and responsiveness
* improve rss widget
* commit changes for ui again, got lost after the last commit
* fix more tests
* restoring files
* fix fonts
* fix more tests
* more test fixes
* fix some system tests
* fix tests
* fix system and ui tests
* fix updater tests
* make a page as loaded once the callback is called
* enable verbose
* more verbose output
* enable phantomjs debug flag
* debug should be a phantomjs option
* trying to fix installation tests
* fixes #10173 to not compile css files as less
* trying to minimize js/css requests to hopefully prevent random ui test fails
* disable verbose mode
* fix updater and installation
* lots of bugfixes and ui tweaks
* fix reset dashboard
* various bugfixes
* fix integration tests
* fix text color
* hoping to fix installation tests this way
* cache css/js resources for an hour, should speed up tests and prevent some random issues
* we need to avoid installing plugins multiple times at the same time when requesting resources
* finally getting the colors right again
* fix most tests, more tests for theme
* use an h2 element for titles for better accessibility
* fix headline color
* use actual theme text color (piwik-black)
* fix small font size was applied on all p elements
* fix tests
* now improving all the datatables
* trying to ignore images for visitor log
* Revert "trying to ignore images for visitor log"
This reverts commit ad1ff7267aae14ad905bef130e956c8593c4fb22.
* fix tests
* fix we had always ignored a max label width
* trying to fix file permissions
* fix more file permissions
* Improved plugins update API (#10028)
* refs #7983 let plugins add or remove fields to websites and better settings api
* * Hide CorePluginsAdmin API methods
* More documentation
* Added some more tests
* improved updates API for plugins
* better error code as duplicate column cannot really happen when not actually renaming a colum
Conflicts:
core/Updates/3.0.0-b1.php
plugins/CoreUpdater/Commands/Update/CliUpdateObserver.php
* fix DB field piwik_log_visit.location_provider too small (#10003)
* fixes #9564 fix DB field piwik_log_visit.location_provider too small
* use new plugins updater API
* DB field piwik_log_visit.visit_total_actions too small (#10002)
* fixes #9565 DB field piwik_log_visit.visit_total_actions too small
* change type of some db columns that are too small
* fix tests (#10040)
Conflicts:
plugins/CoreAdminHome/Menu.php
plugins/Goals/Menu.php
plugins/MobileMessaging/Menu.php
plugins/SitesManager/Menu.php
plugins/UsersManager/Menu.php
tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getWidgetMetadata.xml
* fix more file permissions
* repair more file permissions
* repair more file permissions
* trying to make ui tests work again, the table was missing
* fix some encoding issues
* cross browser fixes and usability improvement
* move back the config icon, need to find a better solution later
* more cross browser fixes
* bugfixes
* fix ui tests
* fix encoding issue
* fix various issues with the ui tests when a test gets aborted
* also skip this visitor log test when aborted
* there were 3 css files that were loaded separately, merge them instead into one css
* forgot to add the actual manifest
* do not add manifest if custom logo is specified
* load font css files first as it was before merging them into big css
* fix link icon was not aligned anymore
* minor fixes
* setting it back to 4px
* in popovers the font variable was always ignored and a different font loaded
* forgot to update screenshots
* fix remaining tests
* this should fix an update error
* added 3 new widgets system check, system summary and plugin updates
* tweak new widgets content
* no page reload when changing date or segment
* in admin home show only enabled widgets
* refs #10295 use getMockBuilder instead of deprecated getMock
* fix some ui tests
* fix various bugs
* fix more tests
* fix ui tests
* add a space between loading image and loading message
* fix docs so they appear on developer.piwik.org
* improved documentation
* introduce new Widget::renderTemplate method for consistency with controllers
* remove no longer needed files
* testing system fonts
* fix strong was not really bold
* more useful system summary
* remove ubuntu font
* fix most tests and removed most em elements
* fix tests
* fix headline was very thin
* update submodule
* update submodules
* update submodule
* fix failing ui tests
* update submodules
Diffstat (limited to 'plugins/SegmentEditor/templates')
-rw-r--r-- | plugins/SegmentEditor/templates/_segmentSelector.twig | 29 |
1 files changed, 16 insertions, 13 deletions
diff --git a/plugins/SegmentEditor/templates/_segmentSelector.twig b/plugins/SegmentEditor/templates/_segmentSelector.twig index 8d03b6d5bd..c8ab792fc0 100644 --- a/plugins/SegmentEditor/templates/_segmentSelector.twig +++ b/plugins/SegmentEditor/templates/_segmentSelector.twig @@ -3,7 +3,7 @@ <a class="title" tabindex="4"><span class="icon icon-segment"></span><span class="segmentationTitle"></span></a> <div class="dropdown dropdown-body"> <div class="segmentFilterContainer"> - <input class="segmentFilter" type="text" value="{{ 'General_Search'|translate }}"/> + <input class="segmentFilter browser-default" type="text" value="{{ 'General_Search'|translate }}"/> <span/> </div> <ul class="submenu"> @@ -43,7 +43,7 @@ <div class="segment-row-inputs"> <div class="segment-input metricListBlock"> - <select title="{{ 'SegmentEditor_ChooseASegment'|translate }}" class="metricList"> + <select title="{{ 'SegmentEditor_ChooseASegment'|translate }}" class="metricList browser-default"> {% for category,segmentsInCategory in segmentsByCategory %} <optgroup label="{{ category }}"> {% for segmentInCategory in segmentsInCategory %} @@ -54,7 +54,7 @@ </select> </div> <div class="segment-input metricMatchBlock"> - <select title="{{ 'General_Matches'|translate }}"> + <select title="{{ 'General_Matches'|translate }}" class="browser-default"> <option value="==">{{ 'General_OperationEquals'|translate }}</option> <option value="!=">{{ 'General_OperationNotEquals'|translate }}</option> <option value="<=">{{ 'General_OperationAtMost'|translate }}</option> @@ -68,7 +68,7 @@ </select> </div> <div class="segment-input metricValueBlock"> - <input type="text" title="{{ 'General_Value'|translate }}"> + <input type="text" class="browser-default" title="{{ 'General_Value'|translate }}"> </div> <div class="clear"></div> </div> @@ -94,8 +94,14 @@ <div class="segment-nav"> <h4 class="visits"> <span class="icon-segment"></span><span class="available_segments"><strong> - <select class="available_segments_select"></select> + <select class="available_segments_select browser-default"></select> </strong></span></h4> + + <div class="custom_select_search"> + <a href="#"></a> + <input type="text" aria-haspopup="true" aria-autocomplete="list" role="textbox" autocomplete="off" class="inp ui-autocomplete-input segmentSearch browser-default" value="{{ 'General_Search'|translate }}" length="15"> + </div> + <div class="scrollable"> <ul> {% for category,segmentsInCategory in segmentsByCategory %} @@ -120,10 +126,6 @@ {% endfor %} </ul> </div> - <div class="custom_select_search"> - <a href="#"></a> - <input type="text" aria-haspopup="true" aria-autocomplete="list" role="textbox" autocomplete="off" class="inp ui-autocomplete-input segmentSearch" value="{{ 'General_Search'|translate }}" length="15"> - </div> </div> <div class="segment-content"> <div class="segment-top" {% if not isSuperUser %}style="display:none"{% endif %}> @@ -155,9 +157,9 @@ <div class="segment-footer"> <div piwik-rate-feature title="Segment Editor" style="display:inline-block;float: left;margin-top: 2px;margin-right: 10px;"></div> <span class="segmentFooterNote">The Segment Editor was <a class='crowdfundingLink' href='http://crowdfunding.piwik.org/custom-segments-editor/' rel='noreferrer' target='_blank'>crowdfunded</a> with the awesome support of 80 companies and Piwik users worldwide!</span> - <a class="delete" href="#">{{ 'General_Delete'|translate }}</a> - <a class="close" href="#">{{ 'General_Close'|translate }}</a> - <button class="saveAndApply">{{ 'SegmentEditor_SaveAndApply'|translate }}</button> + <a class="btn-flat delete" href="#">{{ 'General_Delete'|translate }}</a> + <a class="btn-flat close" href="#">{{ 'General_Close'|translate }}</a> + <button class="btn saveAndApply">{{ 'SegmentEditor_SaveAndApply'|translate }}</button> </div> </div> </div> @@ -170,7 +172,6 @@ <div class="ui-confirm pleaseChangeBrowserAchivingDisabledSetting"> <h2>{{ 'SegmentEditor_SegmentNotApplied'|translate(nameOfCurrentSegment)|raw }}</h2> {% set segmentSetting %}{{ 'SegmentEditor_AutoArchivePreProcessed'|translate }}{% endset %} - <input role="yes" type="button" value="{{ 'General_Ok'|translate }}"/> <p class="description"> {{ 'SegmentEditor_SegmentNotAppliedMessage'|translate(nameOfCurrentSegment)|raw }} <br/> @@ -179,5 +180,7 @@ <br/> <br/> {{ 'SegmentEditor_YouMayChangeSetting'|translate('browser_archiving_disabled_enforce', segmentSetting) }} {% endif %} </p> + + <input role="yes" type="button" value="{{ 'General_Ok'|translate }}"/> </div> </div>
\ No newline at end of file |