Download as
Browse Code »

Commit c4409cdeed19712bc2f68876b03ba32ae3343d6f

Authored by Rodrigo Gonçalves
1 parent ab4402ea
Exists in master

Fix for DropDown width in SumoSelect (AlpacaJS)

Showing 13 changed files with 34 additions and 21 deletions   Show diff stats
Kernel/Output/HTML/Templates/Standard/CustomerFooterNTWSeTIC.tt
  Diff comments   View file @c4409cd
@@ -10,9 +10,9 @@ @@ -10,9 +10,9 @@
10 <div id="footerF" align="center" style="bottom: 10px; width: 100%; margin-top: 18px; margin-bottom: 8px;" class="noPrint"> 10 <div id="footerF" align="center" style="bottom: 10px; width: 100%; margin-top: 18px; margin-bottom: 8px;" class="noPrint">
11 11
12 <div style="font-size: 0px;"> 12 <div style="font-size: 0px;">
13 -<div style="height: 2px; width: 100%; background-image: url('/otrs-web/skins/Customer/default/images/queues-panel/separador.gif'); background-repeat: repeat-x; background-position: 0 50%;"></div> 13 +<div style="height: 2px; width: 100%; background-image: url('/otrs-web/skins/Customer/default/images/ufsc/separador.gif'); background-repeat: repeat-x; background-position: 0 50%;"></div>
14 </div> 14 </div>
15 - <br><a href="http://www.setic.ufsc.br" target="_blank"><img src="/otrs-web/skins/Customer/default/images/queues-panel/setic.png" style="border-style: none"></a> 15 + <br><a href="http://www.setic.ufsc.br" target="_blank"><img src="/otrs-web/skins/Customer/default/images/ufsc/setic.png" style="border-style: none"></a>
16 <br> 16 <br>
17 <div style="margin-top: 4px;"><span style="color: #BBBBBB;">© SeTIC - Superintendência de Governança Eletrônica e Tecnologia da Informação e Comunicação</span> 17 <div style="margin-top: 4px;"><span style="color: #BBBBBB;">© SeTIC - Superintendência de Governança Eletrônica e Tecnologia da Informação e Comunicação</span>
18 </div> 18 </div>
Kernel/Output/HTML/Templates/Standard/CustomerFooterNTWUFSC.tt
  Diff comments   View file @c4409cd
@@ -10,9 +10,9 @@ @@ -10,9 +10,9 @@
10 <div id="footerF" align="center" style="bottom: 10px; width: 100%; margin-top: 18px; margin-bottom: 8px;" class="noPrint"> 10 <div id="footerF" align="center" style="bottom: 10px; width: 100%; margin-top: 18px; margin-bottom: 8px;" class="noPrint">
11 11
12 <div style="font-size: 0px;"> 12 <div style="font-size: 0px;">
13 -<div style="height: 2px; width: 100%; background-image: url('/otrs-web/skins/Customer/default/images/queues-panel/separador.gif'); background-repeat: repeat-x; background-position: 0 50%;"></div> 13 +<div style="height: 2px; width: 100%; background-image: url('/otrs-web/skins/Customer/default/images/ufsc/separador.gif'); background-repeat: repeat-x; background-position: 0 50%;"></div>
14 </div> 14 </div>
15 - <br><a href="http://www.setic.ufsc.br" target="_blank"><img src="/otrs-web/skins/Customer/default/images/queues-panel/setic.png" style="border-style: none"></a> 15 + <br><a href="http://www.setic.ufsc.br" target="_blank"><img src="/otrs-web/skins/Customer/default/images/ufsc/setic.png" style="border-style: none"></a>
16 <br> 16 <br>
17 <div style="margin-top: 4px;"><span style="color: #BBBBBB;">© SeTIC - Superintendência de Governança Eletrônica e Tecnologia da Informação e Comunicação</span> 17 <div style="margin-top: 4px;"><span style="color: #BBBBBB;">© SeTIC - Superintendência de Governança Eletrônica e Tecnologia da Informação e Comunicação</span>
18 </div> 18 </div>
Kernel/Output/HTML/Templates/Standard/CustomerHTMLHeadNTWSeTIC.tt
  Diff comments   View file @c4409cd
