Skip to content

Commit 6af3891

Browse files
ar2rsawseenar2rsawseen
authored
Merge pull request #597 from Cookiezaurs/next-design-fixes
Next design fixes
2 parents 8ef6672 + e802d23 commit 6af3891

File tree

5 files changed

+45
-28
lines changed

5 files changed

+45
-28
lines changed

‎frontend/express/public/stylesheets/main.css

+6-2
Original file line numberDiff line numberDiff line change
@@ -1166,10 +1166,14 @@ margin: 50px 0;}
11661166
#eventOverviewWidgets .cly-widget>table {width:100%;}
11671167
#eventOverviewWidgets .cly-widget>table td table td {padding: 0px;}
11681168

1169-
#event-overview-drawer .cly-select,#event-overview-drawer .cly-select .select-items {width:149px;}
1169+
#event-overview-drawer .cly-select,#event-overview-drawer .cly-select .select-items {width:100%;}
1170+
#event-overview-drawer .adding-to-overview{ margin: 0;}
1171+
#event-overview-drawer .adding-to-overview>div {float:left; width:38%; margin:0; padding:0;}
1172+
#event-overview-drawer .adding-to-overview>div:last-child {width: 24%;}
1173+
#event-overview-drawer .wrap-overview-item {padding: 0 4px 0 0 ;}
11701174
#add_to_overview{display:inline-block; text-align:center; float:none; margin-left: 0px; width: 75px;}
11711175
#event-overview-drawer .buttons{background-color:#ffffff;}
1172-
1176+
#events-overview-table table.events-table td:nth-child(2) { word-break: break-word; }
11731177
#events-overview-show-configure{float:right; margin-top:5px;}
11741178
.show-event-description:hover + .event-overview-description-wrapper .event-overview-description {border: 1px solid black; display:block}
11751179
#event-blueprint-nav-title {padding-top:4px;}

‎frontend/express/views/dashboard.html

