Project

General

Profile

« Previous | Next » 

Revision 49670

Help texts admin redesigned with the new template

View differences:

modules/uoa-repository-manager-gui/trunk/src/main/java/eu/dnetlib/repo/manager/client/admin/helptexts/HelpTextsAdminController.java
8 8
 */
9 9
public class HelpTextsAdminController extends TokenController {
10 10

  
11
    private HelpTextsAdminWidget helpTextsAdminWidget = HelpTextsAdminWidget.getInstance();
11
    private HelpTextsAdminWidget helpTextsAdminWidget = new HelpTextsAdminWidget();
12 12

  
13 13
    private static HelpTextsAdminController instance = null;
14 14

  
modules/uoa-repository-manager-gui/trunk/src/main/java/eu/dnetlib/repo/manager/client/admin/helptexts/HelpTextsAdminWidget.java
12 12
import eu.dnetlib.gwt.client.help.HelpService;
13 13
import eu.dnetlib.gwt.client.help.HelpServiceAsync;
14 14
import eu.dnetlib.gwt.shared.Help;
15
import eu.dnetlib.repo.manager.client.AbstractRepositoryManagerWidget;
16
import eu.dnetlib.repo.manager.client.HelpCallback;
15 17
import eu.dnetlib.repo.manager.client.RepositoryManagerWidget;
18
import org.gwtbootstrap3.client.ui.Alert;
16 19
import org.gwtbootstrap3.client.ui.Button;
20
import org.gwtbootstrap3.client.ui.constants.AlertType;
17 21
import org.gwtbootstrap3.client.ui.constants.IconPosition;
18 22

  
19 23
import java.util.List;
......
21 25
/**
22 26
 * Created by stefania on 3/9/16.
23 27
 */
24
public class HelpTextsAdminWidget implements RepositoryManagerWidget {
28
public class HelpTextsAdminWidget extends AbstractRepositoryManagerWidget implements RepositoryManagerWidget {
25 29

  
26
    private static HelpTextsAdminWidget instance = null;
30
//    private static HelpTextsAdminWidget instance = null;
31
//
32
//    private String parentToken = "";
33
//    private String restToken = "";
34
//
35
//    private FlowPanel helpAdminPanel = new FlowPanel();
36
//
37
//    private FlowPanel myRepositoriesListPanel = new FlowPanel();
38
//    private FlowPanel myRepositoriesListInnerPanel = new FlowPanel();
39
//    private FlowPanel myRepositoriesListBox = new FlowPanel();
40
//    private FlowPanel myRepositoriesListBoxContent = new FlowPanel();
41
//
42
//    private FlowPanel actionButtonsPanel = new FlowPanel();
43
//
44
//    private FlowPanel sidePanel = new FlowPanel();
45
//    private FlowPanel previewPanel = new FlowPanel();
46
//    private FlowPanel previewPanelContent = new FlowPanel();
47
//    private FlowPanel helpPanel = new FlowPanel();
27 48

  
28 49
    private String parentToken = "";
29 50
    private String restToken = "";
30 51

  
31
    private FlowPanel helpAdminPanel = new FlowPanel();
52
    private FlowPanel helpTextsAdminBoxContent = new FlowPanel();
32 53

  
33
    private FlowPanel myRepositoriesListPanel = new FlowPanel();
34
    private FlowPanel myRepositoriesListInnerPanel = new FlowPanel();
35
    private FlowPanel myRepositoriesListBox = new FlowPanel();
36
    private FlowPanel myRepositoriesListBoxContent = new FlowPanel();
37

  
38 54
    private FlowPanel actionButtonsPanel = new FlowPanel();
39 55

  
40
    private FlowPanel sidePanel = new FlowPanel();
41
    private FlowPanel previewPanel = new FlowPanel();
42
    private FlowPanel previewPanelContent = new FlowPanel();
43
    private FlowPanel helpPanel = new FlowPanel();
56
    private Alert errorAlert = new Alert();
44 57

  
45
    private AdminWidget helpTextsAdminWidget = new AdminWidget(previewPanelContent, false);
58
//    private FlowPanel helpPanel = new FlowPanel();
59
    private FlowPanel helpText = new FlowPanel();
60
    private FlowPanel preview = new FlowPanel();
46 61

  
62
    private AdminWidget helpTextsAdminWidget = new AdminWidget(preview, false);
63

  
47 64
    private static HelpServiceAsync helpService = GWT.create(HelpService.class);
48 65

  
49
    private HelpTextsAdminWidget() {
66
    public HelpTextsAdminWidget() {
50 67

  
51
        helpAdminPanel.addStyleName("row");
68
        super();
52 69

  
53
        myRepositoriesListPanel.addStyleName("col-lg-9");
54
        myRepositoriesListPanel.add(myRepositoriesListInnerPanel);
70
        HTML title = new HTML("<h1 class=\"uk-article-title\">Help Texts Admin</h1>");
71
        title.addStyleName("uk-margin-medium-bottom");
72
        contentPanel.add(title);
55 73

  
56
        myRepositoriesListInnerPanel.addStyleName("wrapper wrapper-content animated fadeInUp");
57
        myRepositoriesListInnerPanel.add(myRepositoriesListBox);
74
        errorAlert.setType(AlertType.DANGER);
75
        errorAlert.setDismissable(false);
76
        errorAlert.setVisible(false);
77
        helpTextsAdminBoxContent.add(errorAlert);
58 78

  
59
        myRepositoriesListBox.addStyleName("ibox");
60
        myRepositoriesListBox.add(myRepositoriesListBoxContent);
79
        contentPanel.add(helpTextsAdminBoxContent);
80
        gridPanel.add(helpPanel);
61 81

  
62
        myRepositoriesListBoxContent.addStyleName("ibox-content");
82
//        helpAdminPanel.addStyleName("row");
83
//
84
//        myRepositoriesListPanel.addStyleName("col-lg-9");
85
//        myRepositoriesListPanel.add(myRepositoriesListInnerPanel);
86
//
87
//        myRepositoriesListInnerPanel.addStyleName("wrapper wrapper-content animated fadeInUp");
88
//        myRepositoriesListInnerPanel.add(myRepositoriesListBox);
89
//
90
//        myRepositoriesListBox.addStyleName("ibox");
91
//        myRepositoriesListBox.add(myRepositoriesListBoxContent);
92
//
93
//        myRepositoriesListBoxContent.addStyleName("ibox-content");
94
//
95
//        sidePanel.addStyleName("col-lg-3");
96
//        sidePanel.add(previewPanel);
63 97

  
64
        sidePanel.addStyleName("col-lg-3");
65
        sidePanel.add(previewPanel);
98
        HTML tt = new HTML();
66 99

  
67
        previewPanel.addStyleName("previewPanel");
68
        previewPanel.add(new HTML("<div class=\"previewTitle\">PREVIEW</div>"));
69
        previewPanel.add(previewPanelContent);
100
        tt.setHTML("<div class=\"previewTitle\">PREVIEW</div>");
101
        preview.addStyleName("previewPanel");
102
//        preview.add(new HTML("<div class=\"previewTitle\">PREVIEW</div>"));
70 103

  
104
        preview.clear();
105
        preview.add(tt);
106
        helpPanel.add(preview);
107

  
71 108
        actionButtonsPanel.addStyleName("helpAdminActionButtons");
72 109

  
73 110
        Button preview = new Button();
74 111
        Button submit = new Button();
75 112

  
76 113
        preview.setText("Preview");
77
        preview.addStyleName("btn-grey-light");
78
        preview.removeStyleName("btn-default");
114
//        preview.addStyleName("btn-grey-light");
115
//        preview.removeStyleName("btn-default");
79 116
        preview.setIconPosition(IconPosition.RIGHT);
80 117
        preview.addClickHandler(new ClickHandler() {
81 118
            @Override
......
85 122
        });
86 123

  
87 124
        submit.setText("Submit Changes");
88
        submit.addStyleName("btn-grey-light");
89
        submit.removeStyleName("btn-default");
125
        preview.addStyleName("uk-button-primary");
126
//        submit.addStyleName("btn-grey-light");
127
//        submit.removeStyleName("btn-default");
90 128
        submit.setIconPosition(IconPosition.RIGHT);
91 129
        submit.addClickHandler(new ClickHandler() {
92 130
            @Override
......
98 136
        actionButtonsPanel.add(preview);
99 137
        actionButtonsPanel.add(submit);
100 138

  
101
        helpAdminPanel.add(myRepositoriesListPanel);
102
        helpAdminPanel.add(sidePanel);
139
//        helpAdminPanel.add(myRepositoriesListPanel);
140
//        helpAdminPanel.add(sidePanel);
103 141

  
104 142
        AdminWidget.HelpTextUpdatedListener helpTextUpdatedListener = new AdminWidget.HelpTextUpdatedListener() {
105 143

  
106 144
            @Override
107 145
            public void helpTextUpdated(Help updatedHelp) {
108 146
                if(updatedHelp!=null && updatedHelp.getId().equals(parentToken))
109
                    reloadHelp();
147
                    helpService.getHelpById(parentToken, new HelpCallback(helpText, helpPanel));
110 148
            }
111 149
        };
112 150
        helpTextsAdminWidget.setHelpTextUpdatedListener(helpTextUpdatedListener);
113 151
    }
114 152

  
115
    public static final HelpTextsAdminWidget getInstance() {
116

  
117
        if(instance==null)
118
            instance = new HelpTextsAdminWidget();
119

  
120
        return instance;
121
    }
122

  
123 153
    @Override
124 154
    public void clear() {
125
        myRepositoriesListBoxContent.clear();
126
        helpAdminPanel.remove(helpPanel);
155

  
156
        helpTextsAdminBoxContent.clear();
157
        errorAlert.setVisible(false);
158
        helpPanel.remove(helpText);
127 159
    }
128 160

  
129 161
    @Override
130 162
    public void reload() {
131 163

  
132 164
        Document.get().getElementById("headerNoTransparent").removeClassName("tm-header-transparent");
165
        helpTextsAdminBoxContent.add(errorAlert);
133 166

  
134
        reloadHelp();
167
        helpService.getHelpById(parentToken, new HelpCallback(helpText, helpPanel));
135 168

  
136 169
        helpTextsAdminWidget.setToken("");
137 170
        helpTextsAdminWidget.setEditorUIColor("#d4dee7");
138 171
        helpTextsAdminWidget.clear();
139 172
        helpTextsAdminWidget.reload();
140 173

  
141
        FlowPanel rowPanel = new FlowPanel();
142
        rowPanel.addStyleName("row");
143
        myRepositoriesListBoxContent.add(rowPanel);
174
//        FlowPanel rowPanel = new FlowPanel();
175
//        rowPanel.addStyleName("row");
176
//        myRepositoriesListBoxContent.add(rowPanel);
177
//
178
//        FlowPanel colPanel = new FlowPanel();
179
//        colPanel.addStyleName("col-lg-12");
180
//        rowPanel.add(colPanel);
181
//
182
//        HTML title = new HTML("<h1>Monitor Help Texts</h1>");
183
//        title.addStyleName("m-b-md");
184
//        colPanel.add(title);
185
//
186
//        helpTextsAdminWidget.addStyleName("col-lg-12");
187
        helpTextsAdminBoxContent.add(helpTextsAdminWidget.asWidget());
144 188

  
145
        FlowPanel colPanel = new FlowPanel();
146
        colPanel.addStyleName("col-lg-12");
147
        rowPanel.add(colPanel);
189
        helpTextsAdminBoxContent.add(actionButtonsPanel);
148 190

  
149
        HTML title = new HTML("<h1>Monitor Help Texts</h1>");
150
        title.addStyleName("m-b-md");
151
        colPanel.add(title);
152

  
153
        helpTextsAdminWidget.addStyleName("col-lg-12");
154
        colPanel.add(helpTextsAdminWidget.asWidget());
155

  
156
        colPanel.add(actionButtonsPanel);
157

  
158 191
        helpService.getAll(new AsyncCallback<List<Help>>() {
159 192

  
160 193
            @Override
......
179 212
    public void afterAdditionToRootPanel() {
180 213
        helpTextsAdminWidget.afterAdditionToRootPanel();
181 214
    }
182

  
183
    @Override
184
    public Widget asWidget() {
185
        return helpAdminPanel;
186
    }
187

  
188
    private void reloadHelp() {
189

  
190
        helpService.getHelpById(parentToken, new AsyncCallback<Help>() {
191

  
192
            @Override
193
            public void onFailure(Throwable caught) {
194
            }
195

  
196
            @Override
197
            public void onSuccess(Help help) {
198

  
199
                if (help != null && help.getText()!=null && !help.getText().trim().isEmpty()) {
200

  
201
                    HTML html = new HTML();
202
                    html.setHTML(help.getText());
203

  
204
                    helpPanel.clear();
205
                    helpPanel.add(html);
206
                    sidePanel.add(helpPanel);
207
                }
208
            }
209
        });
210
    }
211 215
}
modules/uoa-repository-manager-gui/trunk/src/main/java/eu/dnetlib/repo/manager/client/admin/metrics/MetricsAdminWidget.java
43 43

  
44 44
    private Alert errorAlert = new Alert();
45 45

  
46
    private FlowPanel helpPanel = new FlowPanel();
47

  
48 46
    private static HelpServiceAsync helpService = GWT.create(HelpService.class);
49 47
    private static RepositoryServiceAsync repositoryService = GWT.create(RepositoryService.class);
50 48

  
modules/uoa-repository-manager-gui/trunk/src/main/java/eu/dnetlib/repo/manager/client/enrichcontent/BrowseSubscriptionsWidget.java
43 43

  
44 44
    private Alert errorAlert = new Alert();
45 45

  
46
    private FlowPanel helpPanel = new FlowPanel();
47

  
48 46
    private static HelpServiceAsync helpService = GWT.create(HelpService.class);
49 47
    private static BrokerServiceAsync brokerService = GWT.create(BrokerService.class);
50 48

  
modules/uoa-repository-manager-gui/trunk/src/main/webapp/RepositoryManager.css
605 605
.previewPanel {
606 606
  background-color: #ffffff;
607 607
  box-shadow: 0 2px 4px 0 #5d93ac;
608
  margin-left: -10px;
609 608
  margin-top: 21px;
610
  padding-left: 10px;
611
  padding-right: 10px;
612
  padding-bottom: 10px;
609
  padding: 20px;
610
  margin-bottom: 30px;
613 611
}
614 612

  
615 613
.helpAdminActionButtons {

Also available in: Unified diff