@@ -112,7 +112,7 @@ @@ -112,7 +112,7 @@
112 112
113 #header { 113 #header {
114 height: 90px; 114 height: 90px;
115 - background-image: url("/otrs-web/skins/Customer/default/images/queues-panel/cabecalhoUFSC.jpg"); 115 + background-image: url("/otrs-web/skins/Customer/default/images/ufsc/cabecalhoUFSC.jpg");
116 background-position: bottom left; 116 background-position: bottom left;
117 padding-left: 30px; 117 padding-left: 30px;
118 padding-top: 0px; 118 padding-top: 0px;
@@ -161,7 +161,7 @@ body { @@ -161,7 +161,7 @@ body {
161 161
162 162
163 #Navigation { 163 #Navigation {
164 - background-image: url('/otrs-web/skins/Customer/default/images/new-ticket-wizard/panel_hd_bg_setic.png'); 164 + background-image: url('/otrs-web/skins/Customer/default/images/ufsc/panel_hd_bg_setic.png');
165 background-repeat: repeat-x; 165 background-repeat: repeat-x;
166 background-position: 0 50%; 166 background-position: 0 50%;
167 border: 1px solid #9CABC1; 167 border: 1px solid #9CABC1;
Kernel/Output/HTML/Templates/Standard/CustomerHTMLHeadNTWUFSC.tt
  Diff comments   View file @c4409cd
@@ -96,7 +96,7 @@ @@ -96,7 +96,7 @@
96 <style type="text/css"> 96 <style type="text/css">
97 #header { 97 #header {
98 height: 90px; 98 height: 90px;
99 - background-image: url("/otrs-web/skins/Customer/default/images/queues-panel/cabecalhoUFSC.jpg"); 99 + background-image: url("/otrs-web/skins/Customer/default/images/ufsc/cabecalhoUFSC.jpg");
100 background-position: bottom left; 100 background-position: bottom left;
101 padding-left: 30px; 101 padding-left: 30px;
102 padding-top: 0px; 102 padding-top: 0px;
@@ -145,7 +145,7 @@ vertical-align: bottom; @@ -145,7 +145,7 @@ vertical-align: bottom;
145 145
146 146
147 #Navigation { 147 #Navigation {
148 - background-image: url('/otrs-web/skins/Customer/default/images/new-ticket-wizard/panel_hd_bg.png'); 148 + background-image: url('/otrs-web/skins/Customer/default/images/ufsc/panel_hd_bg.png');
149 background-repeat: repeat-x; 149 background-repeat: repeat-x;
150 background-position: 0 50%; 150 background-position: 0 50%;
151 border: 1px solid #9CABC1; 151 border: 1px solid #9CABC1;
Kernel/Output/HTML/Templates/Standard/CustomerHeaderNTWSeTIC.tt
  Diff comments   View file @c4409cd
@@ -34,7 +34,7 @@ @@ -34,7 +34,7 @@
34 </tbody> 34 </tbody>
35 </table> 35 </table>
36 <div style="font-size: 0px;"> 36 <div style="font-size: 0px;">
37 - <div style="height: 2px; width: 100%; background-image: url('/otrs-web/skins/Customer/default/images/queues-panel/separador.gif'); background-repeat: repeat-x; background-position: 0 50%;"></div> 37 + <div style="height: 2px; width: 100%; background-image: url('/otrs-web/skins/Customer/default/images/ufsc/separador.gif'); background-repeat: repeat-x; background-position: 0 50%;"></div>
38 </div> 38 </div>
39 39
40 40
Kernel/Output/HTML/Templates/Standard/CustomerHeaderNTWUFSC.tt
  Diff comments   View file @c4409cd
@@ -34,7 +34,7 @@ @@ -34,7 +34,7 @@
34 </tr> 34 </tr>
35 </tbody></table> 35 </tbody></table>
36 <div style="font-size: 0px;"> 36 <div style="font-size: 0px;">
37 -<div style="height: 2px; width: 100%; background-image: url('/otrs-web/skins/Customer/default/images/queues-panel/separador.gif'); background-repeat: repeat-x; background-position: 0 50%;"></div> 37 +<div style="height: 2px; width: 100%; background-image: url('/otrs-web/skins/Customer/default/images/ufsc/separador.gif'); background-repeat: repeat-x; background-position: 0 50%;"></div>
38 </div> 38 </div>
39 39
40 <!-- end header --> 40 <!-- end header -->
NewTicketWizard.sopm
  Diff comments   View file @c4409cd
1 <?xml version="1.0" encoding="utf-8" ?> 1 <?xml version="1.0" encoding="utf-8" ?>
2 <otrs_package version="1.0"> 2 <otrs_package version="1.0">
3 <Name>NewTicketWizard</Name> 3 <Name>NewTicketWizard</Name>
4 - <Version>2.0.0</Version> 4 + <Version>2.0.2</Version>
5 <Framework>5.0.x</Framework> 5 <Framework>5.0.x</Framework>
6 <Vendor>SeTIC</Vendor> 6 <Vendor>SeTIC</Vendor>
7 <URL>http://www.setic.ufsc.br</URL> 7 <URL>http://www.setic.ufsc.br</URL>
@@ -25,6 +25,8 @@ @@ -25,6 +25,8 @@
25 <ChangeLog version="1.9.9">Fix for date fields</ChangeLog> 25 <ChangeLog version="1.9.9">Fix for date fields</ChangeLog>
26 <ChangeLog version="1.9.11">Fix for public interface custom properties</ChangeLog> 26 <ChangeLog version="1.9.11">Fix for public interface custom properties</ChangeLog>
27 <ChangeLog version="2.0.0">Changes for OTRS 5.0.x</ChangeLog> 27 <ChangeLog version="2.0.0">Changes for OTRS 5.0.x</ChangeLog>
  28 + <ChangeLog version="2.0.1">Separation for OTRS Media (images)</ChangeLog>
  29 + <ChangeLog version="2.0.2">Fix for DropDown width in SumoSelect (AlpacaJS)</ChangeLog>
28 <IntroInstall Type="post" Title="Thank you">New Ticket Wizard module installed successfully!</IntroInstall> 30 <IntroInstall Type="post" Title="Thank you">New Ticket Wizard module installed successfully!</IntroInstall>
29 <BuildDate>?</BuildDate> 31 <BuildDate>?</BuildDate>
30 <BuildHost>?</BuildHost> 32 <BuildHost>?</BuildHost>
NewTicketWizardSeTIC.sopm
  Diff comments   View file @c4409cd
1 <?xml version="1.0" encoding="utf-8" ?> 1 <?xml version="1.0" encoding="utf-8" ?>
2 <otrs_package version="1.0"> 2 <otrs_package version="1.0">
3 <Name>NewTicketWizardSeTIC</Name> 3 <Name>NewTicketWizardSeTIC</Name>
4 - <Version>1.0.0</Version> 4 + <Version>1.0.1</Version>
5 <Framework>5.0.x</Framework> 5 <Framework>5.0.x</Framework>
6 <Vendor>SeTIC</Vendor> 6 <Vendor>SeTIC</Vendor>
7 <URL>http://www.setic.ufsc.br</URL> 7 <URL>http://www.setic.ufsc.br</URL>
8 <License>GPLv2</License> 8 <License>GPLv2</License>
9 <Description>NewTicket Wizard Module Template for SeTIC</Description> 9 <Description>NewTicket Wizard Module Template for SeTIC</Description>
10 - <ChangeLog version="1.0.0">First version</ChangeLog> 10 + <ChangeLog version="1.0.0">First version</ChangeLog>
  11 + <ChangeLog version="1.0.1">Media separation</ChangeLog>
11 <IntroInstall Type="post" Title="Thank you">New Ticket Wizard SeTIC Template module installed successfully!</IntroInstall> 12 <IntroInstall Type="post" Title="Thank you">New Ticket Wizard SeTIC Template module installed successfully!</IntroInstall>
12 <BuildDate>?</BuildDate> 13 <BuildDate>?</BuildDate>
13 <BuildHost>?</BuildHost> 14 <BuildHost>?</BuildHost>
@@ -15,6 +16,5 @@ @@ -15,6 +16,5 @@
15 <File Permission="644" Location="Kernel/Output/HTML/Templates/Standard/CustomerFooterNTWSeTIC.tt"></File> 16 <File Permission="644" Location="Kernel/Output/HTML/Templates/Standard/CustomerFooterNTWSeTIC.tt"></File>
16 <File Permission="644" Location="Kernel/Output/HTML/Templates/Standard/CustomerHeaderNTWSeTIC.tt"></File> 17 <File Permission="644" Location="Kernel/Output/HTML/Templates/Standard/CustomerHeaderNTWSeTIC.tt"></File>
17 <File Permission="644" Location="Kernel/Output/HTML/Templates/Standard/CustomerHTMLHeadNTWSeTIC.tt"></File> 18 <File Permission="644" Location="Kernel/Output/HTML/Templates/Standard/CustomerHTMLHeadNTWSeTIC.tt"></File>
18 - <File Permission="644" Location="var/httpd/htdocs/skins/Customer/default/images/new-ticket-wizard/panel_hd_bg_setic.png"></File>  
19 </Filelist> 19 </Filelist>
20 </otrs_package> 20 </otrs_package>
NewTicketWizardUFSC.sopm
  Diff comments   View file @c4409cd
1 <?xml version="1.0" encoding="utf-8" ?> 1 <?xml version="1.0" encoding="utf-8" ?>
2 <otrs_package version="1.0"> 2 <otrs_package version="1.0">
3 <Name>NewTicketWizardUFSC</Name> 3 <Name>NewTicketWizardUFSC</Name>
4 - <Version>1.1.0</Version> 4 + <Version>1.1.1</Version>
5 <Framework>5.0.x</Framework> 5 <Framework>5.0.x</Framework>
6 <Vendor>SeTIC</Vendor> 6 <Vendor>SeTIC</Vendor>
7 <URL>http://www.setic.ufsc.br</URL> 7 <URL>http://www.setic.ufsc.br</URL>
@@ -10,6 +10,7 @@ @@ -10,6 +10,7 @@
10 <ChangeLog version="1.0.0">First version</ChangeLog> 10 <ChangeLog version="1.0.0">First version</ChangeLog>
11 <ChangeLog version="1.0.1">Fix for footer</ChangeLog> 11 <ChangeLog version="1.0.1">Fix for footer</ChangeLog>
12 <ChangeLog version="1.1.0">Changes for OTRS 5.0.x</ChangeLog> 12 <ChangeLog version="1.1.0">Changes for OTRS 5.0.x</ChangeLog>
  13 + <ChangeLog version="1.1.1">Media separation</ChangeLog>
13 <IntroInstall Type="post" Title="Thank you">New Ticket Wizard UFSC Template module installed successfully!</IntroInstall> 14 <IntroInstall Type="post" Title="Thank you">New Ticket Wizard UFSC Template module installed successfully!</IntroInstall>
14 <BuildDate>?</BuildDate> 15 <BuildDate>?</BuildDate>
15 <BuildHost>?</BuildHost> 16 <BuildHost>?</BuildHost>
@@ -17,6 +18,5 @@ @@ -17,6 +18,5 @@
17 <File Permission="644" Location="Kernel/Output/HTML/Templates/Standard/CustomerFooterNTWUFSC.tt"></File> 18 <File Permission="644" Location="Kernel/Output/HTML/Templates/Standard/CustomerFooterNTWUFSC.tt"></File>
18 <File Permission="644" Location="Kernel/Output/HTML/Templates/Standard/CustomerHeaderNTWUFSC.tt"></File> 19 <File Permission="644" Location="Kernel/Output/HTML/Templates/Standard/CustomerHeaderNTWUFSC.tt"></File>
19 <File Permission="644" Location="Kernel/Output/HTML/Templates/Standard/CustomerHTMLHeadNTWUFSC.tt"></File> 20 <File Permission="644" Location="Kernel/Output/HTML/Templates/Standard/CustomerHTMLHeadNTWUFSC.tt"></File>
20 - <File Permission="644" Location="var/httpd/htdocs/skins/Customer/default/images/new-ticket-wizard/panel_hd_bg.png"></File>  
21 </Filelist> 21 </Filelist>
22 -</otrs_package>  
23 \ No newline at end of file 22 \ No newline at end of file
  23 +</otrs_package>
var/httpd/htdocs/js/thirdparty/alpaca/alpaca-full.min.js
  Diff comments   View file @c4409cd
@@ -16770,6 +16770,10 @@ this[&quot;HandlebarsPrecompiled&quot;][&quot;web-edit&quot;][&quot;wizard&quot;] = Handlebars.template({&quot;1&quot;:f @@ -16770,6 +16770,10 @@ this[&quot;HandlebarsPrecompiled&quot;][&quot;web-edit&quot;][&quot;wizard&quot;] = Handlebars.template({&quot;1&quot;:f
16770 { 16770 {
16771 delete settings.nonSelectedText; 16771 delete settings.nonSelectedText;
16772 } 16772 }
  16773 +
  16774 + if (self.options.control_width) {
  16775 + settings.floatWidth = self.options.control_width;
  16776 + }
16773 16777
16774 $(self.getControlEl()).SumoSelect(settings); 16778 $(self.getControlEl()).SumoSelect(settings);
16775 } 16779 }
var/httpd/htdocs/js/thirdparty/alpaca/jquery.sumoselect.js
  Diff comments   View file @c4409cd
@@ -21,7 +21,7 @@ @@ -21,7 +21,7 @@
21 placeholder: 'Escolha', // Dont change it here. 21 placeholder: 'Escolha', // Dont change it here.
22 csvDispCount: 3, // display no. of items in multiselect. 0 to display all. 22 csvDispCount: 3, // display no. of items in multiselect. 0 to display all.
23 captionFormat:'{0} Selected', // format of caption text. you can set your locale. 23 captionFormat:'{0} Selected', // format of caption text. you can set your locale.
24 - floatWidth: 400, // Screen width of device at which the list is rendered in floating popup fashion. 24 + floatWidth: 0, // Screen width of device at which the list is rendered in floating popup fashion.
25 forceCustomRendering: false, // force the custom modal on all devices below floatWidth resolution. 25 forceCustomRendering: false, // force the custom modal on all devices below floatWidth resolution.
26 nativeOnDevice: ['Android', 'BlackBerry', 'iPhone', 'iPad', 'iPod', 'Opera Mini', 'IEMobile', 'Silk'], // 26 nativeOnDevice: ['Android', 'BlackBerry', 'iPhone', 'iPad', 'iPod', 'Opera Mini', 'IEMobile', 'Silk'], //
27 outputAsCSV: false, // true to POST data as csv ( false for Html control array ie. deafault select ) 27 outputAsCSV: false, // true to POST data as csv ( false for Html control array ie. deafault select )
@@ -56,7 +56,7 @@ @@ -56,7 +56,7 @@
56 O.E.wrap('<div class="SumoSelect" tabindex="0">'); 56 O.E.wrap('<div class="SumoSelect" tabindex="0">');
57 O.select = O.E.parent(); 57 O.select = O.E.parent();
58 O.caption = $('<span></span>'); 58 O.caption = $('<span></span>');
59 - O.CaptionCont = $('<p class="CaptionCont"><label><i></i></label></p>').addClass('SlectBox').attr('style', O.E.attr('style')).prepend(O.caption); 59 + O.CaptionCont = $('<p class="CaptionCont"><label><i></i></label></p>').addClass('SlectBox').attr('style', O.E.attr('style')).prepend(O.caption);;
60 O.select.append(O.CaptionCont); 60 O.select.append(O.CaptionCont);
61 61
62 if(O.E.attr('disabled')) 62 if(O.E.attr('disabled'))
@@ -113,7 +113,11 @@ @@ -113,7 +113,11 @@
113 113
114 if(!opt.attr('value'))opt.attr('value',opt.val()); 114 if(!opt.attr('value'))opt.attr('value',opt.val());
115 115
116 - li = $('<li data-val="' + opt.val() + '"><label>' + opt.text() + '</label></li>'); 116 + if (settings && settings.floatWidth) {
  117 + li = $('<li data-val="' + opt.val() + '"><label style="width: ' + settings.floatWidth + '">' + opt.text() + '</label></li>');
  118 + } else
  119 + li = $('<li data-val="' + opt.val() + '"><label>' + opt.text() + '</label></li>');
  120 +
117 if (O.is_multi) li.prepend('<span><i></i></span>'); 121 if (O.is_multi) li.prepend('<span><i></i></span>');
118 122
119 if (opt[0].disabled) 123 if (opt[0].disabled)
@@ -448,13 +452,16 @@ @@ -448,13 +452,16 @@
448 var O = this; 452 var O = this;
449 //called on init and also on resize. 453 //called on init and also on resize.
450 //O.is_floating = true if window width is < specified float width 454 //O.is_floating = true if window width is < specified float width
451 - O.is_floating = $(window).width() <= settings.floatWidth; 455 + O.is_floating = (settings.floatWidth);
452 456
453 //set class isFloating 457 //set class isFloating
454 O.optDiv.toggleClass('isFloating', O.is_floating); 458 O.optDiv.toggleClass('isFloating', O.is_floating);
455 459
456 //remove height if not floating 460 //remove height if not floating
457 if (!O.is_floating) O.optDiv.css('height', ''); 461 if (!O.is_floating) O.optDiv.css('height', '');
  462 +
  463 + //set width if is floating
  464 + if (O.is_floating) O.optDiv.css('width', settings.floatWidth);
458 465
459 //toggle class according to okCancelInMulti flag only when it is not floating 466 //toggle class according to okCancelInMulti flag only when it is not floating
460 O.optDiv.toggleClass('okCancelInMulti', settings.okCancelInMulti && !O.is_floating); 467 O.optDiv.toggleClass('okCancelInMulti', settings.okCancelInMulti && !O.is_floating);
var/httpd/htdocs/skins/Customer/default/images/new-ticket-wizard/panel_hd_bg.png
View file @ab4402e

337 Bytes
var/httpd/htdocs/skins/Customer/default/images/new-ticket-wizard/panel_hd_bg_setic.png
View file @ab4402e

337 Bytes