+32-23
Original file line numberDiff line numberDiff line change
@@ -1358,34 +1358,43 @@ <h3 data-index="{{value.index}}">{{value.title}}</h3>
13581358
<div class="details">
13591359
<div class="settings section">
13601360
<div class="label" data-localize="events.overview.add-item"></div>
1361-
<div class="cly-select" id="events-overview-event" >
1362-
<div class="select-inner">
1363-
<div class="text-container">
1364-
<div class="text" data-localize="events.overview.choose-event"></div>
1361+
<div class="adding-to-overview">
1362+
<div><div class="wrap-overview-item">
1363+
<div class="cly-select" id="events-overview-event" >
1364+
<div class="select-inner">
1365+
<div class="text-container">
1366+
<div class="text" data-localize="events.overview.choose-event"></div>
1367+
</div>
1368+
<div class="right combo"></div>
1369+
</div>
1370+
<div class="select-items square">
1371+
{{#eachOfObjectValue event-map}}
1372+
<div data-value="{{this.key}}" class="event-option item" >{{this.name}}</div>
1373+
{{/eachOfObjectValue}}
1374+
</div>
1375+
</div>
13651376
</div>
1366-
<div class="right combo"></div>
13671377
</div>
1368-
<div class="select-items square">
1369-
{{#eachOfObjectValue event-map}}
1370-
<div data-value="{{this.key}}" class="event-option item" >{{this.name}}</div>
1371-
{{/eachOfObjectValue}}
1372-
</div>
1373-
</div>
1374-
1375-
<div class="cly-select" id="events-overview-attr" >
1376-
<div class="select-inner">
1377-
<div class="text-container">
1378-
<div class="text" data-localize="events.overview.choose-property"></div>
1378+
<div><div class="wrap-overview-item">
1379+
<div class="cly-select" id="events-overview-attr" >
1380+
<div class="select-inner">
1381+
<div class="text-container">
1382+
<div class="text" data-localize="events.overview.choose-property"></div>
1383+
</div>
1384+
<div class="right combo"></div>
1385+
</div>
1386+
<div class="select-items square">
1387+
<div data-value="sum" class="event-option item" data-localize="events.table.sum"></div>
1388+
<div data-value="dur" class="event-option item" data-localize="events.table.dur"></div>
1389+
<div data-value="count" class="event-option item" data-localize="events.table.count"></div>
1390+
</div>
13791391
</div>
1380-
<div class="right combo"></div>
1392+
</div>
1393+
</div>
1394+
<div>
1395+
<div id="add_to_overview" class="icon-button green disabled" data-localize="events.overview.add-item" ></div>
13811396
</div>
1382-
<div class="select-items square">
1383-
<div data-value="sum" class="event-option item" data-localize="events.table.sum"></div>
1384-
<div data-value="dur" class="event-option item" data-localize="events.table.dur"></div>
1385-
<div data-value="count" class="event-option item" data-localize="events.table.count"></div>
1386-
</div>
13871397
</div>
1388-
<div id="add_to_overview" class="icon-button green disabled" data-localize="events.overview.add-item" ></div>
13891398
</div>
13901399
<div class="settings section" id="events-overview-table-wrapper">
13911400
<div class="label" data-localize="events.overview.added-items" {{#ifCond overview-table-length "==" "0"}} style="display:none" {{/ifCond}} ></div>

‎plugins/data_migration/frontend/public/javascripts/countly.views.js

+4
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,8 @@ window.DataMigrationView = countlyView.extend({
109109
//top button, open export drawer
110110
$("#show_data_export_form").on("click", function () {
111111
self.reset_export_tab();
112+
$("#import-export-button").removeClass("active");
113+
$("#import-export-button-menu").css('display','none');
112114
$(".cly-drawer").removeClass("open editing");
113115
$("#export-widget-drawer").addClass("open");
114116
$(".cly-drawer").find(".close").off("click").on("click", function () {
@@ -119,6 +121,8 @@ window.DataMigrationView = countlyView.extend({
119121
//top button, open import drawer
120122
$("#show_data_import_form").on("click", function () {
121123
$(".cly-drawer").removeClass("open editing");
124+
$("#import-export-button").removeClass("active");
125+
$("#import-export-button-menu").css('display','none');
122126
$("#import-widget-drawer").addClass("open");
123127
$("#data-migration-import-via-file").height($(window).height()-340);
124128
$(".cly-drawer").find(".close").off("click").on("click", function () {

‎plugins/data_migration/frontend/public/templates/export_drawer.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -61,11 +61,11 @@
6161
<div class="settings section" id="export-more-options">
6262
<table style="width: 100%;">
6363
<tr class="checkbox_row">
64-
<td style="width: 20px;"><a class="fa check-green check-header fa-square-o" id="migration_aditional_files"></a></td>
64+
<td style="width: 20px;"><a class="fa check-green check-header fa-square-o" id="migration_aditional_files" style="margin-top:4px;"></a></td>
6565
<td><label data-localize="data-migration.export-additional-files" class='migration-checkbox-label'></label></td>
6666
</tr>
6767
<tr class="checkbox_row">
68-
<td style="width: 20px;"><a class="fa check-green check-header fa-square-o" id="migration_redirect_traffic"></a></td>
68+
<td style="width: 20px;"><a class="fa check-green check-header fa-square-o" id="migration_redirect_traffic" style="margin-top:4px;"></a></td>
6969
<td><label data-localize="data-migration.redirect-traffic" class='migration-checkbox-label'></label></td>
7070
</tr>
7171
</table>

‎test/2.api/14.authorize.token.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ describe('Test if token is created on login', function(){
7878
{
7979
testtoken = res[0]._id;
8080
res[0].multi.should.be.exactly(true);
81-
res[0].ttl.should.be.exactly(0);
81+
res[0].ttl.should.be.exactly(1800000);
8282
done();
8383
}
8484
else

0 commit comments

Comments
 (0)