lunax
/
bashtube
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* template fixes

18l-fix
Dominika Liberda 2021-02-28 18:17:35 +01:00
parent 5390c36dba
commit f6958765c4
5 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
templates/themes/default/watch.t
View File

@ -12,7 +12,8 @@
<div>
<b>{{.view_count}}</b> views<br>
<b>{{.like_count}}</b> likes, <b>{{.dislike_count}}</b> dislikes.<br>
{{.fav}}
{{.fav}}
{{.sub}}
<br><br>
</div>
</div>

3
templates/themes/default/watch_flash.t
View File

@ -12,7 +12,8 @@
<div>
<b>{{.view_count}}</b> views<br>
<b>{{.like_count}}</b> likes, <b>{{.dislike_count}}</b> dislikes.<br>
{{.fav}}
{{.fav}}
{{.sub}}
<br><br>
</div>
</div>

4
webroot/index.shs
View File

@ -11,5 +11,7 @@ for i in $(tac storage/faves); do
if [[ ${array[1]} == '' ]]; then
break
fi
storage[favourites]+="<div><a href='watch?v=${array[1]}'><img src='https://i.ytimg.com/vi/${array[1]}/mqdefault.jpg'><br><b>${array[@]:2:999}</b></a><br>Favourited by ${array[0]}</div>";
strings[favourites]+="<div><a href='watch?v=${array[1]}'><img src='https://i.ytimg.com/vi/${array[1]}/mqdefault.jpg'><br><b>${array[@]:2:999}</b></a><br>Favourited by ${array[0]}</div>";
done
render_unsafe strings "${cfg[namespace]}/templates/themes/${cfg[template]}/index.t"

8
webroot/watch.shs
View File

@ -57,18 +57,18 @@ if [[ "${get_data[v]}" ]]; then
strings[fav]="<a href='unfav.shs?v=$(sed -s 's/<//g;' <<< "${get_data[v]}")' target='_blank'>Remove from favourites</a><br>"
fi
fi
if [[ $(grep $(session_get_username "${cookies[sh_session]}") storage/subscribed | grep "$channel_id") == '' ]]; then
if [[ $(grep $(session_get_username "${cookies[sh_session]}") storage/subscribed | grep "${strings[channel_id]}") == '' ]]; then
if [[ ${cfg[template]} == 'default' ]]; then
strings[fav]="<a href='subscribe.shs?id=$channel_id' target='_blank'>Subscribe to $uploader!</a><br>"
strings[sub]="<a href='subscribe.shs?id=${strings[channel_id]}' target='_blank'>Subscribe to ${strings[uploader]}!</a><br>"
fi
else
if [[ ${cfg[template]} == 'default' ]]; then
strings[fav]="<a href='unsubscribe.shs?id=$channel_id' target='_blank'>Unsubscribe from $uploader</a><br>"
strings[sub]="<a href='unsubscribe.shs?id=${strings[channel_id]}' target='_blank'>Unsubscribe from ${strings[uploader]}</a><br>"
fi
fi
else
if [[ ${cfg[template]} == 'default' ]]; then
strings[fav]="<b><a href='/login.shs?r=$(echo ${r[url]} | sed -s 's/?/___/')'>Log in</a> to add this video to your favourites and/or subscribe to this channel!</b><br>"
strings[fav]="<b><a href='/login.shs?r=$(sed -s 's/?/___/' <<< "${r[url]}")'>Log in</a> to add this video to your favourites and/or subscribe to this channel!</b><br>"
fi
fi
strings[description]=$(echo "$video" | jq -r '.description' | sed -E 's/$/<br>/g')

10
webroot/watch_flash.shs
View File

@ -50,20 +50,20 @@ if [[ "${get_data[v]}" ]]; then
if [[ ${cookies[sh_session]} ]]; then
if [[ $(grep $(session_get_username "${cookies[sh_session]}") storage/faves | grep "${get_data[v]}") == '' ]]; then
if [[ ${cfg[template]} == 'default' ]]; then
echo "<a href='fav.shs?v=$(sed -s 's/<//g;' <<< "${get_data[v]}")' target='_blank'>Add to favourites</a><br>"
strings[fav]="<a href='fav.shs?v=$(sed -s 's/<//g;' <<< "${get_data[v]}")' target='_blank'>Add to favourites</a><br>"
fi
else
if [[ ${cfg[template]} == 'default' ]]; then
echo "<a href='unfav.shs?v=$(sed -s 's/<//g;' <<< "${get_data[v]}")' target='_blank'>Remove from favourites</a><br>"
strings[fav]="<a href='unfav.shs?v=$(sed -s 's/<//g;' <<< "${get_data[v]}")' target='_blank'>Remove from favourites</a><br>"
fi
fi
if [[ $(grep $(session_get_username "${cookies[sh_session]}") storage/subscribed | grep "$channel_id") == '' ]]; then
if [[ $(grep $(session_get_username "${cookies[sh_session]}") storage/subscribed | grep "${strings[channel_id]}") == '' ]]; then
if [[ ${cfg[template]} == 'default' ]]; then
echo "<a href='subscribe.shs?id=$channel_id' target='_blank'>Subscribe to $uploader!</a><br>"
strings[sub]="<a href='subscribe.shs?id=${strings[channel_id]}' target='_blank'>Subscribe to $uploader!</a><br>"
fi
else
if [[ ${cfg[template]} == 'default' ]]; then
echo "<a href='unsubscribe.shs?id=$channel_id' target='_blank'>Unsubscribe from $uploader</a><br>"
strings[sub]="<a href='unsubscribe.shs?id=${strings[channel_id]}' target='_blank'>Unsubscribe from $uploader</a><br>"
fi
fi
else