Skip to content

Commit e9e6d00

Browse files
mas-iotamas-iota
authored
Merge pull request #27 from BuildFire/fix/messing-language
Fix/messing language
2 parents 0834539 + 1241493 commit e9e6d00

File tree

12 files changed

+436
-154
lines changed

12 files changed

+436
-154
lines changed

‎control/content/index.html‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@
1010

1111
<!-- JS -->
1212
<script src="../../../../scripts/buildfire.min.js"></script>
13-
<!-- build:bundleJSFiles -->
13+
14+
<!-- build:bundleSharedJSFiles -->
1415
<script src="../../widget/assets/js/Analytics.js"></script>
1516
<script src="../../widget/assets/js/analyticsKeys.js"></script>
1617
<!-- endbuild -->
@@ -21,7 +22,7 @@
2122

2223
<link href="../../../../styles/control/bf-base.css" rel="stylesheet">
2324
<script>
24-
Analytics.init();
25+
Analytics.init();
2526

2627
const debounce = (func, wait) => {
2728
let timeout;
@@ -37,7 +38,7 @@
3738
executedFunction();
3839
};
3940

40-
tinymce.init({
41+
tinymce.init({
4142
selector: "#text",
4243
max_chars: 800,
4344
toolbar: "",
@@ -88,10 +89,10 @@
8889
<body>
8990
<div>
9091
<h1>Introduction</h1>
91-
<textarea id="text" ui-tinymce="editorOptions" class="form-control" rows="5" width="100%" height="300px"></textarea>
92+
<textarea id="text" ui-tinymce="editorOptions" class="form-control" rows="5" width="100%" height="300px"></textarea>
9293

9394
</div>
94-
95+
9596

9697
<script>
9798
function save(data) {

‎control/settings/index.html‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,24 +5,27 @@
55
<link href="../../../../styles/helper.css" rel="stylesheet" />
66
<link rel="stylesheet" href="../assets/control.css" />
77
<link href="../../../../styles/control/bf-base.css" rel="stylesheet" />
8+
<!-- build:bundleCSSFiles -->
89
<link href="./styles.css" rel="stylesheet" />
10+
<!-- endbuild -->
911
<link href="../../../../styles/control/siteIcons-control.css" rel="stylesheet" />
1012
<script src="../../../../scripts/buildfire.min.js"></script>
1113
<script src="../../../../scripts/buildfire/services/commerce/inAppPurchase.js"></script>
12-
<!-- build:bundleJSFiles -->
14+
15+
<!-- build:bundleSharedJSFiles -->
1316
<script src="../../widget/assets/js/settings.js"></script>
14-
<!-- endbuild -->
17+
<!-- endbuild -->
18+
1519

16-
1720
<link href="../../../../styles/components/control/tagsInput/tagsInput.min.css" rel="stylesheet"/>
18-
21+
1922
<script src="../../../../scripts/buildfire/components/control/tagsInput/tagsInput.min.js"></script>
2023
</head>
2124

2225
<body>
2326
<div class="settings-container">
2427

25-
28+
2629
<div class="row margin-bottom-sixteen">
2730

2831
<div class="item clearfix row flex-center">
@@ -227,5 +230,7 @@
227230
</div>
228231
</div>
229232
</body>
233+
<!-- build:bundleJSFiles -->
230234
<script src="./app.js"></script>
235+
<!-- endbuild -->
231236
</html>

‎control/tests/index.html‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,15 @@
99
<script src="./Jasmine-Project/lib/jasmine-html.js"></script>
1010
<script src="./Jasmine-Project/lib/boot.js"></script>
1111

12+
<!-- build:bundleSharedJSFiles -->
1213
<script src="../../widget/assets/js/settings.js"></script>
1314
<script src="../../widget/assets/js/suggestions.js"></script>
15+
<!-- endbuild -->
16+
1417
<script src="./spec/settings.spec.js"></script>
1518
<script src="./spec/suggestion.spec.js"></script>
1619

1720
</head>
1821
<body>
1922
</body>
20-
</html>
23+
</html>

‎gulpfile.js‎

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,8 @@ cssTasks.forEach(function(task){
5555
});
5656

5757
const jsTasks=[
58-
{name:"widgetJS",src:["widget/assets/**/*.js", "widget/*.js" ,"widget/controllers/*.js"],dest:"/widget"}
58+
{name:"widgetJS",src:["!widget/assets/**/*.js", "widget/*.js" ,"widget/controllers/*.js"],dest:"/widget"}
59+
,{name:"sharedJS",src:["widget/assets/**/*.js"],dest:"/widget/shared"}
5960
,{name:"controlContentJS",src:"control/content/**/*.js",dest:"/control/content"}
6061
,{name:"controlDesignJS",src:"control/design/**/*.js",dest:"/control/design"}
6162
,{name:"controlSettingsJS",src:"control/settings/**/*.js",dest:"/control/settings"}
@@ -101,6 +102,7 @@ gulp.task('html', function(){
101102
.pipe(htmlReplace({
102103
bundleJSFiles:"scripts.min.js?v=" + (new Date().getTime())
103104
,bundleCSSFiles:"styles.min.css?v=" + (new Date().getTime())
105+
,bundleSharedJSFiles:"./shared/scripts.min.js?v=" + (new Date().getTime())
104106
}))
105107

106108
/// then strip the html from any comments
@@ -115,7 +117,8 @@ gulp.task('Controlhtml', function(){
115117
/// replace all the <!-- build:bundleJSFiles --> comment bodies
116118
/// with scripts.min.js with cache buster
117119
.pipe(htmlReplace({
118-
bundleJSFiles:"../../widget/scripts.min.js?v=" + (new Date().getTime())
120+
bundleJSFiles:"./scripts.min.js?v=" + (new Date().getTime())
121+
,bundleSharedJSFiles:"../../widget/shared/scripts.min.js?v=" + (new Date().getTime())
119122
,bundleCSSFiles:"styles.min.css?v=" + (new Date().getTime())
120123
}))
121124

@@ -143,6 +146,16 @@ gulp.task('fonts', function(){
143146
.pipe(gulp.dest(destinationFolder));
144147
});
145148

149+
gulp.task('assets', function(){
150+
return gulp.src(['widget/assets/**/*.{css,png,svg}', 'control/assets/**'],{base: '.'})
151+
.pipe(gulp.dest(destinationFolder));
152+
});
153+
154+
gulp.task('tests', function(){
155+
return gulp.src(['control/tests/**'],{base: '.'})
156+
.pipe(gulp.dest(destinationFolder));
157+
});
158+
146159
gulp.task('icons', function(){
147160
return gulp.src(['widget/css/fonts/**/*.{ttf,woff,eot,svg}'])
148161
.pipe(gulp.dest(destinationFolder + '/widget/fonts'));
@@ -155,10 +168,10 @@ gulp.task('zip', function () {
155168
.pipe(gulp.dest('..'));
156169
});
157170

158-
var buildTasksToRun=['html', 'Controlhtml','resources','images','fonts','icons'];
171+
var buildTasksToRun=['html', 'Controlhtml','resources','images','fonts','icons', 'assets', 'tests'];
159172

160173
cssTasks.forEach(function(task){ buildTasksToRun.push(task.name)});
161174
jsTasks.forEach(function(task){ buildTasksToRun.push(task.name)});
162175

163176
gulp.task('build', gulpSequence('clean',buildTasksToRun) );
164-
gulp.task('zipit', gulpSequence('zip'));// run by 'gulp zip' (191001 - Marcela)
177+
gulp.task('zipit', gulpSequence('zip'));// run by 'gulp zip' (191001 - Marcela)

‎resources/languages.json‎

Lines changed: 139 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,14 @@
1313
"toolTip": "The word Comment in the comment button",
1414
"placeholder": "Comment"
1515
},
16+
"updateStatus": {
17+
"title": "Update Status",
18+
"defaultValue": "Update Status",
19+
"inputType": "text",
20+
"maxLength": 20,
21+
"toolTip": "",
22+
"placeholder": "Update Status"
23+
},
1624
"backlog": {
1725
"title": "Backlog",
1826
"defaultValue": "Backlog",
@@ -50,6 +58,49 @@
5058
"inputType": "text",
5159
"toolTip": "",
5260
"placeholder": "Getting your purchase ready, please wait..."
61+
},
62+
"suggestionSuccessfullyAdded": {
63+
"title": "Suggestion Successfully Added",
64+
"defaultValue": "Your suggestion has been successfully added.",
65+
"inputType": "text",
66+
"toolTip": "",
67+
"placeholder": "Your suggestion has been successfully added."
68+
},
69+
"somethingWentWrong": {
70+
"title": "Something went wrong",
71+
"defaultValue": "Something went wrong, please try again later.",
72+
"inputType": "text",
73+
"toolTip": "",
74+
"placeholder": "Something went wrong, please try again later."
75+
},
76+
"purchaseWasCancelled": {
77+
"title": "Purchase Was Cancelled",
78+
"defaultValue": "The purchase was cancelled",
79+
"inputType": "text",
80+
"toolTip": "",
81+
"placeholder": "The purchase was cancelled"
82+
},
83+
"upvotes": {
84+
"title": "Upvotes",
85+
"defaultValue": "Upvotes",
86+
"inputType": "text",
87+
"toolTip": "",
88+
"placeholder": "Upvotes"
89+
},
90+
"purchaseNotAvailable": {
91+
"title": "Purchase Not Available",
92+
"defaultValue": "Purchase Not Available On Browser",
93+
"inputType": "text",
94+
"toolTip": "",
95+
"placeholder": "Purchase Not Available On Browser"
96+
},
97+
"unknownUser": {
98+
"title": "Unknown User",
99+
"defaultValue": "Someone",
100+
"inputType": "text",
101+
"maxLength": 20,
102+
"toolTip": "",
103+
"placeholder": "Someone"
53104
}
54105
}
55106
},
@@ -197,6 +248,94 @@
197248
"placeholder": "Remove"
198249
}
199250
}
251+
},
252+
"notifications": {
253+
"title": "Notifications",
254+
"labels": {
255+
"newItemTitle": {
256+
"title": "New Item Created Title",
257+
"defaultValue": "A new item has been created",
258+
"inputType": "text",
259+
"toolTip": "",
260+
"maxLength": 50,
261+
"placeholder": "A new item has been created"
262+
},
263+
"newItemBody": {
264+
"title": "New Item Created Message",
265+
"defaultValue": "A ${context.plugin.itemTitle} has been created",
266+
"inputType": "text",
267+
"toolTip": "",
268+
"maxLength": 150,
269+
"placeholder": "A ${context.plugin.itemTitle} has been created"
270+
},
271+
272+
"backlogItemTitle": {
273+
"title": "Task In Backlog Title",
274+
"defaultValue": "Task In Backlog",
275+
"inputType": "text",
276+
"toolTip": "",
277+
"maxLength": 50,
278+
"placeholder": "Task In Backlog"
279+
},
280+
"backlogItemBody": {
281+
"title": "Task In Backlog Message",
282+
"defaultValue": "${context.plugin.itemTitle} has been marked as In Backlog",
283+
"inputType": "text",
284+
"toolTip": "",
285+
"maxLength": 150,
286+
"placeholder": "${context.plugin.itemTitle} has been marked as In Backlog"
287+
},
288+
289+
"inProgressItemTitle": {
290+
"title": "Task In Progress Title",
291+
"defaultValue": "Task In Progress",
292+
"inputType": "text",
293+
"toolTip": "",
294+
"maxLength": 50,
295+
"placeholder": "Task In Progress"
296+
},
297+
"inProgressItemBody": {
298+
"title": "Task In Progress Message",
299+
"defaultValue": "${context.plugin.itemTitle} has been marked as In Progress",
300+
"inputType": "text",
301+
"toolTip": "",
302+
"maxLength": 150,
303+
"placeholder": "${context.plugin.itemTitle} has been marked as In Progress"
304+
},
305+
306+
"completedItemBody": {
307+
"title": "Task Completed",
308+
"defaultValue": "Task Completed",
309+
"inputType": "text",
310+
"toolTip": "",
311+
"maxLength": 50,
312+
"placeholder": "Task Completed"
313+
},
314+
"completedItemMessageInputPlaceholder": {
315+
"title": "Completed Task Message Input",
316+
"defaultValue": "${context.plugin.itemTitle} has been marked as completed",
317+
"inputType": "text",
318+
"toolTip": "",
319+
"maxLength": 150,
320+
"placeholder": "${context.plugin.itemTitle} has been marked as completed"
321+
},
322+
"completedItemMessageSendText": {
323+
"title": "Completed Task Message Send Text",
324+
"defaultValue": "Send",
325+
"inputType": "text",
326+
"toolTip": "",
327+
"maxLength": 9,
328+
"placeholder": "Send"
329+
},
330+
"completedItemMessageCancelText": {
331+
"title": "Completed Task Message Cancel Text",
332+
"defaultValue": "Cancel",
333+
"inputType": "text",
334+
"toolTip": "",
335+
"maxLength": 9,
336+
"placeholder": "Cancel"
337+
}
338+
}
200339
}
201340
}
202341
}

‎widget/app.services.js‎

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -41,15 +41,4 @@
4141
}
4242
};
4343
}])
44-
.filter('getUserImage', function () {
45-
return function (user) {
46-
var url = './assets/images/avatar.png';
47-
if (user) {
48-
url = buildfire.auth.getUserPictureUrl({ userId: user._id });
49-
url = buildfire.imageLib.cropImage(url,{ size: "xs", aspect: "1:1" });
50-
return url;
51-
}
52-
return url;
53-
};
54-
})
55-
})(window.angular, window.buildfire);
44+
})(window.angular, window.buildfire);

‎widget/assets/css/animations.css‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,28 @@
55
animation-fill-mode: both;
66
}
77

8+
.user-image-container {
9+
min-width: 40px;
10+
min-height: 40px;
11+
width: 40px;
12+
height: 40px;
13+
overflow: hidden;
14+
position: relative;
15+
border-radius: 100%;
16+
}
17+
18+
.loading-image::after {
19+
position: absolute;
20+
top: 0;
21+
right: 0;
22+
bottom: 0;
23+
left: 0;
24+
transform: translateX(-100%);
25+
background-image: linear-gradient(90deg, rgba(var(--bf-theme-background-rgb), 0) 0, rgba(var(--bf-theme-background-rgb), 0.2) 20%, rgba(var(--bf-theme-background-rgb), 0.5) 60%, rgba(var(--bf-theme-background-rgb), 0));
26+
-webkit-animation: shimmer 2s infinite;
27+
animation: shimmer 2s infinite;
28+
content: "";
29+
}
830

931
@-webkit-keyframes fadeInRight {
1032
from {

0 commit comments

Comments
 (0)