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

1069 change wordings details page #1109

Merged
merged 10 commits into from
Mar 29, 2023
Merged

1069 change wordings details page #1109

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
a80ba7f
updated wordings for contribution view page
minump Mar 28, 2023
a988c27
updated wordings for capability view page
minump Mar 28, 2023
63c8001
updated wording for talent view page
minump Mar 28, 2023
425859b
capability details small case
minump Mar 28, 2023
aa8adef
updated changelog
minump Mar 28, 2023
0fb99ce
Merge branch 'develop' into 1069-change-wordings-details-page
minump Mar 29, 2023
17060e0
siwtched to capitalize
minump Mar 29, 2023
4a13e54
capitalize in capability details
minump Mar 29, 2023
88c3d8c
updated text in contribution details
minump Mar 29, 2023
07e9108
Update text fields on talent_details.html
minump Mar 29, 2023
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Update werkzeug version in catalog. [#1099](https://github.com/rokwire/rokwire-building-blocks-api/issues/1099)
- Custom dropdown menu style. [#1090](https://github.com/rokwire/rokwire-building-blocks-api/issues/1090)
- Fill footer at the bottom of pages. [#1092](https://github.com/rokwire/rokwire-building-blocks-api/issues/1092)
- Wordings of view pages. [#1069](https://github.com/rokwire/rokwire-building-blocks-api/issues/1069)

### Fixed
- Detect secrets GitHub action build error and updated baseline. [#1077](https://github.com/rokwire/rokwire-building-blocks-api/issues/1077)
Expand Down
20 changes: 10 additions & 10 deletions contributions/catalog/webapps/templates/contribute/capability_details.html
View file
Open in desktop
sandeep-ps marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ <h1>Capability Details</h1>
<!-- capability details container -->
<div class="row">
<div class="col-12 col-md-3">
<h4>Capability Name </h4>
<h4>Capability name </h4>
</div>
<div class="col-12 col-md-9">
<div class="small-body-text">{{post.name}}</div>
Expand Down Expand Up @@ -67,7 +67,7 @@ <h4>Source code repository URL </h4>

<div class="row">
<div class="col-12 col-md-3">
<h4>API Documentation URL </h4>
<h4>API documentation URL </h4>
</div>
<div class="col-12 col-md-9">
<div class="small-body-text">{{post.apiDocUrl}}</div>
Expand Down Expand Up @@ -99,7 +99,7 @@ <h4>Version </h4>
{% if post.healthCheckUrl %}
<div class="row">
<div class="col-12 col-md-3">
<h4>Health Check URL </h4>
<h4>Health check URL </h4>
</div>
<div class="col-12 col-md-9">
<div class="small-body-text">{{post.healthCheckUrl}}</div>
Expand All @@ -109,20 +109,20 @@ <h4>Health Check URL </h4>
{% if post.dataDeletionEndpointDetails %}
<div class="row">
<div class="col-12 col-md-3">
<h4>Data Deletion Endpoint Details </h4>
<h4>Data deletion endpoint details </h4>
</div>
<div class="col-12 col-md-9">
<table>
{% if post.dataDeletionEndpointDetails.apiKey %}
<tr id="datadeletion_row">
<td><b>API Key&nbsp;&nbsp;</b></td>
<td><b>API key&nbsp;&nbsp;</b></td>
<td class="hidetext">{{post.dataDeletionEndpointDetails.apiKey}}</td>
<td> &#160 &#160 <i class="bi bi-eye-slash field_icon" id="toggleText" style="cursor: pointer;"></i></td>
</tr>
{% endif %}
{% if post.dataDeletionEndpointDetails.deletionEndpoint %}
<tr>
<td><b>Deletion Endpoint&nbsp;&nbsp;</b></td>
<td><b>Deletion endpoint&nbsp;&nbsp;</b></td>
<td>{{post.dataDeletionEndpointDetails.deletionEndpoint}}</td>
</tr>
{% endif %}
Expand All @@ -139,25 +139,25 @@ <h4>Data Deletion Endpoint Details </h4>
{% if post.deploymentDetails %}
<div class="row">
<div class="col-12 col-md-3">
<h4>Deployment Details </h4>
<h4>Deployment details </h4>
</div>
<div class="col-12 col-md-9">
<table>
{% if post.deploymentDetails.authMethod %}
<tr>
<td><b>Auth Method&nbsp;&nbsp;</b></td>
<td><b>Auth method&nbsp;&nbsp;</b></td>
<td>{{post.deploymentDetails.authMethod}}</td>
</tr>
{% endif %}
{% if post.deploymentDetails.databaseDetails %}
<tr>
<td><b>Database Details&nbsp;&nbsp;</b></td>
<td><b>Database details&nbsp;&nbsp;</b></td>
<td>{{post.deploymentDetails.databaseDetails}}</td>
</tr>
{% endif %}
{% if post.deploymentDetails.environmentVariables %}
<tr>
<td valign="top"><b>Environment Variables&nbsp;&nbsp;</b></td>
<td valign="top"><b>Environment variables&nbsp;&nbsp;</b></td>
<td>
{% for envvar in post.deploymentDetails.environmentVariables %}
<table>
Expand Down
12 changes: 6 additions & 6 deletions contributions/catalog/webapps/templates/contribute/contribution_details.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ <h1 id="contribute">Contribution Details</h1>
<!-- contribution details container -->
<div class="row">
<div class="col-12 col-md-3">
<h4>Contribution Name</h4>
<h4>Contribution name</h4>
</div>
<div class="col-12 col-md-9">
<div class="small-body-text">{{post.name}}</div>
Expand All @@ -39,7 +39,7 @@ <h4>Contribution Name</h4>

<div class="row">
<div class="col-12 col-md-3">
<h4>Contribution short description</h4>
<h4>Short description</h4>
</div>
<div class="col-12 col-md-9">
<div class="small-body-text">{{post.shortDescription}}</div>
Expand All @@ -49,7 +49,7 @@ <h4>Contribution short description</h4>
{% if post.longDescription %}
<div class="row">
<div class="col-12 col-md-3">
<h4>Contribution long description</h4>
<h4>Long description</h4>
</div>
<div class="col-12 col-md-9">
<div class="small-body-text">{{post.longDescription}}</div>
Expand Down Expand Up @@ -339,13 +339,13 @@ <h4>Date modified</h4>
<div class="container">
<!-- buttons container -->
{% if is_editable %}
<button class="button button2" onclick="location.href = '{{ url_for('contribute.contribution_edit', contribution_id=post.id) }}';" >Edit Contribution</button>
<button class="button button2" onclick="location.href = '{{ url_for('contribute.contribution_edit', contribution_id=post.id) }}';" >Edit</button>
<!-- Button trigger modal -->
<button type="button" class="button button3" data-toggle="modal" data-target="#confirmDelete">Delete Contribution</button>
<button type="button" class="button button3" data-toggle="modal" data-target="#confirmDelete">Delete</button>
{% endif %}

{% if is_reviewer %}
<button class="button button4" onclick="location.href = '{{ url_for('contribute.contribution_review', contribution_id=post.id) }}';">Review Contribution</button>
<button class="button button4" onclick="location.href = '{{ url_for('contribute.contribution_review', contribution_id=post.id) }}';">Review</button>
{% endif %}
</div> <!-- end of buttons container -->

Expand Down
16 changes: 8 additions & 8 deletions contributions/catalog/webapps/templates/contribute/talent_details.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ <h1>Talent Details</h1>
<div class="container details-container">
<div class="row">
<div class="col-12 col-md-3">
<h4>Talent Name </h4>
<h4>Talent name </h4>
</div>
<div class="col-12 col-md-9">
<div class="small-body-text">{{post.name}}</div>
Expand All @@ -50,7 +50,7 @@ <h4>Talent description </h4>
{% if post.dataDescription %}
<div class="row">
<div class="col-12 col-md-3">
<h4>Data Description</h4>
<h4>Data description</h4>
</div>
<div class="col-12 col-md-9">
<div class="small-body-text">{{post.dataDescription}}</div>
Expand All @@ -72,7 +72,7 @@ <h4>Icon</h4>
{% if post.requiredCapabilities %}
<div class="row">
<div class="col-12 col-md-3">
<h4>Required Capabilities</h4>
<h4>Required capabilities</h4>
</div>
<div class="col-12 col-md-9">
<table>
Expand All @@ -93,7 +93,7 @@ <h4>Required Capabilities</h4>
{% if post.requiredBuildingBlocks %}
<div class="row">
<div class="col-12 col-md-3">
<h4>Required Building Blocks</h4>
<h4>Required building blocks</h4>
</div>
<div class="col-12 col-md-9">
<table>
Expand Down Expand Up @@ -139,7 +139,7 @@ <h4>Minimum set of end-user roles</h4>
{% if post.startDate %}
<div class="row">
<div class="col-12 col-md-3">
<h4>Start Date</h4>
<h4>Start date</h4>
</div>
<div class="col-12 col-md-9">
<div class="small-body-text">{{post.startDate}}</div>
Expand All @@ -150,7 +150,7 @@ <h4>Start Date</h4>
{% if post.endDate %}
<div class="row">
<div class="col-12 col-md-3">
<h4>End Date</h4>
<h4>End date</h4>
</div>
<div class="col-12 col-md-9">
<div class="small-body-text">{{post.endDate}}</div>
Expand All @@ -161,7 +161,7 @@ <h4>End Date</h4>
{% if post.longDescription %}
<div class="row">
<div class="col-12 col-md-3">
<h4>Long Description</h4>
<h4>Long description</h4>
</div>
<div class="col-12 col-md-9">
<div class="small-body-text">{{post.longDescription}}</div>
Expand All @@ -172,7 +172,7 @@ <h4>Long Description</h4>
{% if post.selfCertification %}
<div class="row">
<div class="col-12 col-md-3">
<h4>Self Certification</h4>
<h4>Self certification</h4>
</div>
<div class="col-12 col-md-9">
<table>
Expand Down