BDIC
/
q-a_platform
mirror of https://csgitlab.ucd.ie/19206226/q-a_platform
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'collection' of csgitlab.ucd.ie:19206226/q-a_platform into collection

Browse Source
merge-requests/3/head
bug_creator 3 years ago
parent ac8c92db09 0bef8c8b2b
commit ffafa8886e
2 changed files with 32 additions and 11 deletions
Show Stats Download Patch File Download Diff File

31
app/templates/post.html
Unescape Escape View File

@ -122,7 +122,7 @@
})">
Share</a>
<div class="content" id="fancy-content" style="padding-bottom:20px;
border-bottom: 1px solid #ddd;margin: 30px;">
border-bottom: 1px solid #ddd;margin: 30px;">
{{ post.body_html| safe }}
</div>
</div>
@ -162,8 +162,12 @@
{% endif %}
</a>
</div>
<div class="col-sm-3">
<h4>
<div class="col-sm-3" style="text-align: center">
<h4 class="text-left">
<svg t="1638275834308" class="icon" viewBox="0 0 1024 1024" width="17" height="17">
<path d="M512 512c123.776 0 224-100.224 224-224S635.776 64 512 64a223.936 223.936 0 0 0-224 224C288 411.776 388.224 512 512 512z m0 64c-149.504 0-448 85.76-448 256v128h896v-128c0-170.24-298.496-256-448-256z" fill="#262626" p-id="4157">
</path>
</svg>
<a href="{{ url_for('.user', username=post.author.username) }}">
{{ post.author.username }}
{% if post.author.can(Permission.ACTIVITY) %}
@ -175,10 +179,27 @@
{% endif %}
</a>
</h4>
<h4 class="text-left" style="margin-top: 5px">
<svg t="1638276469792" class="icon" viewBox="0 0 1024 1024" width="18" height="18">
<path d="M513.92 537.216L99.968 278.592v96.96L513.92 637.44v-0.32l412.48-265.664V277.12L513.92 537.216zM0 128h1024v768H0V128z" fill="#262626" p-id="4289">
</path>
</svg>
<a href="{{ url_for('.user', username=post.author.username) }}">
{{ post.author.email }}
</a>
</h4>
</div>
<div class="col-sm-5">
<h6>{{ post.author.grade }}</h6>
<h6>{{ post.author.college }}</h6>
<h6 class="text-left">
<svg t="1638276824932" class="icon" viewBox="0 0 1024 1024" width="16" height="16">
<path d="M186.181818 679.563636c27.927273-18.618182 46.545455-46.545455 46.545455-74.472727 0-37.236364-18.618182-65.163636-55.854546-83.781818V409.6L512 558.545455 1024 325.818182 512 93.090909 0 325.818182l111.709091 46.545454v148.945455c-37.236364 18.618182-55.854545 46.545455-55.854546 83.781818 0 27.927273 18.618182 55.854545 46.545455 74.472727L55.854545 837.818182c-27.927273 93.090909 46.545455 93.090909 46.545455 93.090909h93.090909s74.472727 0 46.545455-93.090909L186.181818 679.563636z" p-id="6799"></path><path d="M325.818182 577.163636v27.927273c0 37.236364-18.618182 74.472727-37.236364 102.4 18.618182 37.236364 37.236364 74.472727 37.236364 130.327273v55.854545c46.545455 18.618182 111.709091 37.236364 186.181818 37.236364C744.727273 930.909091 837.818182 791.272727 837.818182 791.272727v-279.272727L512 660.945455l-186.181818-83.781819z" p-id="6800">
</path></svg>
&nbsp{{ post.author.grade }}</h6>
<h6 class="text-left" style="margin-top: 5px">
<svg t="1638277114233" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="9061" width="16" height="16">
<path d="M254.8746 854.5444 254.8746 498.187264l39.131136 0 0-44.130304L94.164992 454.05696l0 40.17152 39.12704 0 0 360.31488L254.874624 854.54336zM31.7174 414.9268c0 0 966.1348 0 967.5919 0 23.3165-10.2031 22.2751-32.0625 0.4157-46.6319C977.8668 353.7203 514.6655 19.3475 514.6655 19.3475S55.0339 353.7203 31.7174 368.2949C8.4019 382.8644 6.9448 404.7237 31.7174 414.9268zM514.6655 184.4603c38.6304 0 69.9484 31.3139 69.9484 69.9484 0 38.6304-31.317 69.9484-69.9484 69.9484-38.6345 0-69.9515-31.317-69.9515-69.9484C444.713 215.7742 476.031 184.4603 514.6655 184.4603zM55.8346 934.4993 975.188992 934.4993 975.188992 895.368192 55.834624 895.368192 55.834624 934.499328zM15.9068 1014.4543l999.213056 0 0-36.625408L15.906816 977.828892 15.906816 1014.454272zM576.3072 854.5444 576.3072 495.685632l39.12704 0 0-39.131136L415.593472 456.554496l0 37.673984 39.12704 0 0 360.31488L576.3072 854.54336zM895.234 854.5444 895.234 495.685632l39.131136 0 0-39.131136L734.52032 456.554496l0 37.673984 39.131136 0 0 360.31488L895.234048 854.54336z" p-id="9062">
</path></svg>
&nbsp{{ post.author.college }}</h6>
</div>
{% if current_user.can(Permission.FOLLOW) and post.author != current_user %}
{% if not current_user.is_following(post.author) %}

12
app/templates/user.html
Unescape Escape View File

@ -119,24 +119,24 @@
</li>
{% if user.can(Permission.ACTIVITY) %}
<li id="btn-4">
<a href="#panel-4" data-toggle="tab">MyAnnouncements</a>
<a href="#panel-4" data-toggle="tab">My Announcements</a>
</li>
{% else %}
<li id="btn-3">
<a href="#panel-3" data-toggle="tab">MyTransactions</a>
<a href="#panel-3" data-toggle="tab">My Transactions</a>
</li>
<li id="btn-6">
<a href="#panel-6" data-toggle="tab">ShoppingCart</a>
<a href="#panel-6" data-toggle="tab">Shopping Cart</a>
</li>
{% endif %}
<li id="btn-5">
<a href="#panel-5" data-toggle="tab">WantToGo</a>
<a href="#panel-5" data-toggle="tab">Want To Go</a>
</li>
<li id="btn-8">
<a href="#panel-8" data-toggle="tab">ConcernQuestion</a>
<a href="#panel-8" data-toggle="tab">Concern Question</a>
</li>
<li id="btn-9">
<a href="#panel-9" data-toggle="tab">ConcernAnswer</a>
<a href="#panel-9" data-toggle="tab">Concern Answer</a>
</li>
</ul>

Write Preview
Loading…
Cancel
Save