Download as
Browse Code »

Commit 6cf9b911f4571fdcd5f022b3f673887434301157

Authored by Edmar Moretti
1 parent b467f501
Exists in master and in 7 other branches composer, doc-root, docker, guia, licenca, readme, unmaintened

Ajustes nos estilos da ferramenta legenda

Showing 5 changed files with 108 additions and 87 deletions   Show diff stats
documentacao/javascript/prettify.js
View file @6cf9b91
No preview for this file type
documentacao/javascript/searchdata.js
  Diff comments   View file @6cf9b91
... ... @@ -179,4 +179,4 @@ var indexSectionsWithContent = {
179 179 "Y": false,
180 180 "Z": true
181 181 }
182   - }
183 182 \ No newline at end of file
  183 + };
184 184 \ No newline at end of file
... ...
ferramentas/legenda/index.js
  Diff comments   View file @6cf9b91
... ... @@ -106,6 +106,7 @@ i3GEOF.legenda =
106 106 var dicionario = i3GEO.idioma.objetoIdioma(i3GEOF.legenda.dicionario);
107 107 dicionario["locaplic"] = i3GEO.configura.locaplic;
108 108 dicionario["asp"] = '"';
  109 + dicionario["aplicar"] = $trad("p14");
109 110 return dicionario;
110 111 },
111 112 /*
... ...
ferramentas/legenda/template_mst.html
  Diff comments   View file @6cf9b91
... ... @@ -104,85 +104,105 @@
104 104 <div id='i3GEOlegendaguia2obj' style='width: 99%; text-align: left;'>
105 105 <div style='margin-left: 5px;'>
106 106 <div id='i3GEOFlegendaClassesOpcionais'>
  107 + <fieldset style='padding: 5px; margin: 2px;'>
  108 + <p class='paragrafo'>
  109 + &nbsp;
  110 + <input type='checkbox' onclick='' checked id='i3GEOFlegendaaplicaextent' style='cursor: pointer; border: 0px solid white;' />
  111 + <span style='cursor: pointer; position: relative; top: -2px;left: 2px;'>{{{consideraElementosVisisveis}}}</span>
  112 + </p>
  113 + <p class='paragrafo'>{{{ignoraValores}}}:</p>
  114 + <div class='styled-select'>
  115 + <input type='text' id='i3GEOlegendaignorar' value='' />
  116 + </div>
  117 + </fieldset>
  118 + <br>
  119 + <fieldset style='padding: 5px; margin: 2px;'>
  120 + <legend>{{{alteraGeom}}}</legend>
  121 + <p class='paragrafo'>{{{transformaGeom}}}</p>
  122 + <div class='styled-select'>
  123 + <select id='i3GEOlegentaTipoGeo'>
  124 + <option value=''>{{{semTransformacao}}}</option>
  125 + <option value='centroid'>{{{centroide}}}</option>
  126 + <option value='bbox'>box</option>
  127 + <option value='vertices'>{{{vertices}}}</option>
  128 + <option value='start'>{{{verticeInicial}}}</option>
  129 + <option value='end'>{{{verticeFinal}}}</option>
  130 + </select>
  131 + </div>
  132 + <br>
  133 + <p class='paragrafo'>
  134 + <input id='i3GEOlegendabotao17' size='35' type='button' value='{{{aplicar}}}'>
  135 + </p>
  136 + </fieldset>
  137 + <br>
  138 + <fieldset style='padding: 5px; margin: 2px;'>
  139 + <legend>{{{alteraTipo}}}</legend>
  140 + <p class='paragrafo'>{{{alteraTipoGeom}}}</p>
  141 + <p class='paragrafo'>
  142 + <input id='i3GEOlegendabotao7' size='25' type='button' value='{{{aplicar}}}' />
  143 + </p>
  144 + </fieldset>
  145 + </div>
  146 + <br>
  147 + <fieldset style='padding: 5px; margin: 2px;'>
  148 + <legend>{{{simboloUnico}}}</legend>
  149 + <p class='paragrafo'>{{{todosElementosUnicoSimbolo}}}</p>
107 150 <p class='paragrafo'>
108   - &nbsp;
109   - <input type='checkbox' onclick='' checked id='i3GEOFlegendaaplicaextent' style='cursor: pointer; border: 0px solid white;' />
110   - <span style='cursor: pointer; position: relative; top: -2px;left: 2px;'>{{{consideraElementosVisisveis}}}</span>
  151 + <input id='i3GEOlegendabotao5' size='25' type='button' value='{{{aplicar}}}' />
111 152 </p>
112   - <p class='paragrafo'>{{{ignoraValores}}}:</p>
113   - <div class='styled-select'>
114   - <input type='text' id='i3GEOlegendaignorar' value='' />
115   - </div>
116   - <hr>
117   - <p class='paragrafo'>{{{transformaGeom}}}</p>
118   - <div class='styled-select'>
119   - <select id='i3GEOlegentaTipoGeo'>
120   - <option value=''>{{{semTransformacao}}}</option>
121   - <option value='centroid'>{{{centroide}}}</option>
122   - <option value='bbox'>box</option>
123   - <option value='vertices'>{{{vertices}}}</option>
124   - <option value='start'>{{{verticeInicial}}}</option>
125   - <option value='end'>{{{verticeFinal}}}</option>
126   - </select>
  153 + </fieldset>
  154 + <br>
  155 + <fieldset style='padding: 5px; margin: 2px;'>
  156 + <legend>{{{valorUnico}}}</legend>
  157 + <p class='paragrafo'>{{{cadaOcorrenciaUnicoSimbolo}}}</p>
  158 + <div id='i3GEOlegendaitensValorUnico' class='styled-select'></div>
  159 + <br>
  160 + <p class='paragrafo'>{{{nomeClassesUnicoSimbolo}}}</p>
  161 + <div id='i3GEOlegendaClassesValorUnico' class='styled-select'></div>
  162 + <br>
  163 + <p class='paragrafo'>
  164 + <input id='i3GEOlegendabotao6' size='25' type='button' value='{{{aplicar}}}' />
  165 + </p>
  166 + </fieldset>
  167 + <br>
  168 + <fieldset style='padding: 5px; margin: 2px;'>
  169 + <legend>{{{classes}}}</legend>
  170 + <p class='paragrafo'>{{{criaClassesItemNumerico}}}</p>
  171 + <div id='i3GEOlegendaitensValorClass' class='styled-select'></div>
  172 + <br>
  173 + <p class='paragrafo'>{{{numeroClasses}}}:</p>
  174 + <div class='i3geoForm i3geoFormIconeNumero'>
  175 + <input type='number' id='i3GEOlegendanclasses' value='5' />
127 176 </div>
128 177 <br>
129 178 <p class='paragrafo'>
130   - <input id='i3GEOlegendabotao17' size='35' type='button' value='{{{alteraGeom}}}'>
  179 + <input id='i3GEOlegendabotao8' type='button' value='{{{intervalosIguais}}}' />
131 180 </p>
132   - <hr>
133   - <p class='paragrafo'>{{{alteraTipoGeom}}}</p>
134 181 <p class='paragrafo'>
135   - <input id='i3GEOlegendabotao7' size='25' type='button' value='{{{alteraTipo}}}' />
  182 + <input id='i3GEOlegendabotaoQN' type='button' value='{{{quebrasNaturais}}}' />
136 183 </p>
137   - </div>
138   - <hr>
139   - <p class='paragrafo'>{{{todosElementosUnicoSimbolo}}}</p>
140   - <p class='paragrafo'>
141   - <input id='i3GEOlegendabotao5' size='25' type='button' value='{{{simboloUnico}}}' />
142   - </p>
143   - <hr>
144   - <p class='paragrafo'>{{{cadaOcorrenciaUnicoSimbolo}}}</p>
145   - <div id='i3GEOlegendaitensValorUnico' class='styled-select'></div>
146   - <br>
147   - <p class='paragrafo'>{{{nomeClassesUnicoSimbolo}}}</p>
148   - <div id='i3GEOlegendaClassesValorUnico' class='styled-select'></div>
149   - <br>
150   - <p class='paragrafo'>
151   - <input id='i3GEOlegendabotao6' size='25' type='button' value='{{{valorUnico}}}' />
152   - </p>
153   - <hr>
154   - <p class='paragrafo'>{{{criaClassesItemNumerico}}}</p>
155   - <div id='i3GEOlegendaitensValorClass' class='styled-select'></div>
156   - <br>
157   - <p class='paragrafo'>{{{numeroClasses}}}:</p>
158   - <div class='i3geoForm i3geoFormIconeNumero'>
159   - <input type='number' id='i3GEOlegendanclasses' value='5' />
160   - </div>
161   - <br>
162   - <p class='paragrafo'>
163   - <input id='i3GEOlegendabotao8' type='button' value='{{{intervalosIguais}}}' />
164   - </p>
165   - <p class='paragrafo'>
166   - <input id='i3GEOlegendabotaoQN' type='button' value='{{{quebrasNaturais}}}' />
167   - </p>
168   - <p class='paragrafo'>
169   - <input id='i3GEOlegendabotaoQuantil' type='button' value='{{{calcularQuantil}}}' />
170   - </p>
171   - <hr>
172   - <p class='paragrafo'>{{{criaQuartis}}}</p>
173   - <div id='i3GEOlegendaitensValorQuartil' class='styled-select'></div>
  184 + <p class='paragrafo'>
  185 + <input id='i3GEOlegendabotaoQuantil' type='button' value='{{{calcularQuantil}}}' />
  186 + </p>
  187 + </fieldset>
174 188 <br>
175   - <p class='paragrafo'>
176   - <input id='i3GEOlegendabotao9' size='25' type='button' value='{{{calcularQuartil}}}' />
177   - </p>
178   - <p class='paragrafo'>{{{estiloNomeClasses}}}:
179   - <div class='styled-select'>
180   - <select id='estiloClassesQuartis'>
181   - <option value='minimo'>{{{soValores}}}</option>
182   - <option value='simples'>{{{quartilValores}}}</option>
183   - <option value='completo'>{{{expressaoCompleta}}}</option>
184   - </select>
185   - </div>
  189 + <fieldset style='padding: 5px; margin: 2px;'>
  190 + <legend>{{{calcularQuartil}}}</legend>
  191 + <p class='paragrafo'>{{{criaQuartis}}}</p>
  192 + <div id='i3GEOlegendaitensValorQuartil' class='styled-select'></div>
  193 + <br>
  194 + <p class='paragrafo'>
  195 + <input id='i3GEOlegendabotao9' size='25' type='button' value='{{{aplicar}}}' />
  196 + </p>
  197 + <p class='paragrafo'>{{{estiloNomeClasses}}}:
  198 + <div class='styled-select'>
  199 + <select id='estiloClassesQuartis'>
  200 + <option value='minimo'>{{{soValores}}}</option>
  201 + <option value='simples'>{{{quartilValores}}}</option>
  202 + <option value='completo'>{{{expressaoCompleta}}}</option>
  203 + </select>
  204 + </div>
  205 + </fieldset>
186 206 <br>
187 207 </div>
188 208 </div>
... ...
ferramentas/saiku/saiku-server/tomcat/webapps/ROOT/js/saiku/models/Session.js
  Diff comments   View file @6cf9b91
1   -/*
  1 +/*
2 2 * Copyright 2012 OSBI Ltd
3 3 *
4 4 * Licensed under the Apache License, Version 2.0 (the "License");
... ... @@ -13,7 +13,7 @@
13 13 * See the License for the specific language governing permissions and
14 14 * limitations under the License.
15 15 */
16   -
  16 +
