[chronojump-server] Updated default player image and checking organization image
- From: Max Ros i Morejon <maxros src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump-server] Updated default player image and checking organization image
- Date: Mon, 8 Apr 2019 09:13:46 +0000 (UTC)
commit 3626dedb5a5e4839bf09edb71c93e8c4d3f4921d
Author: Max Ros i Morejon <mros33 gmail com>
Date: Mon Apr 8 11:13:02 2019 +0200
Updated default player image and checking organization image
.../chronojump_networks/organizations/api/views.py | 4 ++--
.../chronojump_networks/static/images/ClubLogo.png | Bin 0 -> 8366 bytes
.../chronojump_networks/static/images/player.svg | 22 +++++++++++++++++++++
.../players/add_edit_player_form.html | 2 +-
.../organizations/players/players_list.html | 6 +++---
.../chronojump_networks/templates/pages/index.html | 6 +++++-
6 files changed, 33 insertions(+), 7 deletions(-)
---
diff --git a/chronojumpserver-django/chronojump_networks/organizations/api/views.py
b/chronojumpserver-django/chronojump_networks/organizations/api/views.py
index b15afb0..46c09b1 100644
--- a/chronojumpserver-django/chronojump_networks/organizations/api/views.py
+++ b/chronojumpserver-django/chronojump_networks/organizations/api/views.py
@@ -126,7 +126,7 @@ class PlayerListView(ListCreateAPIView):
photo = data['image'][0]
except KeyError:
print("no photo")
- newimage = '../static/images/no_image.png'
+ newimage = '../static/images/player.svg'
else:
print("yes photo")
photo = data['image'][0]
@@ -162,7 +162,7 @@ class PlayerListView(ListCreateAPIView):
photo = data['image'][0]
except KeyError:
print("no photo")
- o.image = '../static/images/no_image.png'
+ o.image = '../static/images/player.svg'
else:
print("yes photo")
photo = data['image'][0]
diff --git a/chronojumpserver-django/chronojump_networks/static/images/ClubLogo.png
b/chronojumpserver-django/chronojump_networks/static/images/ClubLogo.png
new file mode 100644
index 0000000..3058682
Binary files /dev/null and b/chronojumpserver-django/chronojump_networks/static/images/ClubLogo.png differ
diff --git a/chronojumpserver-django/chronojump_networks/static/images/player.svg
b/chronojumpserver-django/chronojump_networks/static/images/player.svg
new file mode 100644
index 0000000..b211c67
--- /dev/null
+++ b/chronojumpserver-django/chronojump_networks/static/images/player.svg
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Written by Treer (gitlab.com/Treer) -->
+<svg
+ version="1.1"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ width="600"
+ height="600"
+ fill="white">
+
+ <title>Abstract user icon</title>
+
+ <defs>
+ <clipPath id="circular-border">
+ <circle cx="300" cy="300" r="250" />
+ </clipPath>
+ </defs>
+
+ <circle cx="300" cy="300" r="280" fill="black" />
+ <circle cx="300" cy="230" r="100" />
+ <circle cx="300" cy="550" r="190" clip-path="url(#circular-border)" />
+</svg>
\ No newline at end of file
diff --git
a/chronojumpserver-django/chronojump_networks/templates/organizations/players/add_edit_player_form.html
b/chronojumpserver-django/chronojump_networks/templates/organizations/players/add_edit_player_form.html
index 8189c80..d30acc8 100644
--- a/chronojumpserver-django/chronojump_networks/templates/organizations/players/add_edit_player_form.html
+++ b/chronojumpserver-django/chronojump_networks/templates/organizations/players/add_edit_player_form.html
@@ -18,7 +18,7 @@
<div class="row">
<div class="col-sm-4">
<div class="form-group">
- <img id="imgView" src="{% static 'images/no_image.png' %}" alt="player_image"
style="width:100%;
+ <img id="imgView" src="{% static 'images/player.svg' %}" alt="player_image"
style="width:100%;
height:100%; object-fit: contain">
</div>
<div class="form-group col-sm-4">
diff --git a/chronojumpserver-django/chronojump_networks/templates/organizations/players/players_list.html
b/chronojumpserver-django/chronojump_networks/templates/organizations/players/players_list.html
index f3b45d0..697028f 100644
--- a/chronojumpserver-django/chronojump_networks/templates/organizations/players/players_list.html
+++ b/chronojumpserver-django/chronojump_networks/templates/organizations/players/players_list.html
@@ -80,8 +80,8 @@
if (value) {
var src = value;
} else {
- // Otherwise show the no_image icon
- var src = 'chronojump_networks/static/images/no_image.png';
+ // Otherwise show the default player icon
+ var src = 'chronojump_networks/static/images/player.svg';
}
var html = '<img src="' + src + '" class="img-fluid rounded" width="32px"
height="32px"/>';
return html;
@@ -222,7 +222,7 @@
$('#number').val('');
$('#input_rfid').val('');
$('#id_image').val(null);
- $("#imgView").attr("src", 'http://localhost:8000/static/images/no_image.png');
+ $("#imgView").attr("src", 'http://localhost:8000/static/images/player.svg');
}
$('#btn_read_rfid').click(function() {
diff --git a/chronojumpserver-django/chronojump_networks/templates/pages/index.html
b/chronojumpserver-django/chronojump_networks/templates/pages/index.html
index 445ac10..0bec00b 100644
--- a/chronojumpserver-django/chronojump_networks/templates/pages/index.html
+++ b/chronojumpserver-django/chronojump_networks/templates/pages/index.html
@@ -46,7 +46,11 @@
{% if user.is_organization_member %}
<div class="row" style="margin-top:20px; border-bottom: 1px solid #000;padding-bottom:10px;">
<div class="col-md-4" >
- <img src="/media/{{ user.organization.image }}" class="img-fluid" height="80px" />
+ {% if user.organization.image %}
+ <img src="../media/{{ user.organization.image }}" class="img-fluid" height="80px" />
+ {% else %}
+ <img src="../static/images/ClubLogo.png" class="img-fluid" height="80px" />
+ {% endif %}
</div>
<div class="col-md-8" >
<h1 class="display-4">{{ user.organization.name }}</h1>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]