Skip to content

Commit

Permalink
MID-6271 self credentials
Browse files Browse the repository at this point in the history
  • Loading branch information
@1azyman
1azyman committed Apr 20, 2022
1 parent 83cae85 commit 34a92d6
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 54 deletions.
6 changes: 3 additions & 3 deletions gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/GuiStyleConstants.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ public class GuiStyleConstants {

public static final String CLASS_OBJECT_TASK_ICON = "fa fa-tasks";
public static final String CLASS_OBJECT_TASK_ICON_COLORED = CLASS_OBJECT_TASK_ICON + " object-task-color";
public static final String CLASS_OBJECT_TASK_BOX_CSS_CLASSES = "object-task-box";
public static final String CLASS_OBJECT_TASK_BOX_CSS_CLASSES = "card-outline object-task-box";
public static final String CLASS_OBJECT_TASK_BOX_THIN_CSS_CLASSES = "object-task-box-thin";

public static final String CLASS_OBJECT_NODE_ICON = "fa fa-server";
Expand All @@ -63,11 +63,11 @@ public class GuiStyleConstants {

public static final String CLASS_OBJECT_WORK_ITEM_ICON = "fa fa-inbox";
public static final String CLASS_OBJECT_WORK_ITEM_ICON_COLORED = CLASS_OBJECT_WORK_ITEM_ICON + " object-task-color"; // TODO
public static final String CLASS_OBJECT_WORK_ITEM_BOX_CSS_CLASSES = "object-task-box"; // TODO
public static final String CLASS_OBJECT_WORK_ITEM_BOX_CSS_CLASSES = "card-outline object-task-box"; // TODO

public static final String CLASS_OBJECT_CERT_DEF_ICON = "fa fa-certificate";
public static final String CLASS_OBJECT_CERT_DEF_ICON_COLORED = CLASS_OBJECT_CERT_DEF_ICON + " object-task-color"; // TODO
public static final String CLASS_OBJECT_CERT_DEF_BOX_CSS_CLASSES = "object-task-box"; // TODO
public static final String CLASS_OBJECT_CERT_DEF_BOX_CSS_CLASSES = "card-outline object-task-box"; // TODO

public static final String CLASS_OBJECT_CERT_CAMPAIGN_ICON = "fa fa-gavel";
public static final String CLASS_OBJECT_CERT_CAMPAIGN_ICON_COLORED = CLASS_OBJECT_CERT_CAMPAIGN_ICON + " object-task-color"; // TODO
Expand Down
1 change: 0 additions & 1 deletion gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageSelfCredentials.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
<a class="btn btn-primary" wicket:id="save" />
</div>
</form>

</wicket:extend>
</body>
</html>
54 changes: 7 additions & 47 deletions ...-gui/src/main/java/com/evolveum/midpoint/web/page/self/component/ChangePasswordPanel.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
<!DOCTYPE html>
<html xmlns:wicket="http://wicket.apache.org">
<wicket:panel>
<div class="form-group" wicket:id="oldPasswordContainer">
<label class="col-sm-2 control-label">
<div class="mb-3 row" wicket:id="oldPasswordContainer">
<label class="col-sm-2 col-form-label">
<wicket:message key="PageSelfCredentials.oldPasswordLabel"/>
</label>
<div class="col-sm-10">
Expand All @@ -22,64 +22,24 @@
</div>
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label" wicket:id="passwordLabel"/>
<div class="mb-3 row">
<label class="col-sm-2 col-form-label" wicket:id="passwordLabel"/>
<div class="col-sm-10">
<div class="password-panel" wicket:id="passwordPanel"/>
</div>
</div>

<div wicket:id="accountsContainer" class="row">
<div class="col-md-12">
<div class="box box-default password-propagation">
<div class="box-header with-border">
<div class="col-12">
<div class="card card-outline card-secondary password-propagation">
<div class="card-header">
<wicket:message key="ChangePasswordPanel.accountsTable.header"/>
<!-- <div class="box-tools pull-right">-->
<!-- <button class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-chevron-down"></i></button>-->
<!-- </div>-->
</div>
<div class="box-body">
<!-- <div class="row password-propagation-legend">-->
<!-- <div class="col-md-11">-->
<!-- <table>-->
<!-- <tr>-->
<!-- <td>-->
<!-- <div class="fa fa-check-square-o"/>-->
<!-- <wicket:message key="ChangePasswordPanel.legendMessage.selected"/>-->
<!-- </td>-->
<!-- </tr>-->
<!-- <tr>-->
<!-- <td>-->
<!-- <div class="fa fa-sign-out"/>-->
<!-- <wicket:message key="ChangePasswordPanel.legendMessage.propagated"/>-->
<!-- </td>-->
<!-- </tr>-->
<!-- <tr>-->
<!-- <td>-->
<!-- <div class="fa fa-square-o"/>-->
<!-- <wicket:message key="ChangePasswordPanel.legendMessage.deselected"/>-->
<!-- </td>-->
<!-- </tr>-->
<!-- <tr>-->
<!-- <td>-->
<!-- <div class="fa fa-square"/>-->
<!-- <wicket:message key="ChangePasswordPanel.legendMessage.no.password.capability"/>-->
<!-- </td>-->
<!-- </tr>-->
<!-- </table>-->
<!-- </div>-->
<!-- <div class="col-md-1">-->
<!-- &lt;!&ndash;<div class="col-md-5" style="float: left">&ndash;&gt;-->
<!-- <button wicket:id="help" style="float: left" class="btn btn-sm btn-primary">-->
<!-- <i class="glyphicon glyphicon-question-sign"></i></button>-->
<!-- &lt;!&ndash;</div>&ndash;&gt;-->
<!-- </div>-->
<!-- </div>-->
<div wicket:id="accounts"/>
</div>
</div>
</div>
</div>

</wicket:panel>
</html>
6 changes: 3 additions & 3 deletions ...-gui/src/main/java/com/evolveum/midpoint/web/page/self/component/ChangePasswordPanel.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -333,7 +333,7 @@ protected DisplayType getIconDisplayType(IModel<PasswordAccountDto> rowModel) {

@Override
public String getCssClass() {
return "col-lg-1";
return "mp-w-lg-1";
}
};
columns.add(enabled);
Expand Down Expand Up @@ -370,7 +370,7 @@ public boolean isVisible() {

@Override
public String getCssClass() {
return "col-lg-2";
return "mp-w-lg-2";
}
});

Expand Down Expand Up @@ -442,7 +442,7 @@ protected DisplayType getDisplayForEmptyResult() {

@Override
public String getCssClass() {
return "col-lg-2";
return "mp-w-lg-2";
}
});

Expand Down

0 comments on commit 34a92d6

Please sign in to comment.