Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Small UI enhancements #135

Merged
merged 5 commits into from
Jan 12, 2025
Merged

Small UI enhancements #135

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3e7c8a7
Rounded forms
berk76 Jan 10, 2025
fc014e0
Rounded inputs
berk76 Jan 10, 2025
78119b3
Led icons style
berk76 Jan 12, 2025
366ff64
Table with no border
berk76 Jan 12, 2025
3292f49
Survey button
berk76 Jan 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 33 additions & 0 deletions svjis/articles/static/css/styles.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,12 @@ h1.article-title {color:#739D13;}
h2.article-title {color:#739D13;}
h2.comment-title {color:#739D13;}

img.led {
border: 0;
width: 16px;
height: 16px;
}

table.no-border {
border: 0;
line-height: 1.6;
Expand Down Expand Up @@ -69,6 +75,7 @@ table.list td.closed-ticket {
padding: .7em 1.5em; /* odsazení od textu */
outline: none; /* odstraňovat vnější rámeček v Mozilla */
border: none;
border-radius: 5px;
}

textarea.full-width {
Expand All @@ -82,13 +89,15 @@ fieldset {
box-sizing: border-box;
padding: 15px;
line-height: 1.5;
border-radius: 5px;
}

legend {
color: #000000;
background: #d0d0d0;
border: 1px solid #d0d0d0;
padding: 2px 6px;
border-radius: 5px;
}

legend.hidden-legend {display: none;}
Expand All @@ -110,6 +119,7 @@ legend.hidden-legend {display: none;}
margin: 0;
padding: 0px 5px;
box-sizing: border-box;
border-radius: 5px;
}

.common-input-chck {
Expand All @@ -125,6 +135,7 @@ legend.hidden-legend {display: none;}
background: #ffffff;
height:150px;
border: 1px solid #c3c3c3;
border-radius: 5px;
width:100%;
box-sizing: border-box;
}
Expand All @@ -134,6 +145,7 @@ legend.hidden-legend {display: none;}
background: #ffffff;
height:150px;
border: 1px solid #c3c3c3;
border-radius: 5px;
box-sizing: border-box;
}
.common-submit input {
Expand Down Expand Up @@ -507,6 +519,7 @@ p.contact a {
border: 0;
margin: 0;
padding: 0;
border-radius: 5px 0px 0px 5px;
}

#search-submit {
Expand All @@ -517,6 +530,7 @@ p.contact a {
width: 60px;
height: 22px;
border: 0;
border-radius: 0px 5px 5px 0px;

color: #ffffff;
text-decoration: none;
Expand Down Expand Up @@ -565,6 +579,7 @@ p.contact a {
outline: none;
margin: 5px 0px 5px 0px;
text-align: center;
border-radius: 5px;
}

#login-label {
Expand Down Expand Up @@ -595,6 +610,7 @@ p.contact a {
border: 0;
margin: 0;
padding: 0;
border-radius: 5px;
}

#password-input {
Expand All @@ -603,13 +619,15 @@ p.contact a {
border: 0;
margin: 0;
padding: 0;
border-radius: 5px;
}

#login-submit {
padding: .1em .1em;
width: 100px;
height: 22px;
border: 0;
border-radius: 5px;
color: #ffffff;
text-decoration: none;
user-select: none;
Expand Down Expand Up @@ -765,6 +783,21 @@ p.contact a {
line-height: 1.5;
}

#survey-submit {
padding: .1em .1em;
width: 100px;
height: 22px;
border: 0;
color: #ffffff;
text-decoration: none;
user-select: none;
background: #2F2F2F;
outline: none;
margin: 0;
text-align: center;
border-radius: 5px;
}

.usefullinks {
margin: 0;
list-style: none;
Expand Down
4 changes: 2 additions & 2 deletions svjis/articles/templates/admin_board.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ <h1 class="page-title" id="tbl-desc">{% translate 'Board' %}</h1>
{% for obj in object_list %}
<tr>
<td class="list">{{ forloop.counter }}</td>
<td class="list"><a href="{% url 'admin_board_edit' pk=obj.pk %}"><img src="/static/gfx/pencil.png" border="0" title="{% translate 'Edit' %}" alt="{% translate 'Edit' %}"></a></td>
<td class="list"><a onclick="if (!confirm('{% translate 'Do you want to delete' %} {{ obj.member.userprofile.salutation }}&nbsp;{{ obj.member.first_name }}&nbsp;{{ obj.member.last_name }} ?')) return false;" href="{% url 'admin_board_delete' pk=obj.id %}"><img src="/static/gfx/delete.png" border="0" title="{% translate 'Delete' %}" alt="{% translate 'Delete' %}"></a></td>
<td class="list"><a href="{% url 'admin_board_edit' pk=obj.pk %}"><img src="/static/gfx/pencil.png" class="led" title="{% translate 'Edit' %}" alt="{% translate 'Edit' %}"></a></td>
<td class="list"><a onclick="if (!confirm('{% translate 'Do you want to delete' %} {{ obj.member.userprofile.salutation }}&nbsp;{{ obj.member.first_name }}&nbsp;{{ obj.member.last_name }} ?')) return false;" href="{% url 'admin_board_delete' pk=obj.id %}"><img src="/static/gfx/delete.png" class="led" title="{% translate 'Delete' %}" alt="{% translate 'Delete' %}"></a></td>
<td class="list">{{ obj.member.userprofile.salutation }}&nbsp;{{ obj.member.first_name }}&nbsp;{{ obj.member.last_name }}</td>
<td class="list">{{ obj.position }}</td>
</tr>
Expand Down
6 changes: 3 additions & 3 deletions svjis/articles/templates/admin_building_unit.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,9 +68,9 @@ <h1 class="page-title" id="tbl-desc">{% translate 'Building units' %}</h1>
{% for obj in object_list %}
<tr>
<td class="list hide-in-mobile">{{ forloop.counter }}</td>
<td class="list"><a href="{% url 'admin_building_unit_edit' pk=obj.pk %}"><img src="/static/gfx/pencil.png" border="0" title="{% translate 'Edit' %}" alt="{% translate 'Edit' %}"></a></td>
<td class="list"><a href="{% url 'admin_building_unit_owners' pk=obj.pk %}"><img src="/static/gfx/user.png" border="0" title="{% translate 'Owners' %}" alt="{% translate 'Owners' %}"></a></td>
<td class="list"><a onclick="if (!confirm('{% translate 'Do you want to delete' %} {{ obj.type.description }} {{ obj.description }} ?')) return false;" href="{% url 'admin_building_unit_delete' pk=obj.id %}"><img src="/static/gfx/delete.png" border="0" title="{% translate 'Delete' %}" alt="{% translate 'Delete' %}"></a></td>
<td class="list"><a href="{% url 'admin_building_unit_edit' pk=obj.pk %}"><img src="/static/gfx/pencil.png" class="led" title="{% translate 'Edit' %}" alt="{% translate 'Edit' %}"></a></td>
<td class="list"><a href="{% url 'admin_building_unit_owners' pk=obj.pk %}"><img src="/static/gfx/user.png" class="led" title="{% translate 'Owners' %}" alt="{% translate 'Owners' %}"></a></td>
<td class="list"><a onclick="if (!confirm('{% translate 'Do you want to delete' %} {{ obj.type.description }} {{ obj.description }} ?')) return false;" href="{% url 'admin_building_unit_delete' pk=obj.id %}"><img src="/static/gfx/delete.png" class="led" title="{% translate 'Delete' %}" alt="{% translate 'Delete' %}"></a></td>
<td class="list">{{ obj.type.description }}</td>
<td class="list">{{ obj.entrance.description }}</td>
<td class="list">{{ obj.registration_id }}</td>
Expand Down
2 changes: 1 addition & 1 deletion svjis/articles/templates/admin_building_unit_owners_edit.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ <h1 class="page-title" id="tbl-desc">{{ bu.type.description }} - {{ bu.registrat
<td class="list">{{ forloop.counter }}</td>
<td class="list">{{ obj.first_name }}</td>
<td class="list">{{ obj.last_name }}</td>
<td class="list"><a href="{% url 'admin_building_unit_owners_delete' pk=pk owner=obj.pk %}"><img src="/static/gfx/delete.png" border="0" title="{% translate 'Delete' %}" alt="{% translate 'Delete' %}"></a></td>
<td class="list"><a href="{% url 'admin_building_unit_owners_delete' pk=pk owner=obj.pk %}"><img src="/static/gfx/delete.png" class="led" title="{% translate 'Delete' %}" alt="{% translate 'Delete' %}"></a></td>
</tr>
{% endfor %}
{% endif %}
Expand Down
4 changes: 2 additions & 2 deletions svjis/articles/templates/admin_entrance.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ <h1 class="page-title" id="tbl-desc">{% translate 'Entrances' %}</h1>
{% for obj in object_list %}
<tr>
<td class="list">{{ forloop.counter }}</td>
<td class="list"><a href="{% url 'admin_entrance_edit' pk=obj.pk %}"><img src="/static/gfx/pencil.png" border="0" title="{% translate 'Edit' %}" alt="{% translate 'Edit' %}"></a></td>
<td class="list"><a onclick="if (!confirm('{% translate 'Do you want to delete' %} {{ obj.description }} ?')) return false;" href="{% url 'admin_entrance_delete' pk=obj.id %}"><img src="/static/gfx/delete.png" border="0" title="{% translate 'Delete' %}" alt="{% translate 'Delete' %}"></a></td>
<td class="list"><a href="{% url 'admin_entrance_edit' pk=obj.pk %}"><img src="/static/gfx/pencil.png" class="led" title="{% translate 'Edit' %}" alt="{% translate 'Edit' %}"></a></td>
<td class="list"><a onclick="if (!confirm('{% translate 'Do you want to delete' %} {{ obj.description }} ?')) return false;" href="{% url 'admin_entrance_delete' pk=obj.id %}"><img src="/static/gfx/delete.png" class="led" title="{% translate 'Delete' %}" alt="{% translate 'Delete' %}"></a></td>
<td class="list">{{ obj.description }}</td>
<td class="list">{{ obj.address }}</td>
</tr>
Expand Down
6 changes: 3 additions & 3 deletions svjis/articles/templates/admin_group.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ <h1 class="page-title" id="tbl-desc">{% translate 'Group' %}</h1>
{% for obj in object_list %}
<tr>
<td class="list">{{ forloop.counter }}</td>
<td class="list"><a href="{% url 'admin_group_edit' pk=obj.pk %}"><img src="/static/gfx/pencil.png" border="0" title="{% translate 'Edit' %}" alt="{% translate 'Edit' %}"></a></td>
<td class="list"><a href="{% url 'admin_user' %}?group_filter={{ obj.pk }}"><img src="/static/gfx/user.png" border="0" title="{% translate 'List of users' %}" alt="{% translate 'List of users' %}"></a></td>
<td class="list"><a onclick="if (!confirm('{% translate 'Do you want to delete' %} {{ obj.name }} ?')) return false;" href="{% url 'admin_group_delete' pk=obj.id %}"><img src="/static/gfx/delete.png" border="0" title="{% translate 'Delete' %}" alt="{% translate 'Delete' %}"></a></td>
<td class="list"><a href="{% url 'admin_group_edit' pk=obj.pk %}"><img src="/static/gfx/pencil.png" class="led" title="{% translate 'Edit' %}" alt="{% translate 'Edit' %}"></a></td>
<td class="list"><a href="{% url 'admin_user' %}?group_filter={{ obj.pk }}"><img src="/static/gfx/user.png" class="led" title="{% translate 'List of users' %}" alt="{% translate 'List of users' %}"></a></td>
<td class="list"><a onclick="if (!confirm('{% translate 'Do you want to delete' %} {{ obj.name }} ?')) return false;" href="{% url 'admin_group_delete' pk=obj.id %}"><img src="/static/gfx/delete.png" class="led" title="{% translate 'Delete' %}" alt="{% translate 'Delete' %}"></a></td>
<td class="list">{{ obj.name }}</td>
</tr>
{% endfor %}
Expand Down
4 changes: 2 additions & 2 deletions svjis/articles/templates/admin_preferences.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ <h1 class="page-title" id="tbl-desc">{% translate 'Preferences' %}</h1>
{% for obj in object_list %}
<tr>
<td class="list hide-in-mobile">{{ forloop.counter }}</td>
<td class="list"><a href="{% url 'admin_preferences_edit' pk=obj.pk %}"><img src="/static/gfx/pencil.png" border="0" title="{% translate 'Edit' %}" alt="{% translate 'Edit' %}"></a></td>
<td class="list"><a onclick="if (!confirm('{% translate 'Do you want to delete' %} {{ obj.key }} ?')) return false;" href="{% url 'admin_preferences_delete' pk=obj.id %}"><img src="/static/gfx/delete.png" border="0" title="{% translate 'Delete' %}" alt="{% translate 'Delete' %}"></a></td>
<td class="list"><a href="{% url 'admin_preferences_edit' pk=obj.pk %}"><img src="/static/gfx/pencil.png" class="led" title="{% translate 'Edit' %}" alt="{% translate 'Edit' %}"></a></td>
<td class="list"><a onclick="if (!confirm('{% translate 'Do you want to delete' %} {{ obj.key }} ?')) return false;" href="{% url 'admin_preferences_delete' pk=obj.id %}"><img src="/static/gfx/delete.png" class="led" title="{% translate 'Delete' %}" alt="{% translate 'Delete' %}"></a></td>
<td class="list">{{ obj.key }}</td>
<td class="list hide-in-mobile">{{ obj.value }}</td>
</tr>
Expand Down
4 changes: 2 additions & 2 deletions svjis/articles/templates/admin_user.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,8 @@ <h1 class="page-title" id="tbl-desc">{% translate 'User' %}</h1>
{% for obj in object_list %}
<tr>
<td class="list hide-in-mobile">{{ forloop.counter }}</td>
<td class="list"><a href="{% url 'admin_user_edit' pk=obj.pk %}"><img src="/static/gfx/pencil.png" border="0" title="{% translate 'Edit' %}" alt="{% translate 'Edit' %}"></a></td>
<td class="list"><a href="{% url 'admin_user_owns' pk=obj.pk %}"><img src="/static/gfx/house.png" border="0" title="{% translate 'Units' %}" alt="{% translate 'Units' %}"></a></td>
<td class="list"><a href="{% url 'admin_user_edit' pk=obj.pk %}"><img src="/static/gfx/pencil.png" class="led" title="{% translate 'Edit' %}" alt="{% translate 'Edit' %}"></a></td>
<td class="list"><a href="{% url 'admin_user_owns' pk=obj.pk %}"><img src="/static/gfx/house.png" class="led" title="{% translate 'Units' %}" alt="{% translate 'Units' %}"></a></td>
<td class="list">{{ obj.last_name }}</td>
<td class="list">{{ obj.first_name }}</td>
<td class="list hide-in-mobile">{{ obj.is_active|yes_no }}</td>
Expand Down
2 changes: 1 addition & 1 deletion svjis/articles/templates/admin_user_ownes_edit.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ <h1 class="page-title" id="tbl-desc">{{ u.first_name }} {{ u.last_name }}</h1>
<td class="list">{{ obj.type.description }}</td>
<td class="list">{{ obj.registration_id }}</td>
<td class="list">{{ obj.description }}</td>
<td class="list"><a href="{% url 'admin_user_owns_delete' pk=pk owner=obj.pk %}"><img src="/static/gfx/delete.png" border="0" title="{% translate 'Delete' %}" alt="{% translate 'Delete' %}"></a></td>
<td class="list"><a href="{% url 'admin_user_owns_delete' pk=pk owner=obj.pk %}"><img src="/static/gfx/delete.png" class="led" title="{% translate 'Delete' %}" alt="{% translate 'Delete' %}"></a></td>
</tr>
{% endfor %}
{% endif %}
Expand Down
4 changes: 2 additions & 2 deletions svjis/articles/templates/advert_edit.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,10 +60,10 @@ <h2>{% translate 'Assets' %}</h2>
</tr>
{% for a in assets %}
<tr>
<td class="list"><img src="/static/gfx/{{ a.icon }}" border="0" alt="{{ a.basename }}"></td>
<td class="list"><img src="/static/gfx/{{ a.icon }}" class="led" alt="{{ a.basename }}"></td>
<td class="list" id="asset_name_{{ a.asset.pk }}">{{ a.asset.description }}</td>
<td class="list" id="asset_file_{{ a.asset.pk }}"><a href="/media/{{ a.asset.file }}">{{ a.basename }}</a></td>
<td class="list"><a onclick="if (!confirm('{% translate 'Do you want to delete' %} {{ a.asset.description }} ?')) return false;" href="{% url 'adverts_asset_delete' pk=a.asset.id %}"><img src="/static/gfx/delete.png" border="0" title="{% translate 'Delete' %}" alt="{% translate 'Delete' %}"></a></td>
<td class="list"><a onclick="if (!confirm('{% translate 'Do you want to delete' %} {{ a.asset.description }} ?')) return false;" href="{% url 'adverts_asset_delete' pk=a.asset.id %}"><img src="/static/gfx/delete.png" class="led" title="{% translate 'Delete' %}" alt="{% translate 'Delete' %}"></a></td>
</tr>
{% endfor %}
</table>
Expand Down
2 changes: 1 addition & 1 deletion svjis/articles/templates/adverts_list.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ <h2 {% if not obj.advert.published %}style="text-decoration: line-through;"{% en
{% if obj.assets %}
<p>
{% for a in obj.assets %}
<img src="/static/gfx/{{ a.icon }}" border="0" alt="{{ a.basename }}">&nbsp;<a href="/media/{{ a.asset.file }}">{{ a.basename }}</a>&nbsp;
<img src="/static/gfx/{{ a.icon }}" class="led" alt="{{ a.basename }}">&nbsp;<a href="/media/{{ a.asset.file }}">{{ a.basename }}</a>&nbsp;
{% endfor %}
</p>
{% endif %}
Expand Down
2 changes: 1 addition & 1 deletion svjis/articles/templates/article.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ <h2 class="comment-title">{% translate 'Assets' %}:</h2>
</tr>
{% for a in assets %}
<tr>
<td class="list"><img src="/static/gfx/{{ a.icon }}" border="0" alt="{{ a.basename }}"></td>
<td class="list"><img src="/static/gfx/{{ a.icon }}" class="led" alt="{{ a.basename }}"></td>
<td class="list"><a href="/media/{{ a.asset.file }}">{{ a.basename }}</a></td>
</tr>
{% endfor %}
Expand Down
2 changes: 1 addition & 1 deletion svjis/articles/templates/box-survey.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
{% endfor %}

<p>
<input type="submit" id="vote-submit" value="{% translate 'Vote' %}" />
<input type="submit" id="survey-submit" value="{% translate 'Vote' %}" />
</p>
</form>
{% else %}
Expand Down
2 changes: 1 addition & 1 deletion svjis/articles/templates/box-useful-links.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
{% for link in useful_links_list %}
<li>
<span>
<img style="float: left;" src="/static/gfx/attach_2.png" border="0" title="{{ link.header }}" alt="{{ link.header }}">
<img style="float: left;" src="/static/gfx/attach_2.png" class="led" title="{{ link.header }}" alt="{{ link.header }}">
</span>
<a href="{{ link.link }}">{{ link.header }}</a>
</li>
Expand Down
4 changes: 2 additions & 2 deletions svjis/articles/templates/fault.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,13 +66,13 @@ <h2 class="comment-title">{% translate 'Assets' %}:</h2>
</tr>
{% for a in assets %}
<tr>
<td class="list"><img src="/static/gfx/{{ a.icon }}" border="0" alt="{{ a.basename }}"></td>
<td class="list"><img src="/static/gfx/{{ a.icon }}" class="led" alt="{{ a.basename }}"></td>
<td class="list" id="asset_file_{{ a.asset.pk }}"><a href="/media/{{ a.asset.file }}">{{ a.basename }}</a></td>
<td class="list" id="asset_name_{{ a.asset.pk }}">{{ a.asset.description }}</td>
<td class="list" id="asset_user_{{ a.asset.pk }}">{{ a.asset.created_by_user.first_name }}&nbsp;{{ a.asset.created_by_user.last_name }}</td>
<td class="list hide-in-mobile" id="asset_time_{{ a.asset.pk }}">{{ a.asset.created_date|date:"d.m.Y H:i" }}</td>
{% if a.asset.created_by_user == user %}
<td class="list"><a onclick="if (!confirm('{% translate 'Do you want to delete' %} {{ a.asset.description }} ?')) return false;" href="{% url 'faults_fault_asset_delete' pk=a.asset.id %}"><img src="/static/gfx/delete.png" border="0" title="{% translate 'Delete' %}" alt="{% translate 'Delete' %}"></a></td>
<td class="list"><a onclick="if (!confirm('{% translate 'Do you want to delete' %} {{ a.asset.description }} ?')) return false;" href="{% url 'faults_fault_asset_delete' pk=a.asset.id %}"><img src="/static/gfx/delete.png" class="led" title="{% translate 'Delete' %}" alt="{% translate 'Delete' %}"></a></td>
{% else %}
<td class="list">&nbsp;</td>
{% endif %}
Expand Down
2 changes: 1 addition & 1 deletion svjis/articles/templates/faults_list.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ <h1 class="page-title" id="tbl-desc">{{ header }}</h1>
{% if object_list %}
{% for obj in object_list %}
<tr>
<td class="list {% if obj.closed %}closed-ticket{% endif %}"><a {% if search != '' %} href="{% url 'fault' slug=obj.slug %}?search={{ search }}" {% else %} href="{% url 'fault' slug=obj.slug %}" {% endif %}><img src="/static/gfx/find.png" border="0" title="{% translate 'View' %}" alt="{% translate 'View' %}"></a></td>
<td class="list {% if obj.closed %}closed-ticket{% endif %}"><a {% if search != '' %} href="{% url 'fault' slug=obj.slug %}?search={{ search }}" {% else %} href="{% url 'fault' slug=obj.slug %}" {% endif %}><img src="/static/gfx/find.png" class="led" title="{% translate 'View' %}" alt="{% translate 'View' %}"></a></td>
<td class="list {% if obj.closed %}closed-ticket{% endif %}">{{ obj.pk }}</td>
<td class="list hide-in-mobile {% if obj.closed %}closed-ticket{% endif %}">{{ obj.created_date|date:"d.m.Y" }}</td>
<td class="list {% if obj.closed %}closed-ticket{% endif %}">{{ obj.subject|highlight:search|safe }}</td>
Expand Down
Loading
Loading