sudoxreboot/habitica-self-host
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-self-host.git synced 2026-08-02 04:00:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Place link to Markdown help prominently in Tavern chat (fix #1906)

Browse source
This commit is contained in:
Sabe Jones 2013-11-24 07:35:12 -06:00
parent 0e7c7e439f
commit 2101fe255f
2 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
views/options/social/group.jade
View file

@ -19,9 +19,8 @@ a.pull-right.gem-wallet(popover-trigger='mouseenter', popover-title='Guild Bank'
label.control-label Group Name
input.option-content(type='text', ng-model='group.name', placeholder='Group Name')
.control-group.option-large
label.control-label Description
label.control-label Description (Markdown OK)
textarea.option-content(style='height:15em;', placeholder='Description', ng-model='group.description')
include ../../shared/formatting-help
.control-group.option-large
label.control-label Logo URL
input.option-content(type='url', placeholder='Logo URL', ng-model='group.logo')
@ -87,8 +86,7 @@ a.pull-right.gem-wallet(popover-trigger='mouseenter', popover-title='Guild Bank'
.span8
div.blah-options(ng-show='group._editing')
.option-large
textarea.option-content(style='height:15em;', placeholder='Message from group leader', ng-model='group.leaderMessage')
include ../../shared/formatting-help
textarea.option-content(style='height:15em;', placeholder='Message from group leader (Markdown OK)', ng-model='group.leaderMessage')
table(ng-show='group.leaderMessage')
tr
td
@ -100,6 +98,7 @@ a.pull-right.gem-wallet(popover-trigger='mouseenter', popover-title='Guild Bank'
div(ng-controller='ChatCtrl')
h3 Chat
include ./chat-box
include ../../shared/formatting-help
ul.unstyled.tavern-chat
include ./chat-message

6
views/options/social/tavern.jade
View file

@ -104,7 +104,9 @@
.span8(ng-controller='ChatCtrl')
h3 Tavern Talk
include ./chat-box
small.alert.alert-info.
Note: if you're reporting a bug, the developers won't see it here. <a href='http://community.habitrpg.com/node/280' target='_blank'>Follow these instructions</a> instead.
small
include ../../shared/formatting-help
alert.alert-info.
Note: if you're reporting a bug, the developers won't see it here. <a href='http://community.habitrpg.com/node/280' target='_blank'>Follow these instructions</a> instead.
ul.unstyled.tavern-chat
include ./chat-message