17 17 /**
18 18 * Object which handles authentication and stores connections and cubes
19 19 * @param username
... ... @@ -24,7 +24,7 @@ var Session = Backbone.Model.extend({
24 24 username: null,
25 25 password: null,
26 26 sessionid: null,
27   -
  27 +
28 28 initialize: function(args, options) {
29 29 // Attach a custom event bus to this model
30 30 _.extend(this, Backbone.Events);
... ... @@ -43,7 +43,7 @@ var Session = Backbone.Model.extend({
43 43 check_session: function() {
44 44 if (this.sessionid === null || this.username === null || this.password === null) {
45 45 this.clear();
46   - this.fetch({ success: this.process_session })
  46 + this.fetch({ success: this.process_session });
47 47 } else {
48 48 this.username = encodeURIComponent(options.username);
49 49 this.load_session();
... ... @@ -71,24 +71,24 @@ var Session = Backbone.Model.extend({
71 71 }
72 72 this.load_session();
73 73 }
74   -
  74 +
75 75 return this;
76 76 },
77   -
  77 +
78 78 error: function() {
79 79 $(this.form.el).dialog('open');
80 80 },
81   -
  81 +
82 82 login: function(username, password) {
83 83 // Set expiration on localStorage to one day in the future
84   - var expires = (new Date()).getTime() +
  84 + var expires = (new Date()).getTime() +
85 85 Settings.LOCALSTORAGE_EXPIRATION;
86 86 typeof localStorage !== "undefined" && localStorage && localStorage.setItem('expiration', expires);
87 87  
88 88 this.save({username:username, password:password},{success: this.check_session, error: this.check_session});
89   -
  89 +
90 90 },
91   -
  91 +
92 92 logout: function() {
93 93 //This is a hack (inherited from old UI)
94 94 Saiku.ui.unblock();
... ... @@ -105,7 +105,7 @@ var Session = Backbone.Model.extend({
105 105 this.password = null;
106 106 this.destroy({async: false });
107 107 //console.log("REFRESH!");
108   - document.location.reload(false)
  108 + document.location.reload(false);
109 109 delete this.id;
110 110  
111 111 },
... ...