Skip to content

Add shared status to models on Models list #529

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

Merged
idmarjr merged 5 commits into from
Apr 30, 2024
Merged

Add shared status to models on Models list #529

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
194aa86
Add shared status to models on Models list
idmarjr Apr 26, 2024
1a67aa6
Control display icon share
miltonbsn Apr 30, 2024
7ad255f
Fix conflict
miltonbsn Apr 30, 2024
9bc407f
Fix conflict
miltonbsn Apr 30, 2024
a6d10ab
Remove conflict markers commited by mistake
idmarjr Apr 30, 2024
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
5 changes: 4 additions & 1 deletion app/angular/workspace/workspace.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,10 @@ <h2 class="h2 pull-left">{{ 'Models' | translate }}</h2>
<icon-logic ng-if="model.type === 'logic'" aria-hidden="true"></icon-logic>
<span>{{model.typeName}}</span>
</td>
<td ng-click="$ctrl.openModel(model)">{{model.name}}</td>
<td ng-click="$ctrl.openModel(model)">
<i ng-if="model.shareOptions.active" title="{{ 'Public link available' | translate }}" class="fa fa-share-alt share-status"></i>
<span>{{model.name}}</span>
</td>
<td ng-click="$ctrl.openModel(model)">{{model.authorName}}</td>
<td ng-click="$ctrl.openModel(model)">{{model.created | date:'dd/MM/yyyy'}}</td>
<td class="actions-cell">
Expand Down
1 change: 1 addition & 0 deletions app/i18n/languages/en.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,7 @@ export default {
'Still, the server and database to keep the project live cost money.': 'Still, the server and database to keep the project live cost money.',
'If you can, please considere a one time only or even monthly contribution via Github Sponsor.': 'If you can, please considere a one time only or even monthly contribution via Github Sponsor.',
'Go to Github Sponsors': 'Go to Github Sponsors',
'Public link available': 'Public link available',
'Share model':'Share model',
'Create public link':'Create public link',
'Enable import': 'Enable import',
Expand Down
1 change: 1 addition & 0 deletions app/i18n/languages/pt_BR.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,7 @@ export default {
'If you can, please considere a one time only or even monthly contribution via Github Sponsor.': 'Se puder, considere uma contribuição única ou mesmo mensal por meio do Github Sponsors.',
'Go to Github Sponsors': 'Ir para o Github Sponsors',
'Share model': 'Compartilhar modelo',
'Public link available': 'Link público disponível',
'Create public link': 'Criar link público',
'Enable import': 'Autorizar importação',
'Allow users to make copies using the public link': 'Permitir que os usuários façam cópias usando o link público',
Expand Down
11 changes: 10 additions & 1 deletion app/sass/modelWorkspace.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,4 +46,13 @@
.modelWorkspace .workspace-header .page-header {
margin-top: 10px;
border-bottom: 1px solid var(--border-default);
}
}

////////////////////////////////////////////////////////////////////////////////
// .share-status
////////////////////////////////////////////////////////////////////////////////
.share-status {
color: var(--gray-70);
font-size: 1.2rem;
margin-right: 4px;
}