Project

General

Profile

« Previous | Next » 

Revision 37621

View differences:

modules/uoa-stats-config/trunk/src/main/java/eu/dnetlib/client/OptionsWidget.java
63 63
			@Override
64 64
			public void onClick(ClickEvent arg0) {
65 65
				// TODO Auto-generated method stub
66
				dataSeriesTab.setActive(false);
66 67
					totalColumns++;
67 68
					specialColumnCounter++;
68
					DataserieWidget temp = new DataserieWidget(valuesOfFields, mainTabPanel,schemaFromServer,totalColumns,specialColumnCounter,deleteImageList,listBoxes,generationClass);
69
					new DataserieWidget(valuesOfFields, mainTabPanel,schemaFromServer,totalColumns,specialColumnCounter,deleteImageList,listBoxes,generationClass);
69 70
					generationClass.generateURLs(valuesOfFields, 1);
71
				
70 72
			}
71 73
		});
72 74
		
......
102 104
		fontSizePanel.add(fontSizeTextBox);
103 105
		
104 106
		masterPanel.add(textColorPanel);
105
		masterPanel.add(new HTML("<hr/>"));
107
		masterPanel.add(new HTML("<hr class='seperator'/>"));
106 108
		masterPanel.add(fontSizePanel);
107
		masterPanel.add(new HTML("<hr/>"));
109
		masterPanel.add(new HTML("<hr class='seperator'/>"));
108 110
		
109 111
		appearanceTab.add(masterPanel);
110 112
	}
......
114 116
		FlowPanel masterPanel = new FlowPanel();
115 117
		
116 118
		HorizontalPanel rotatePanel = new HorizontalPanel();
119
		rotatePanel.addStyleName("generalOptionsTable");
117 120
		rotatePanel.add(new Label("Rotation(Degrees)"));
118 121
		TextBox rotateTextBox = new TextBox();
119 122
		rotatePanel.add(rotateTextBox);
120 123
		
121 124
		HorizontalPanel useStepsPanel = new HorizontalPanel();
125
		useStepsPanel.addStyleName("generalOptionsTable");
122 126
		useStepsPanel.add(new Label("Use steps"));
123 127
		TextBox useStepsTetxtBox = new TextBox();
124 128
		useStepsPanel.add(useStepsTetxtBox);
125 129
		
126 130
		HorizontalPanel useLevelsPanel = new HorizontalPanel();
131
		useLevelsPanel.addStyleName("generalOptionsTable");
127 132
		useLevelsPanel.add(new Label("Use levels"));
128 133
		TextBox useLevelsTetxtBox = new TextBox();
129 134
		useLevelsPanel.add(useLevelsTetxtBox);
......
131 136
		
132 137
		
133 138
		HorizontalPanel titlePanel = new HorizontalPanel();
139
		titlePanel.addStyleName("generalOptionsTable");
134 140
		titlePanel.add(new Label("Title of chart"));
135 141
		final TextBox titleTextBox = new TextBox();
