Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
U
ulakbus-ui
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
ulakbus
ulakbus-ui
Commits
c930028e
Commit
c930028e
authored
Jul 26, 2016
by
Evren Esat Özkan
Committed by
Vladimir Baranov
Jul 27, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
minor fixes, TR translation.
parent
0dca3c1f
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
22 additions
and
22 deletions
+22
-22
messaging.js
app/components/messaging/messaging.js
+11
-11
messaging_service.js
app/components/messaging/messaging_service.js
+2
-2
conversation.html
app/components/messaging/templates/conversation.html
+4
-4
delete_confirmation.html
app/components/messaging/templates/delete_confirmation.html
+2
-2
index.html
app/components/messaging/templates/index.html
+3
-3
No files found.
app/components/messaging/messaging.js
View file @
c930028e
...
...
@@ -43,11 +43,11 @@ angular.module("ulakbus.messaging")
rootElement
:
popupRootElement
,
link
:
function
(
scope
){
scope
.
channel
=
channel
||
{};
scope
.
title
=
"
Edit channel
"
;
scope
.
actionTitle
=
"
Edit
"
;
scope
.
title
=
"
Kanalı düzenle
"
;
scope
.
actionTitle
=
"
Düzenle
"
;
if
(
!
channel
){
scope
.
title
=
"
Create new channel
"
;
scope
.
actionTitle
=
"
Create
"
;
scope
.
title
=
"
Yeni Kanal Oluştur
"
;
scope
.
actionTitle
=
"
Oluştur
"
;
}
}
})
...
...
@@ -96,7 +96,7 @@ angular.module("ulakbus.messaging")
return
MessagingPopup
.
show
({
templateUrl
:
"components/messaging/templates/delete_confirmation.html"
,
link
:
function
(
scope
){
scope
.
title
=
title
||
"
Are you sure you want to delete
?"
;
scope
.
title
=
title
||
"
Silmek istediğinize emin misiniz
?"
;
},
rootElement
:
popupRootElement
})
...
...
@@ -166,7 +166,7 @@ angular.module("ulakbus.messaging")
break
;
case
'_zops_delete_channel'
:
iScope
.
deleteConfirmation
(
'
Are you sure you want to delete channel
?'
)
iScope
.
deleteConfirmation
(
'
Kanalı silmek istediğinize emin misiniz
?'
)
.
then
(
function
(){
MessagingService
.
delete_channel
(
getKey
(
channel
));
});
...
...
@@ -183,8 +183,8 @@ angular.module("ulakbus.messaging")
templateUrl
:
"components/messaging/templates/add_user_unit.html"
,
rootElement
:
popupRootElement
,
link
:
function
(
scope
){
scope
.
title
=
"
Add User to channel
"
;
scope
.
placeholder
=
"
Search User to Add
"
;
scope
.
title
=
"
Kanala kullanıcı ekle
"
;
scope
.
placeholder
=
"
Eklemek için kullanıcı ara
"
;
scope
.
onChange
=
function
(
query
){
searchWrapper
(
scope
,
function
(){
return
MessagingService
.
search_user
(
query
);
...
...
@@ -202,8 +202,8 @@ angular.module("ulakbus.messaging")
templateUrl
:
"components/messaging/templates/add_user_unit.html"
,
rootElement
:
popupRootElement
,
link
:
function
(
scope
){
scope
.
title
=
"
Add Unit
"
;
scope
.
placeholder
=
"
Search Unit to Add
"
;
scope
.
title
=
"
Birim Ekle
"
;
scope
.
placeholder
=
"
Kanala eklemek için birim ara
"
;
scope
.
onChange
=
function
(
query
){
searchWrapper
(
scope
,
function
(){
return
MessagingService
.
search_unit
(
query
);
...
...
@@ -278,7 +278,7 @@ angular.module("ulakbus.messaging")
});
break
;
case
"_zops_delete_message"
:
iScope
.
deleteConfirmation
(
"
Are you sure you want to delete message
?"
)
iScope
.
deleteConfirmation
(
"
Mesajı silmek istediğinize emin misiniz
?"
)
.
then
(
function
(){
return
MessagingService
.
delete_message
(
message
.
key
).
then
(
function
(){
deleteMessageLocally
(
message
.
key
);
...
...
app/components/messaging/messaging_service.js
View file @
c930028e
...
...
@@ -301,7 +301,7 @@ angular.module('ulakbus.messaging', ['ui.bootstrap'])
msg
.
delete_message
=
function
(
msgKey
)
{
var
outgoing
=
{
view
:
'_zops_delete_message'
,
message_
key
:
msgKey
key
:
msgKey
};
return
wsRequest
(
outgoing
).
then
(
function
(
result
){
$log
.
info
(
"Delete message "
,
msgKey
,
":"
,
result
);
...
...
@@ -338,7 +338,7 @@ angular.module('ulakbus.messaging', ['ui.bootstrap'])
msg
.
get_message_actions
=
function
(
msgKey
)
{
var
outgoing
=
{
view
:
'_zops_get_message_actions'
,
message_
key
:
msgKey
key
:
msgKey
};
return
wsRequest
(
outgoing
).
then
(
function
(
result
){
$log
.
info
(
"Get message actions"
,
msgKey
,
":"
,
result
);
...
...
app/components/messaging/templates/conversation.html
View file @
c930028e
...
...
@@ -5,7 +5,7 @@
<span
class=
"glyphicon glyphicon-remove"
></span>
</div>
<div
class=
"conversation-body"
>
Select or create channel to begin conversation
Konuşmaya başlamak için bir kanal seçin ya da oluşturun.
</div>
</div>
...
...
@@ -35,7 +35,7 @@
<div
class=
"conversation-body-inner"
>
<div
class=
"beginning-of-conversation"
>
This is the beginning of the conversation
Burası yazışmanın başı!
</div>
<div
class=
"conversation-block clearfix"
ng-repeat=
"msg in selectedChannel.messages"
>
...
...
@@ -72,8 +72,8 @@
<div
class=
"dropup"
style=
"float:left;"
>
<span
class=
"glyphicon glyphicon-paperclip dropdown-toggle"
data-toggle=
"dropdown"
id=
"attachment"
></span>
<ul
class=
"dropdown-menu"
aria-labelledby=
"attachment"
style=
"left:-104px;"
>
<li><a
href=
"#"
>
Image
</a></li>
<li><a
href=
"#"
>
File
</a></li>
<li><a
href=
"#"
>
Görsel
</a></li>
<li><a
href=
"#"
>
Dosya
</a></li>
</ul>
</div>
</div>
...
...
app/components/messaging/templates/delete_confirmation.html
View file @
c930028e
...
...
@@ -3,7 +3,7 @@
<div
class=
"text-center"
style=
"margin-top: 150px;font-size: 26px;"
>
<p>
{{title}}
</p>
<button
class=
"btn btn-success"
style=
"font-size: 20px;"
ng-click=
"done()"
>
Yes
</button>
<button
class=
"btn btn-default"
style=
"font-size: 20px;"
ng-click=
"cancel()"
>
Cancel
</button>
<button
class=
"btn btn-success"
style=
"font-size: 20px;"
ng-click=
"done()"
>
Evet
</button>
<button
class=
"btn btn-default"
style=
"font-size: 20px;"
ng-click=
"cancel()"
>
Vazgeç
</button>
</div>
</div>
app/components/messaging/templates/index.html
View file @
c930028e
...
...
@@ -6,16 +6,16 @@
<div
class=
"side-navigation"
>
<ul
class=
"channels"
>
<li
class=
"title"
ng-click=
"selectChannel(notificationsChannel)"
>
NOTIFICATIONS
<span
class=
"badge"
ng-show=
"notificationsChannel.unread"
>
{{notificationsChannel.unread}}
</span></li>
<li
class=
"title"
ng-click=
"selectChannel(notificationsChannel)"
>
BİLDİRİMLER
<span
class=
"badge"
ng-show=
"notificationsChannel.unread"
>
{{notificationsChannel.unread}}
</span></li>
</ul>
<ul
class=
"channels"
>
<li
class=
"title"
>
CHANNELS
<span
class=
"add-action glyphicon glyphicon-plus-sign"
ng-click=
"createChannel()"
></span></li>
<li
class=
"title"
>
KANALLAR
<span
class=
"add-action glyphicon glyphicon-plus-sign"
ng-click=
"createChannel()"
></span></li>
<li
ng-class=
"{'notification': ch.unread, 'active': isChannelSelected(ch)}"
title=
"{{ch.description}}"
ng-repeat=
"ch in publicChannels"
ng-click=
"selectChannel(ch)"
>
{{ch.name}}
</li>
</ul>
<ul
class=
"direct-messages"
>
<li
class=
"title"
>
DIRECT MESSAGES
<span
class=
"add-action glyphicon glyphicon-plus-sign"
ng-click=
"searchUser()"
></span></li>
<li
class=
"title"
>
MESAJLAR
<span
class=
"add-action glyphicon glyphicon-plus-sign"
ng-click=
"searchUser()"
></span></li>
<li
ng-class=
"{'notification': userChannel.unread, 'active': isChannelSelected(userChannel), 'online': userChannel.is_online}"
ng-repeat=
"userChannel in directChannels"
ng-click=
"selectChannel(userChannel)"
>
{{userChannel.name}}
</li>
</ul>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment