ndi-2018
/
main
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

upd: css.container|vue.container.emergency (added timestamp + date display)

This commit is contained in:
xdrm-brackets 2017-12-07 19:49:57 +01:00
parent ad575c3697
commit cf08a98b9e
2 changed files with 32 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
public_html/css/container.css
View File

@ -58,6 +58,16 @@
display: none; display: none;
} }
#CONTAINER.message div span.date{ /* Message date */
display: block;
position: relative;
margin-top: 1em;
color: #888;
font-size: .8em;
}
#CONTAINER.message div span span.code{ /* Code block */ #CONTAINER.message div span span.code{ /* Code block */
display: inline-block; display: inline-block;
position: relative; position: relative;

25
view/vue/container/emergency.vue
View File

@ -2,9 +2,10 @@
<div id='CONTAINER' class='message'> <div id='CONTAINER' class='message'>
<div v-for='(msg, id) in gstore.notif.emergency.data' :class="msg[0] == gstore.server.session.name ? 'me' : ''" :data-noauthor='id == 0 || gstore.notif.emergency.data[id-1][0] != gstore.notif.emergency.data[id][0] ? "1" : "0"'> <div v-for='(msg, id) in gstore.notif.emergency.data' :class="msg.user == gstore.server.session.user ? 'me' : ''" :data-noauthor='id == 0 || gstore.notif.emergency.data[id-1].user != msg.user ? "1" : "0"'>
<span class='author' v-text='msg[0]' v-if='id == 0 || gstore.notif.emergency.data[id-1][0] != msg[0]'></span> <span class='author' v-text='msg.user' v-if='id == 0 || gstore.notif.emergency.data[id-1].user != msg.user'></span>
<span class='content' v-html='bbcode(msg[1])'></span> <span class='content' v-html='bbcode(msg.message)'></span>
<span class='date' v-text='local_date(id)'></span>
</div> </div>
<div class='end-pad'></div> <!-- End Spacing --> <div class='end-pad'></div> <!-- End Spacing -->
@ -25,6 +26,24 @@ export default {
name: 'CONTAINER_EMERGENCY', name: 'CONTAINER_EMERGENCY',
data(){ return { gstore: gstore.data }; }, data(){ return { gstore: gstore.data }; },
methods: { methods: {
local_date: function(id){
/* (1) Get current date */
var cur = new Date( gstore.data.notif.emergency.data[id].timestamp );
console.log(cur);
/* (2) First line -> show whole date */
if( id < 1 )
return cur.toLocaleString();
/* (3) Get previous date */
var pre = new Date( gstore.data.notif.emergency.data[id-1].timestamp );
/* (2) If same day -> show time only */
if( cur.toLocaleDateString() == pre.toLocaleDateString() )
return cur.toLocaleTimeString();
return cur.toLocaleString();
},
new_message(msg){ new_message(msg){
// {1} Send message // // {1} Send message //