136 142
		titleTextBox.addChangeHandler(new ChangeHandler() {
......
145 151
		titlePanel.add(titleTextBox);
146 152

  
147 153
		HorizontalPanel subtitlePanel = new HorizontalPanel();
154
		subtitlePanel.addStyleName("generalOptionsTable");
148 155
		subtitlePanel.add(new Label("Subitle of chart"));
149 156
		final TextBox subtitleTextBox = new TextBox();
150 157
		subtitleTextBox.addChangeHandler(new ChangeHandler() {
......
159 166
		subtitlePanel.add(subtitleTextBox);
160 167

  
161 168
		HorizontalPanel xaxisPanel = new HorizontalPanel();
169
		xaxisPanel.addStyleName("generalOptionsTable");
162 170
		xaxisPanel.add(new Label("Naming x-axis"));
163 171
		final TextBox xaxisTextBox = new TextBox();
164 172
		xaxisTextBox.addChangeHandler(new ChangeHandler() {
......
173 181
		xaxisPanel.add(xaxisTextBox);
174 182
		
175 183
		HorizontalPanel yaxisPanel = new HorizontalPanel();
184
		yaxisPanel.addStyleName("generalOptionsTable");
176 185
		yaxisPanel.add(new Label("Naming y-axis"));
177 186
		final TextBox yaxisTextBox = new TextBox();
178 187
		yaxisTextBox.addChangeHandler(new ChangeHandler() {
......
186 195
		});
187 196
		yaxisPanel.add(yaxisTextBox);
188 197
		
189
		masterPanel.add(new HTML("<h2>General options</h2>"));
198
		masterPanel.add(new HTML("<h2 class='optionsHeaders'>General options</h2>"));
199
		masterPanel.add(new HTML("<hr style='height:5px;background-color:#E5E5E5'/>"));
190 200
		masterPanel.add(rotatePanel);
191
		masterPanel.add(new HTML("<hr/>"));
201
		masterPanel.add(new HTML("<hr class='seperator'/>"));
192 202
		masterPanel.add(useStepsPanel);
193 203
		masterPanel.add(new HTML("<hr/>"));
194 204
		masterPanel.add(useLevelsPanel);
195
		masterPanel.add(new HTML("<h2>Headers<h2/>"));
205
		masterPanel.add(new HTML("<h2 class='optionsHeaders'>Headers<h2/>"));
206
		masterPanel.add(new HTML("<hr style='height:5px;background-color:#E5E5E5'/>"));
196 207
		masterPanel.add(titlePanel);
197
		masterPanel.add(new HTML("<hr/>"));
208
		masterPanel.add(new HTML("<hr class='seperator'/>"));
198 209
		masterPanel.add(subtitlePanel);
199
		masterPanel.add(new HTML("<hr/>"));
210
		masterPanel.add(new HTML("<hr class='seperator'/>"));
200 211
		masterPanel.add(xaxisPanel);
201
		masterPanel.add(new HTML("<hr/>"));
212
		masterPanel.add(new HTML("<hr class='seperator'/>"));
202 213
		masterPanel.add(yaxisPanel);
203 214
		
204 215
		generalTab.add(masterPanel);
modules/uoa-stats-config/trunk/src/main/java/eu/dnetlib/client/dataBox.java
18 18
	
19 19
	public void designDataBox(){
20 20
		
21
		tableOfContent.addStyleName("databox-table");
21 22
		tableOfContent.getRowFormatter().addStyleName(0, "databox-header");
22 23
		tableOfContent.setText(0, 0, "Values of categories");
23 24
		tableOfContent.setText(0, 1, "Values of category 1");
modules/uoa-stats-config/trunk/src/main/java/eu/dnetlib/client/PreviewBox.java
1 1
package eu.dnetlib.client;
2 2

  
3
import com.google.gwt.user.client.ui.Frame;
4 3
import com.google.gwt.user.client.ui.RootPanel;
5 4
import com.google.gwt.user.client.ui.Widget;
6 5

  
......
15 14
	
16 15
	public void designPreviewBox(){
17 16
		
18
		Frame previewOfChart = new Frame("http://dl114.madgik.di.uoa.gr/stats/chart.php?com=query&data={%22nulls%22:false,%22table%22:%22result%22,%22fields%22:[{%22fld%22:%22number%22,%22agg%22:%22count%22,%22type%22:%22column%22,%22yaxis%22:1,%22c%22:false}],%22type%22:%22chart%22,%22xaxis%22:[],%22sort%22:%22xaxis%22,%22order%22:%22a%22,%22xStyle%22:{%22r%22:%22-%22,%22s%22:%22-%22,%22l%22:%22-%22,%22ft%22:%22-%22,%22wt%22:%22-%22},%22yaxisheaders%22:[%22%22],%22fieldsheaders%22:[%22%22],%22in%22:[]}");
19
		previewOfChart.addStyleName("my-frame");
20 17
		
21 18
		generationClass.getTheme1().addStyleName("my-frame");
22 19
		generationClass.getTheme2().addStyleName("my-frame");
23 20
		generationClass.getTheme3().addStyleName("my-frame");
21
		
22
		
24 23
		RootPanel.get("highchart").add(generationClass.getTheme1());
25 24
	}
26 25
}
modules/uoa-stats-config/trunk/src/main/java/eu/dnetlib/client/SiteHeader.java
13 13
import com.google.gwt.event.dom.client.ClickHandler;
14 14
import com.google.gwt.user.client.Window;
15 15
import com.google.gwt.user.client.ui.HTML;
16
import com.google.gwt.user.client.ui.Image;
16 17
import com.google.gwt.user.client.ui.RootPanel;
17 18
import com.google.gwt.user.client.ui.Widget;
18 19

  
......
100 101
		headerNav.add(SaveButton);
101 102
		headerNav.add(LoadButton);
102 103
		headerNav.add(PublishButton);
103
		
104 104
		headerNavBar.add(logo);
105 105
		headerNavBar.add(headerNav);
106
//		headerNavBar.add(new Image("https://www.openaire.eu/images/site_images/OpenAIREplus_logo.png"));
107
		headerNavBar.getElement().getStyle().setBackgroundImage("http://www.canadiancapitaladvance.com/images/background-header.jpg");
106 108
		
107 109
		RootPanel.get("block-header").add(headerNavBar);
108 110
		
modules/uoa-stats-config/trunk/src/main/webapp/StatsConfig.css
26 26
    background-color: white;
27 27
    display: inline-block;
28 28
 	float:left;
29
 	-webkit-box-shadow: 0px 0px 36px -2px rgba(83,83,100,1);
30
-moz-box-shadow: 0px 0px 36px -2px rgba(83,83,100,1);
31
box-shadow: 0px 0px 36px -2px rgba(83,83,100,1);
29 32
}
30 33

  
31 34
.rightColumn {
32
	background-color:white;
33 35
    width: 60%;
34 36
    height: 100%;
35 37
    display: inline-block;
......
44 46
}
45 47

  
46 48
#highchart{
49
	border-radius:50px;
47 50
	height:550px;
48 51
	overflow:hidden;
52
	margin-right:30px;
53
	-webkit-box-shadow: 0px 0px 36px -2px rgba(83,83,100,1);
54
-moz-box-shadow: 0px 0px 36px -2px rgba(83,83,100,1);
55
box-shadow: 0px 0px 36px -2px rgba(83,83,100,1);
49 56
}
50 57

  
58
#tableChart{
59
	border-radius:30px;
60
	margin-top:20px;
61
	margin-right:10px;
62
	-webkit-box-shadow: 0px 0px 36px -2px rgba(83,83,100,1);
63
-moz-box-shadow: 0px 0px 36px -2px rgba(83,83,100,1);
64
box-shadow: 0px 0px 36px -2px rgba(83,83,100,1);
65
}
51 66

  
52 67
.modal-general-body{
53 68
	background-color:#535364;
......
92 107
.databox-data {
93 108
	text-align:center;
94 109
}
110

  
111
.databox-table{
112
	margin:auto;
113
}
95 114
.main-navigation-bar > li{
96 115
	top:35px;
97 116
}
......
131 150
.imageStartingModal{
132 151
	float:left;
133 152
	margin-right:15px;
153
}
154

  
155
.optionsHeaders{
156
	text-align:center;
157
	font-family:"Lato";
158

  
159
}
160

  
161
.seperator{
162
	width:80%;
163
	margin-top:10px;
164
	margin-bottom:15px;
165
	margin-right:auto;
166
	margin-left:auto;
167
}
168

  
169
.generalOptionsTable{
170
	margin:auto;
171
}
172

  
173
.previewBoxIcon{
174
	max-width:30px;
175
	max-height:30px;
134 176
}

Also available in: Unified diff