Skip to content

Commit

Permalink
* Multi language related issues fixed.
Browse files Browse the repository at this point in the history 
* Authorization code grant type work going on.
  • Loading branch information
Sivachidambaram. S committed Jan 22, 2016
1 parent 8ad3b57 commit 6e924b5
Show file tree
Hide file tree
Showing 71 changed files with 600 additions and 332 deletions.
1 change: 1 addition & 0 deletions .htaccess
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,6 @@ Options -Indexes
RewriteRule ^ical/([0-9]*)/([a-zA-Z0-9]*).ics$ server/php/ical.php?id=$1&hash=$2 [NC]
RewriteRule ^client/download/([0-9]*)/([a-zA-Z0-9_\.]*)$ server/php/download.php?id=$1&hash=$2 [NC]
RewriteRule ^client/oauth_callback/([a-zA-Z0-9_\.]*)/([a-zA-Z0-9_\.]*)$ server/php/oauth_callback.php?plugin=$1&code=$2 [NC]
RewriteRule ^oauth/authorize$ server/php/authorize.php [NC]
RewriteRule ^api/(.*)$ server/php/R/r.php?_url=$1 [QSA,L]
</IfModule>
2 changes: 1 addition & 1 deletion Gruntfile.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ module.exports = function(grunt) {
},
i18n: {
cmd: [
'php build/i18n.php client/js/*.js client/js/views/*.js client/js/templates/*.ejs'
'php build/i18n.php client/js/*.js client/js/views/*.js client/js/templates/*.ejs client/apps/**/js/*.js'
].join('&&')
}
},
Expand Down
2 changes: 2 additions & 0 deletions client/js/application.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -256,11 +256,13 @@ var AppRouter = Backbone.Router.extend({
});
},
register: function() {
$('.dockmodal, .dockmodal-overlay').remove();
new App.ApplicationView({
model: 'register'
});
},
login: function() {
$('.dockmodal, .dockmodal-overlay').remove();
new App.ApplicationView({
model: 'login'
});
Expand Down
2 changes: 1 addition & 1 deletion client/js/libs/backbone.upload-manager.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@
bindProcessEvents: function ()
{
if(!_.isUndefined(authuser.user)){
this.$el.html('Drop files to upload');
this.$el.html(i18next.t('Drop files to upload'));
}
var self = this;
this.uploadProcess.on('fileuploaddragover', function (e) {
Expand Down
2 changes: 1 addition & 1 deletion client/js/templates/admin_board_index.jst.ejs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
<form class="form-inline" role="form">
<div class="pr clearfix">
<select class="js-more-action-user" id="js-more-action">
<option><%- i18next.t("More Actions") %></option>
<option value="0"><%- i18next.t("More Actions") %></option>
<option value="1"><%- i18next.t("Close") %></option>
<option value="2"><%- i18next.t("Reopen") %></option>
<option value="3"><%- i18next.t("Delete") %></option>
Expand Down
2 changes: 1 addition & 1 deletion client/js/templates/admin_board_view.jst.ejs
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<td>
<div class="form-group text-center">
<div class="checkbox">
<input id="<%- board.attributes.id%>" name="board_id[<%- board.attributes.id %>]" value="<%- board.attributes.id%>" class="js-checkbox-list <%if(board.attributes.is_closed == false){%>js-checkbox-active<%}else{%>js-checkbox-inactive<%}%>" type="checkbox">
<input id="<%- board.attributes.id%>" name="board_id[<%- board.attributes.id %>]" value="<%- board.attributes.id%>" class="js-checkbox-list <%if(parseInt(board.attributes.is_closed) === 0){%>js-checkbox-active<%}else{%>js-checkbox-inactive<%}%>" type="checkbox">
<label class="js-update-board" data-board_id="<%- board.attributes.id %>" for="<%- board.attributes.id%>"></label>
</div>
</div>
Expand Down
14 changes: 7 additions & 7 deletions client/js/templates/board_header.jst.ejs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<input id="inputBoardStar" name="is_starred" type="hidden" value="<%if(!_.isUndefined(star)) {%><%- star.attributes.is_starred %><%}else{%>0<%}%>">
</form>
<div class="col-xs-12 pull-left navbar-btn list-group-item-text <% if(!_.isEmpty(role_links.where({slug: 'edit_board'}))){ %>dropdown<% } %>">
<% if(!_.isUndefined(star) && (star.attributes.is_starred || star.attributes.is_starred == 1)) { %>
<% if(!_.isUndefined(star) && (parseInt(star.attributes.is_starred) === 1)) { %>
<% if(!_.isEmpty(role_links.where({slug: "starred_board"}))){ %>
<a href="#" class="js-star-board pull-left" name="unstar" title="
<%- i18next.t('Unstar') %>"><i class="icon-star text-primary"></i></a>
Expand Down Expand Up @@ -166,13 +166,13 @@
<% var board_visibility = '';
var board_visibility_icon = '';
if(board.attributes.board_visibility == 0) {
board_visibility = 'Private';
board_visibility = i18next.t('Private');
board_visibility_icon = 'icon-lock';
} else if(board.attributes.board_visibility == 1 && board.attributes.organization_id > 0) {
board_visibility = 'Organization';
board_visibility = i18next.t('Organization');
board_visibility_icon = 'icon-group';
} else if(board.attributes.board_visibility == 2) {
board_visibility = 'Public';
board_visibility = i18next.t('Public');
board_visibility_icon = 'icon-circle';
}
%>
Expand Down Expand Up @@ -214,7 +214,7 @@
<form name="BoardSubscribeForm" id="BoardSubscribeForm">
<input id="inputBoardSubscribe" name="is_subscribed" type="hidden" value=" <% if(!_.isUndefined(subscriber)) { %> <%- subscriber.attributes.is_subscribed %><%}else{%>0<%}%>">
</form>
<% if(!_.isUndefined(subscriber) && subscriber.attributes.is_subscribed) { %>
<% if(!_.isUndefined(subscriber) && parseInt(subscriber.attributes.is_subscribed)) { %>
<% if(!_.isEmpty(role_links.where({slug: "unsubscribe_board"}))){ %>
<a href="#" class="js-subscribe-board navbar-btn h4 list-group-item-text" name="unsubscribe" title="<%- i18next.t('Unsubscribe') %>" data-placement="bottom" data-toggle="tooltip"><i class="icon-eye-close"></i><span class="hidden-xs"><%- i18next.t('Unsubscribe') %></span></a>
<% } %>
Expand All @@ -241,7 +241,7 @@
<% } %>
<% if(!_.isUndefined(authuser.user)){ %>
<% if(!_.isEmpty(role_links.where({slug: "view_sync_calendar"}))){ %>
<li class="js-sync-google-dropdown inner-dropdown"><a href="#" class="js-syn-google-calendar" data-toggle="dropdown"><span class="icon-calendar"></span><%- i18next.t('Sync with Google Calendar') %></a>
<li class="js-sync-google-dropdown inner-dropdown"><a href="#" class="js-syn-google-calendar" data-toggle="dropdown"><span class="icon-calendar"></span><%- i18next.t('iCal Feed') %></a>
</li>
<% } %>
<li class="divider"></li>
Expand Down Expand Up @@ -286,7 +286,7 @@
<input id="inputBoardClose" name="is_closed" type="hidden" value="true">
<p><%- i18next.t('You can reopen the board by clicking the "Boards" menu from the header, selecting "View Closed Boards", finding the board and clicking "Reopen".') %></p>
<div class="submit">
<input type="submit" value="Close" id="submitBoardClose" class="btn btn-primary js-close-board">
<input type="submit" value="<%- i18next.t('Close') %>" id="submitBoardClose" class="btn btn-primary js-close-board">
</div>
</form>
</div>
Expand Down
2 changes: 1 addition & 1 deletion client/js/templates/board_sidebar.jst.ejs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<% } %>
<%if(!_.isUndefined(authuser.user)) {%>
<% if(!_.isEmpty(role_links.where({slug: "view_sync_calendar"}))){ %>
<li class="dropdown js-sync-google-dropdown inner-dropdown"><a href="#" class="js-syn-google-calendar" data-toggle="dropdown"><span class="icon-calendar"></span><%- i18next.t('Sync with Google Calendar') %></a>
<li class="dropdown js-sync-google-dropdown inner-dropdown"><a href="#" class="js-syn-google-calendar" data-toggle="dropdown"><span class="icon-calendar"></span><%- i18next.t('iCal Feed') %></a>
<ul class="dropdown-menu arrow">
<li class="js-dropdown-popup dropdown-popup">
<div class="col-xs-12 text-center clearfix">
Expand Down
11 changes: 6 additions & 5 deletions client/js/templates/board_user_actions.jst.ejs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,25 +17,26 @@
<div class="col-xs-12">
<ul class="list-unstyled dropdown-menu dropdown-list show">
<li class="dropdown <%if(!is_admin){%>disabled<%}%>">
<a href="#" data-toggle="dropdown" class="dropdown-toggle <%if(is_admin){%>js-show-dropdown<%}%>"> <%- i18next.t('Change permissions') %> (<% if(user.attributes.is_admin == true || user.attributes.is_admin == 1){ %> <%- i18next.t('Owner') %> <%}else{%> <%- i18next.t('Member') %><%}%>)</a>
<a href="#" data-toggle="dropdown" class="dropdown-toggle <%if(is_admin){%>js-show-dropdown<%}%>"> <%- i18next.t('Change permissions') %> (<% if(parseInt(user.attributes.is_admin) === 1){ %> <%- i18next.t('Owner') %> <%}else{%> <%- i18next.t('Member') %><%}%>)</a>
<ul class="dropdown-menu dropdown-menu-right arrow arrow-right js-list-actions-response">
<div class="clearfix text-center col-xs-12"> <span class="col-xs-10"><strong><%- i18next.t('Change permissions') %></strong></span><a href="#" class="js-close-popup pull-right"><i class="icon-remove "></i></a> </div>
<div class="col-xs-12 divider"></div>
<div class="col-xs-12">
<ul class="list-unstyled">
<li> <a href="#" class="<% if(user.attributes.is_admin == false || user.attributes.is_admin == 0){ %>js-edit-board-member-permission-to-admin<%}else{%>js-no-action<%}%>"> <span class="show text-primary"><%- i18next.t('Owner') %> <% if(user.attributes.is_admin == true || user.attributes.is_admin == 1){ %><i class="icon-ok"></i><%}%></span> <span class="text-muted"><%- i18next.t('Can view and edit cards, remove members, and change settings for the board.') %></span> </a> </li>
<li> <a href="#" class="<% if(parseInt(user.attributes.is_admin) === 0){ %>js-edit-board-member-permission-to-admin<%}else{%>js-no-action<%}%>"> <span class="show text-primary"><%- i18next.t('Owner') %> <% if(parseInt(user.attributes.is_admin) === 1){ %><i class="icon-ok"></i><%}%></span> <span class="text-muted"><%- i18next.t('Can view and edit cards, remove members, and change settings for the board.') %></span> </a> </li>
<li class="divider"></li>
<li> <a href="#" class="<% if(user.attributes.is_admin == true || user.attributes.is_admin == 1){ %>js-edit-board-member-permission-to-normal<%}else{%>js-no-action<%}%>"><span class="show text-primary"><%- i18next.t('Member') %> <% if(user.attributes.is_admin == false || user.attributes.is_admin == 0){ %><i class="icon-ok"></i><%}%></span> <span class="text-muted"><%- i18next.t("Can view and edit cards. Can't change settings.") %></span></a> </li>
<li> <a href="#" class="<% if(parseInt(user.attributes.is_admin) === 1){ %>js-edit-board-member-permission-to-normal<%}else{%>js-no-action<%}%>"><span class="show text-primary"><%- i18next.t('Member') %> <% if(parseInt(user.attributes.is_admin) === 0){ %><i class="icon-ok"></i><%}%></span> <span class="text-muted"><%- i18next.t("Can view and edit cards. Can't change settings.") %></span></a> </li>
</ul>
</div>
</ul>
</li>
<li>
<a href="#" title="View member's board activity" data-user-id="<%- user.attributes.user_id %>" class="js-view-user-activities">
<% var title = i18next.t("View member's board activity"); %>
<a href="#" title="<%- title %>" data-user-id="<%- user.attributes.user_id %>" class="js-view-user-activities">
<span><%- i18next.t("View member's board activity") %></span>
</a>
</li>
<% if ((!_.isUndefined(authuser.user) && authuser.user.role_id == 1) || ((user.attributes.is_admin == false || user.attributes.is_admin == 0) && (parseInt(authuser.user.id) === user.attributes.user_id || (is_admin))) || (user.collection.board.admin_board_users.length > 1 && is_admin)) { %>
<% if ((!_.isUndefined(authuser.user) && authuser.user.role_id == 1) || ((parseInt(user.attributes.is_admin) === 0) && (parseInt(authuser.user.id) === user.attributes.user_id || (is_admin))) || (user.collection.board.admin_board_users.length > 1 && is_admin)) { %>
<li><a href="#" title="<%if(parseInt(authuser.user.id) != user.attributes.user_id ){%><%- i18next.t('Remove from board') %><%}else{%><%- i18next.t('Leave from board') %><%}%>" class="js-show-confirm-delete-board-member"><% if(parseInt(authuser.user.id) != user.attributes.user_id ){%><%- i18next.t('Remove from board') %><%}else{%><%- i18next.t('Leave from board') %><%}%></a></li>
<% } %>

Expand Down
2 changes: 1 addition & 1 deletion client/js/templates/board_users_view.jst.ejs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<% } else {%>
<i class="avatar avatar-color-194 img-rounded"><%- user.attributes.initials %></i>
<% } %>
<% if(is_admin && user.attributes.is_admin) { %>
<% if(is_admin && parseInt(user.attributes.is_admin)) { %>
<span class="name-block col-xs-1 label btn-xs col-xs-push-0"><%- i18next.t('Owner') %></span>
<% } %>
</span></a>
Expand Down
2 changes: 1 addition & 1 deletion client/js/templates/card.jst.ejs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<%
if(!_.isUndefined(authuser) && !_.isUndefined(authuser.user)){
var cards_subscribers = card.cards_subscribers.where({
is_subscribed: true,
is_subscribed: 1,
user_id: parseInt(authuser.user.id)
});
}
Expand Down
4 changes: 2 additions & 2 deletions client/js/templates/card_checklist_item.jst.ejs
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<div class="form-group list-group-item-text" data-checklist-id="<%- checklist_item.get('id') %>">
<div class="checkbox list-group-item-text">
<input id="checklist<%- checklist_item.get('id') %>" type="checkbox" class="hide <% if(!_.isUndefined(authuser.user)){ if(checklist_item.get('is_completed') == 'true' || checklist_item.get('is_completed') == true || checklist_item.get('is_completed') == 1){ %> js-markas-incomplete <% } else{%> js-markas-completed <% } } %>" <% if(checklist_item.get('is_completed') == 'true' || checklist_item.get('is_completed') == true || checklist_item.get('is_completed') == 1){ %>checked<% } %> <% if(_.isUndefined(authuser.user)){%> disabled<%}%> >
<input id="checklist<%- checklist_item.get('id') %>" type="checkbox" class="hide <% if(!_.isUndefined(authuser.user)){ if(parseInt(checklist_item.get('is_completed')) === 1){ %> js-markas-incomplete <% } else{%> js-markas-completed <% } } %>" <% if(parseInt(checklist_item.get('is_completed')) === 1){ %>checked<% } %> <% if(_.isUndefined(authuser.user)){%> disabled<%}%> >
<label for="checklist<%- checklist_item.get('id') %>" class="pull-left js-checklist-item-head">
</label>
<div class="col-xs-11 row">
<a href="#" class="row pull-left <% if(!_.isUndefined(authuser.user) && !_.isEmpty(role_links.where({slug: 'edit_checklist_item'}))){ %>js-show-item-edit-form<% }else{ %>js-no-action<%}%> <% if(checklist_item.get('is_completed') == 'true' || checklist_item.get('is_completed') == true || checklist_item.get('is_completed') == 1){ %> strike-through-text <% } %>" ><%- checklist_item.get('name') %></a>
<a href="#" class="row pull-left <% if(!_.isUndefined(authuser.user) && !_.isEmpty(role_links.where({slug: 'edit_checklist_item'}))){ %>js-show-item-edit-form<% }else{ %>js-no-action<%}%> <% if(parseInt(checklist_item.get('is_completed')) === 1){ %> strike-through-text <% } %>" ><%- checklist_item.get('name') %></a>
</div>
</div>
</div>
2 changes: 1 addition & 1 deletion client/js/templates/card_duedate_from.jst.ejs
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<% var date = ''; var time = ''; if (card.attributes.due_date !== null && card.attributes.due_date !== 'NULL') { var date_time = card.attributes.due_date.split('T'); date_time = date_time[0].split(' '); date = date_time[0]; time = date_time[1]; } %><div class="form-group"><div class="col-xs-6"><label><%- i18next.t('Date') %></label><input type="text" class="form-control input-sm js-card-duedate-edit-<%=card.attributes.id%>" name="due_date" data-format="yyyy-MM-dd" value="<%= date%>" required></div><div class="col-xs-6"><label><%- i18next.t('Time') %></label><input type="text" class="form-control input-sm js-card-duetime-edit-<%=card.attributes.id%>" name="due_time" data-format="hh:mm:ss" value="<%= time%>" required></div></div><div class="form-group"><div class="col-xs-6"><label for="save" class="sr-only"><%- i18next.t('Save') %></label><input type="submit" value="<%- i18next.t('Save') %>" id="save" class="btn btn-primary" id="submitCardDueDateEditForm"></div><% if(!_.isEmpty(card.attributes.due_date) && card.attributes.due_date != 'NULL') { %><div class="col-xs-6"><label for="remove" class="sr-only"><%- i18next.t('Remove') %></label><input type="reset" value="Remove" class="btn btn-default js-remove-due-date"></div><% } %></div>
<% var date = ''; var time = ''; if (card.attributes.due_date !== null && card.attributes.due_date !== 'NULL') { var date_time = card.attributes.due_date.split('T'); date_time = date_time[0].split(' '); date = date_time[0]; time = date_time[1]; } %><div class="form-group"><div class="col-xs-6"><label><%- i18next.t('Date') %></label><input type="text" class="form-control input-sm js-card-duedate-edit-<%=card.attributes.id%>" name="due_date" data-format="yyyy-MM-dd" value="<%= date%>" required></div><div class="col-xs-6"><label><%- i18next.t('Time') %></label><input type="text" class="form-control input-sm js-card-duetime-edit-<%=card.attributes.id%>" name="due_time" data-format="hh:mm:ss" value="<%= time%>" required></div></div><div class="form-group"><div class="col-xs-6"><label for="save" class="sr-only"><%- i18next.t('Save') %></label><input type="submit" value="<%- i18next.t('Save') %>" id="save" class="btn btn-primary" id="submitCardDueDateEditForm"></div><% if(!_.isEmpty(card.attributes.due_date) && card.attributes.due_date != 'NULL') { %><div class="col-xs-6"><label for="remove" class="sr-only"><%- i18next.t('Remove') %></label><input type="reset" value="<%- i18next.t('Remove') %>" class="btn btn-default js-remove-due-date"></div><% } %></div>
2 changes: 1 addition & 1 deletion client/js/templates/card_list_view.jst.ejs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<ul class="list-inline text-muted clearfix">
<%
if(!_.isUndefined(authuser) && !_.isUndefined(authuser.user)){
var cards_subscribers = card.cards_subscribers.where({ is_subscribed: true, user_id: parseInt(authuser.user.id) });
var cards_subscribers = card.cards_subscribers.where({ is_subscribed: 1, user_id: parseInt(authuser.user.id) });
}
if(!_.isUndefined(cards_subscribers) && cards_subscribers > 0){ %>
<li><small><span class="icon-eye-open"></span></small></li><% } %><% if(card.attributes.card_voter_count > 0){ %><li title="<%- i18next.t('{{count}} Vote', {count: card.attributes.card_voter_count}) %> "" data-placement="bottom" data-toggle="tooltip"><small><span class="icon-thumbs-up"></span><span><%- card.attributes.card_voter_count %>votes</span></small></li><% } %><% if(card.attributes.description !== "" && card.attributes.description !== null ){ %><li title="<%- i18next.t('Description') %>" data-placement="bottom" data-toggle="tooltip"><small><span class="icon-align-left"></span></small></li><% } %><% if(card.attributes.comment_count > 0){ %><li title="<%- i18next.t('{{count}} Comment', { postProcess: 'sprintf', sprintf: [card.attributes.comment_count]}) %> "" data-placement="bottom" data-toggle="tooltip"><small><span class="icon-comment"></span><span><%- card.attributes.comment_count %></span></small></li><% } %><% if(card.attributes.checklist_item_count > 0){ %><li title="<%- i18next.t('%s checklist completed out of %s', { postProcess: 'sprintf', sprintf: [card.attributes.checklist_item_completed_count,card.attributes.checklist_item_count]}) %> "" data-placement="bottom" data-toggle="tooltip"><small><% if(card.attributes.checklist_item_completed_count == card.attributes.checklist_item_count) { %><div class="label label-success"> <% } %><span class="icon-list-ul"></span><span><%- card.attributes.checklist_item_completed_count %>/<%- card.attributes.checklist_item_count %></span><% if(card.attributes.checklist_item_completed_count == card.attributes.checklist_item_count) { %></div><% } %></small></li><% } %><% if(card.attributes.due_date > 0){ %><li title="<%- i18next.t('Due Date') %>" data-placement="bottom" data-toggle="tooltip"><small><span class="icon-time"></span><span><%- card.attributes.due_date %></span></small></li><% } %><% if(!_.isEmpty(card.attachments) && card.attachments.length > 0){ %><li title="<%- i18next.t('{{count}} Attachment', { postProcess: 'sprintf', sprintf: [card.attachments.length]}) %> "" data-placement="bottom" data-toggle="tooltip"><small><span class="icon-paper-clip"></span> <span><%- card.attachments.length %></span></small></li><% } %><% if(!_.isEmpty(card.attributes.due_date) && card.attributes.due_date != 'NULL'){ %><li title="<%- i18next.t('Due Date') %>" data-placement="bottom" data-toggle="tooltip"><small><span class="label label-default"><% var date_time = card.attributes.due_date.split('T'); date_time = date_time[0].split(' '); %><%= dateFormat(date_time[0], 'mediumDate') %></span></small></li><% } %>
Expand Down
Loading

0 comments on commit 6e924b5

Please sign in to comment.