mirror of
https://github.com/OpenBankProject/API-Manager.git
synced 2026-02-06 17:46:53 +00:00
Merge pull request #228 from Reena-cell/develop
changes into webui props and navbar
This commit is contained in:
Simon Redfern
GitHub
commit
6e43ad9c5e
@ -38,9 +38,10 @@ footer a:hover, .footer a:focus {
|
||||
|
||||
|
||||
.navbar-default {
|
||||
top: 89px;
|
||||
top: 0px;
|
||||
background-color: #53c4ef;
|
||||
border: none;
|
||||
|
||||
}
|
||||
|
||||
|
||||
@ -208,4 +209,5 @@ table.tablesorter thead tr .headerSortDown, table.tablesorter thead tr .headerSo
|
||||
border-radius: 0;
|
||||
padding: 9px 20px 11px;
|
||||
border: 1px solid #333333;
|
||||
display:inline-block;
|
||||
}
|
||||
@ -19,20 +19,6 @@
|
||||
</head>
|
||||
|
||||
<body>
|
||||
<div class="container">
|
||||
<div id="header">
|
||||
<div id="logo-left" class="logo-box">
|
||||
<a href="{% url 'home' %}" aria-label="Home Page" id="left-logo"><img src="{{ logo_url }}" alt="brand"></a>
|
||||
<ul class="nav navbar-nav navbar-right">
|
||||
<li>
|
||||
{% if user.is_authenticated %}
|
||||
<p class="navbar-btn"><span id="navbar-login-username">{{API_USERNAME}}</span> <a href="/logout" class="btn btn-default">{% trans "Logout" %} </a></p>
|
||||
{% endif %}
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<nav class="navbar navbar-default navbar-fixed-top" role="navigation">
|
||||
<div class="container">
|
||||
<div class="navbar-header">
|
||||
@ -45,6 +31,7 @@
|
||||
</div>
|
||||
<div id="navbar" class="collapse navbar-collapse">
|
||||
<ul class="nav navbar-nav">
|
||||
<li> <a href="{% url 'home' %}"><img src="{{ logo_url }}" alt="brand"></a></li>
|
||||
<li><a href="{{ API_PORTAL }}">{% trans "Home" %}</a></li>
|
||||
{% url "consumers-index" as consumers_index_url %}
|
||||
<li {% if consumers_index_url in request.path %} class="active" {% endif %}><a href="{{ consumers_index_url }}">{% trans "Consumers" %}</a></li>
|
||||
@ -106,18 +93,26 @@
|
||||
<a href="{{ API_TESTER_URL }}">{% trans "API Tester" %}</a>
|
||||
</li>
|
||||
{% endif %}
|
||||
<!--<ul class="nav navbar-nav navbar-right" style="padding-top:13px; margin-left:12rem">-->
|
||||
<li>
|
||||
{% if user.is_authenticated %}
|
||||
<p class="navbar-btn nav navbar-nav navbar-right" style="padding-top:13px"><span id="navbar-login-username">{{API_USERNAME}}</span> <a href="/logout" class="btn btn-default">{% trans "Logout" %} </a></p>
|
||||
{% endif %}
|
||||
</li>
|
||||
<!--</ul>-->
|
||||
</ul>
|
||||
</div>
|
||||
<!--/.nav-collapse -->
|
||||
</div>
|
||||
</nav>
|
||||
</div>
|
||||
|
||||
{% if messages %}
|
||||
<div class="container messages">
|
||||
{% for message in messages %}
|
||||
<div class="alert alert-dismissible{% ifequal message.tags " error " %} alert-danger{% else %}{% ifequal message.tags "debug " %} alert-info{% else %} alert-{{ message.tags }}{% endifequal %}{% endifequal %}" role="alert">
|
||||
<div class="alert alert-dismissible{% ifequal message.tags "error" %} alert-danger{% else %}{% ifequal message.tags "debug" %} alert-info{% else %} alert-{{ message.tags }}{% endifequal %}{% endifequal %}" role="alert">
|
||||
<button type="button" class="close" data-dismiss="alert" aria-label="Close"><span
|
||||
aria-hidden="true">×</span></button> {{ message }}
|
||||
aria-hidden="true">×</span></button>
|
||||
{{ message }}
|
||||
</div>
|
||||
{% endfor %}
|
||||
</div>
|
||||
@ -127,7 +122,6 @@
|
||||
{% block content %}{% endblock content %}
|
||||
<div class="footer-content-wrapper" data-lift="WebUI.homePage" style="cursor:pointer">
|
||||
<span>Language </span>
|
||||
<span> | </span>
|
||||
<a id="uk">EN</a>
|
||||
<span> | </span>
|
||||
<a id="es">ES</a>
|
||||
|
||||
@ -3,27 +3,28 @@
|
||||
<div id="webui_list">
|
||||
<h1>{% trans "WEBUI" %}</h1>
|
||||
<div class="row">
|
||||
<div class="col-xs-12 col-sm-3">
|
||||
<label class="form-group">{% trans "Web UI Props Name" %}:</label>
|
||||
<div class="col-xs-12 col-sm-4">
|
||||
<label class="form-group">{% trans "Web UI Props Name" %}</label>
|
||||
<br />
|
||||
</div>
|
||||
<div class="col-xs-12 col-sm-3">
|
||||
<label class="form-group">{% trans "Web UI Props Value" %}:</label>
|
||||
<label class="form-group">{% trans "Web UI Props Value" %}</label>
|
||||
<br />
|
||||
</div>
|
||||
<div class="col-xs-12 col-sm-3">
|
||||
<label class="form-group">{% trans "Web UI Props Id" %}:</label> <br />
|
||||
<div class="col-sm-12 col-sm-4">
|
||||
<label class="form-group">{% trans "Action" %}</label> <br />
|
||||
</div>
|
||||
<div class="col-sm-12 col-sm-3">
|
||||
<label class="form-group">{% trans "Save Value" %}:</label> <br />
|
||||
<div class="col-xs-12 col-sm-1">
|
||||
<label class="form-group">{% trans "Props Id" %}</label> <br />
|
||||
</div>
|
||||
|
||||
</div>
|
||||
<form method="post">
|
||||
{% csrf_token %} {% for webui_prop in webui_props %}
|
||||
<div class="runner">
|
||||
<div class="row">
|
||||
<input type="hidden" class="web_ui_props_id" value="{{ webui_prop.web_ui_props_id }}" />
|
||||
<div class="col-xs-12 col-sm-3">
|
||||
<div class="col-xs-12 col-sm-4">
|
||||
<div class="form-group" cols="20" rows="1">
|
||||
<div class="web_ui_props_name" style="float: left">
|
||||
{{ webui_prop.name }}
|
||||
@ -37,12 +38,7 @@
|
||||
{{ webui_prop.value }}</textarea>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-xs-12 col-sm-3">
|
||||
<div class="form-group" cols="1" rows="1">
|
||||
<div class="">{{ webui_prop.web_ui_props_id }}</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-sm-12 col-sm-3">
|
||||
<div class="col-sm-12 col-sm-4">
|
||||
<div class="form-group">
|
||||
<button class="btn btn-primary btn-green forSave">
|
||||
{% trans "Save" %}
|
||||
@ -50,15 +46,22 @@
|
||||
<button class="btn btn-primary btn-red forDelete">
|
||||
{% trans "Delete" %}
|
||||
</button>
|
||||
<button class="btn btn-primary btn-create forCreate">
|
||||
{% trans "Create Locale" %}
|
||||
</button>
|
||||
<select class="language">
|
||||
<option value="en">En</option>
|
||||
<option value="es">Es</option>
|
||||
<select class="language" style="width:6rem; height:3.5rem">
|
||||
<option value="en_GB">en_GB</option>
|
||||
<option value="es_ES">es_ES</option>
|
||||
</select>
|
||||
<button class="btn btn-primary btn-create forCreate">
|
||||
{% trans "Create" %}
|
||||
</button>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-xs-12 col-sm-1">
|
||||
<div class="form-group" cols="1" rows="1">
|
||||
<div class="" >{{ webui_prop.web_ui_props_id }}</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
{% endfor %}
|
||||
@ -114,7 +117,7 @@
|
||||
var web_ui_props_name = $(runner).find(".web_ui_props_name").text();
|
||||
var languages = $(runner).find(".language").val();
|
||||
|
||||
if (languages == "es") {
|
||||
if (languages == "es_ES") {
|
||||
$(runner)
|
||||
.find(".language_list")
|
||||
.text("_" + languages);
|
||||
|
||||
@ -35,16 +35,6 @@ class IndexView(LoginRequiredMixin, FormView):
|
||||
messages.error(self.request, response['message'])
|
||||
context.update({'webui_props': []})
|
||||
else:
|
||||
# Here is response of getWebuiProps.
|
||||
# {
|
||||
# "webui_props": [
|
||||
# {
|
||||
# "name": "webui_header_logo_left_url ",
|
||||
# "value": " /media/images/logo.png",
|
||||
# "web_ui_props_id": "default"
|
||||
# }
|
||||
# ]
|
||||
# }
|
||||
context.update(response)
|
||||
except APIError as err:
|
||||
messages.error(self.request, err)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user