Commit 5cc5cc2b authored by Kristijan Čagran's avatar Kristijan Čagran
Browse files

Fix layout

* Some css
* User/me
parent d7364a32
This diff is collapsed.
......@@ -9,6 +9,7 @@
// Licensed under MIT Open Source
// Behold, here are all the Foundation components.
@import "_fonts.scss";
@import 'foundation/components/grid';
@import 'foundation/components/accordion';
@import 'foundation/components/alert-boxes';
......@@ -51,7 +52,7 @@
@import "common.scss";
@import "themes/_theme_variables.scss";
@import "_fonts.scss";
@import "style.scss";
@import "themes/_theme_elements.scss";
@import "themes/_theme_list.scss";
\ No newline at end of file
@import "themes/_theme_list.scss";
......@@ -353,6 +353,11 @@ div.error, .error {
//background-color: $color-bg-warning;
background-repeat: no-repeat;
border-color: $color-border-red;
background-color: $color-border-red;
&.controller-error {
background-color: white;
}
input, textarea, select {
margin-bottom: rem-calc(16px);
......@@ -1768,7 +1773,7 @@ body.front:not(.f-topbar-fixed) header .middle {
top: 0;
margin: 0;
padding: rem-calc(5px);
width: auto;
//width: 100px !important;
line-height: rem-calc(20px);
font-size: rem-calc(16px);
......@@ -4214,6 +4219,10 @@ ul.ui-autocomplete {
display: flex;
flex-wrap: wrap;
justify-content: flex-end;
span {
flex: 1;
-ms-flex: 1;
}
}
.resource-date {
......@@ -4426,6 +4435,7 @@ ul.clearing-thumbs {
.messages {
margin: rem-calc(20px) auto;
overflow: overlay;
padding: 10px;
}
}
......@@ -4773,6 +4783,9 @@ a.button {
}
}
// !! TODO !! Remove this when commenting will be enabled!
#comments-container {
display: none;
......@@ -4791,3 +4804,8 @@ a.button {
}
}
}
.form-required,
.marker{
color: #f00;
}
......@@ -10,7 +10,8 @@
{% if h.is_sysadmin() %}{{ h.build_nav('system_dashboard', 'Nadzorna plošča') }}{% endif %}
{{ h.build_nav('reports', 'Poročila') }}
{{ h.build_nav('harvest', 'Zajem zunanjih virov') }}
<li><a href="/data/report/unpublished">Zbirke v potrjevanju</a></li>{# {{ h.build_nav('unpublished', 'Zbirke v potrjevanju') }}#}
<li><a href="/report/unpublished">Zbirke v potrjevanju</a></li>{# {{ h.build_nav('unpublished', 'Zbirke v potrjevanju') }}#}
<li><a href="/report/draft">Zbirke v osnutku</a></li>
{{ h.build_nav('publisher_index', 'Organizacije') }}
{{ h.build_nav('publisher_apply_empty', 'Prošnja za članstvo') }}
{{ h.build_nav('api_page', 'API') }}
......@@ -24,6 +25,7 @@
{% if h.check_access('package_create') %}{{ h.build_nav('add dataset', 'Nova zbirka') }}{% endif %}
{% if h.check_access('ckanext_showcase_create') %}{{ h.build_nav('ckanext_showcase_new', 'Nova aplikacija') }}{% endif %} {# Vsebinski NE #}
{% if h.check_access('ckanext_pages_update') %}{{ h.build_nav('blog_edit', 'Nova novica', page='') }}{% endif %} {# Vsebinski NE #}
<li><a href="/knjiznica/porocila">Dodaj ali uredi poročilo</a></li>
</ul>
</li>
</ul>
......
{% extends "page.html" %}
{% block title %}Prijava v portal OPSI{% endblock %}
{% block title %}Prijava v portal OPSI{% endblock %}
{% block breadcrumb_content %}
<li><a href="{{request.url}}">Log In</a></li>
<li><a href="{{ request.url }}">Log In</a></li>
{% endblock %}
{% block primary_content_inner %}
{% set err_msg=error_summary.values()[0] if error_summary else None %}
{%- block content %}
{% set err_msg=error_summary.values()[0] if error_summary else None %}
<div class="inner-wrap">
{% if err_msg %}
<div class="panel panel-danger">
<div class="panel-heading"><strong>Login Error</strong></div>
<div class="panel-body">{{err_msg}}</div>
</div>
{% endif %}
<div class="panel panel-default">
<div class="panel-heading"><strong>CKAN login</strong></div>
<div class="panel-body">
<form action="/user/login_generic" method="post" class="form-horizontal ckan-login-form">
<div class="control-group">
<label for="login">Username:</label>
<input type="text" name="login" value="" />
<div class="row">
<div class="small-12 columns messages-wrapper">
<div class="messages error">
{{err_msg }}
</div>
<div class="control-group">
<label for="password">Password:</label>
<input type="password" name="password" value="" />
</div>
</div>
{% endif %}
<form action="/user/login_generic" method="post" class="boxed">
<div class="row">
<div class="small-12 columns container">
<div class="form-item form-type-textfield form-item-name">
<label for="edit-name">Uporabniško ime ali email <span class="form-required"
title="To polje je obvezno.">*</span></label>
<input placeholder="Uporabniško ime" type="text" id="edit-name" name="login" value="" size="60"
maxlength="60"
class="form-text required">
</div>
<!-- optional 2 year cookie expiry -->
<div class="control-group form-inline">
<label for="remember" class="form-inline">Remember me:</label>
<input type="checkbox" name="remember" value="63072000" checked="checked" />
<div class="form-item form-type-password form-item-pass">
<label for="edit-pass">Geslo <span class="form-required" title="To polje je obvezno.">*</span></label>
<input placeholder="Geslo" type="password" id="edit-pass" name="password" size="60" maxlength="128"
class="form-text required">
</div>
<div class="form-actions">
<input name="s" id="s" type="submit" class="btn btn-primary" value="Sign In"/>
{% if app_globals.recaptcha_publickey %}
{% snippet "user/snippets/recaptcha.html", public_key=g.recaptcha_publickey %}
{% endif %}
<div class="form-actions form-wrapper" id="edit-actions"><input id="s" name="s" value="Prijava"
type="submit" class="btn-default form-submit">
</div>
</form>
</div>
</div>
</div>
</form>
</div>
{% endblock %}
......@@ -11,7 +11,7 @@ Variables set in the controller (and has not changed in master as of 16/11/2015)
#}
{% extends "page.html" %}
{% import "_dgu_jinja_util.html" as m with context %}
{% block title %}{{ c.user_dict['display_name'] }} - Uporabniški profil - {{ super() }}{% endblock %}
{% block breadcrumb_content %}
......@@ -31,8 +31,8 @@ Variables set in the controller (and has not changed in master as of 16/11/2015)
{% block secondary %}{% endblock %}
{% block main_content %}
<div class="ckan-container row one_column"
data-equalizer data-equalizer-mq="small-up">
<div class="ckan-container row one_column"
data-equalizer data-equalizer-mq="small-up">
<div class="small-12 columns ckan-main" data-equalizer-watch>
<article class="module">
......@@ -66,7 +66,7 @@ Variables set in the controller (and has not changed in master as of 16/11/2015)
<dt>API ključ</dt>
<dd>
{{ c.user_dict['apikey'] }}
<br />
<br/>
<em>&ndash; Opozorilo: vaš ključ API lahko vidite le vi!</em>
</dd>
{% endif %}
......@@ -79,7 +79,8 @@ Variables set in the controller (and has not changed in master as of 16/11/2015)
<td class="listing boxed whitebox">
<h2>Organizacije</h2>
{% if c.is_myself %}
<a href="{{ h.url_for(controller='ckanext.dgu.controllers.publisher:PublisherController', action='apply') }}">Zaprosi za članstvo v organizaciji</a>
<a href="{{ h.url_for(controller='ckanext.dgu.controllers.publisher:PublisherController', action='apply') }}">Zaprosi
za članstvo v organizaciji</a>
{% endif %}
<ul>
{% for group in h.user_get_groups(c.user_dict['id']) %}
......@@ -93,7 +94,6 @@ Variables set in the controller (and has not changed in master as of 16/11/2015)
</tbody>
</table>
<table class="user-page-table">
<tbody>
<tr>
......@@ -110,23 +110,7 @@ Variables set in the controller (and has not changed in master as of 16/11/2015)
</li>
</ul>
<div class="clearfix"></div>
{% if c.user_dict.datasets %}
{% snippet 'snippets/package_list.html', packages=c.user_dict.datasets %}
{% else %}
{% if c.is_myself %}
<p class="empty">
{{ _('You haven\'t created any datasets.') }}
{% if h.check_access('package_create') %}
{% link_for _('Create one now?'), controller='package', action='new' %}
{% endif %}
</p>
{% else %}
<p class="empty">
{{ _('User hasn\'t created any datasets.') }}
</p>
{% endif %}
{% endif %}
{{ m.package_list_from_dict(c.user_dict['datasets']) }}
</td>
</tr>
</tbody>
......@@ -151,5 +135,5 @@ Variables set in the controller (and has not changed in master as of 16/11/2015)
</div>
</article>
</div>
</div>
</div>
{% endblock main_content %}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment