Commit c4409cdeed19712bc2f68876b03ba32ae3343d6f
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
| ... | ... | @@ -10,9 +10,9 @@ |
| 10 | 10 | <div id="footerF" align="center" style="bottom: 10px; width: 100%; margin-top: 18px; margin-bottom: 8px;" class="noPrint"> |
| 11 | 11 | |
| 12 | 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 | 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 | 16 | <br> |
| 17 | 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 | 18 | </div> | ... | ... |
Kernel/Output/HTML/Templates/Standard/CustomerFooterNTWUFSC.tt
| ... | ... | @@ -10,9 +10,9 @@ |
| 10 | 10 | <div id="footerF" align="center" style="bottom: 10px; width: 100%; margin-top: 18px; margin-bottom: 8px;" class="noPrint"> |
| 11 | 11 | |
| 12 | 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 | 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 | 16 | <br> |
| 17 | 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 | 18 | </div> | ... | ... |
Kernel/Output/HTML/Templates/Standard/CustomerHTMLHeadNTWSeTIC.tt
| ... | ... | @@ -112,7 +112,7 @@ |
| 112 | 112 | |
| 113 | 113 | #header { |
| 114 | 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 | 116 | background-position: bottom left; |
| 117 | 117 | padding-left: 30px; |
| 118 | 118 | padding-top: 0px; |
| ... | ... | @@ -161,7 +161,7 @@ body { |
| 161 | 161 | |
| 162 | 162 | |
| 163 | 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 | 165 | background-repeat: repeat-x; |
| 166 | 166 | background-position: 0 50%; |
| 167 | 167 | border: 1px solid #9CABC1; | ... | ... |
Kernel/Output/HTML/Templates/Standard/CustomerHTMLHeadNTWUFSC.tt
| ... | ... | @@ -96,7 +96,7 @@ |
| 96 | 96 | <style type="text/css"> |
| 97 | 97 | #header { |
| 98 | 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 | 100 | background-position: bottom left; |
| 101 | 101 | padding-left: 30px; |
| 102 | 102 | padding-top: 0px; |
| ... | ... | @@ -145,7 +145,7 @@ vertical-align: bottom; |
| 145 | 145 | |
| 146 | 146 | |
| 147 | 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 | 149 | background-repeat: repeat-x; |
| 150 | 150 | background-position: 0 50%; |
| 151 | 151 | border: 1px solid #9CABC1; | ... | ... |
Kernel/Output/HTML/Templates/Standard/CustomerHeaderNTWSeTIC.tt
| ... | ... | @@ -34,7 +34,7 @@ |
| 34 | 34 | </tbody> |
| 35 | 35 | </table> |
| 36 | 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 | 38 | </div> |
| 39 | 39 | |
| 40 | 40 | ... | ... |
Kernel/Output/HTML/Templates/Standard/CustomerHeaderNTWUFSC.tt
| ... | ... | @@ -34,7 +34,7 @@ |
| 34 | 34 | </tr> |
| 35 | 35 | </tbody></table> |
| 36 | 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 | 38 | </div> |
| 39 | 39 | |
| 40 | 40 | <!-- end header --> | ... | ... |
NewTicketWizard.sopm
| 1 | 1 | <?xml version="1.0" encoding="utf-8" ?> |
| 2 | 2 | <otrs_package version="1.0"> |
| 3 | 3 | <Name>NewTicketWizard</Name> |
| 4 | - <Version>2.0.0</Version> | |
| 4 | + <Version>2.0.2</Version> | |
| 5 | 5 | <Framework>5.0.x</Framework> |
| 6 | 6 | <Vendor>SeTIC</Vendor> |
| 7 | 7 | <URL>http://www.setic.ufsc.br</URL> |
| ... | ... | @@ -25,6 +25,8 @@ |
| 25 | 25 | <ChangeLog version="1.9.9">Fix for date fields</ChangeLog> |
| 26 | 26 | <ChangeLog version="1.9.11">Fix for public interface custom properties</ChangeLog> |
| 27 | 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 | 30 | <IntroInstall Type="post" Title="Thank you">New Ticket Wizard module installed successfully!</IntroInstall> |
| 29 | 31 | <BuildDate>?</BuildDate> |
| 30 | 32 | <BuildHost>?</BuildHost> | ... | ... |
NewTicketWizardSeTIC.sopm
| 1 | 1 | <?xml version="1.0" encoding="utf-8" ?> |
| 2 | 2 | <otrs_package version="1.0"> |
| 3 | 3 | <Name>NewTicketWizardSeTIC</Name> |
| 4 | - <Version>1.0.0</Version> | |
| 4 | + <Version>1.0.1</Version> | |
| 5 | 5 | <Framework>5.0.x</Framework> |
| 6 | 6 | <Vendor>SeTIC</Vendor> |
| 7 | 7 | <URL>http://www.setic.ufsc.br</URL> |
| 8 | 8 | <License>GPLv2</License> |
| 9 | 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 | 12 | <IntroInstall Type="post" Title="Thank you">New Ticket Wizard SeTIC Template module installed successfully!</IntroInstall> |
| 12 | 13 | <BuildDate>?</BuildDate> |
| 13 | 14 | <BuildHost>?</BuildHost> |
| ... | ... | @@ -15,6 +16,5 @@ |
| 15 | 16 | <File Permission="644" Location="Kernel/Output/HTML/Templates/Standard/CustomerFooterNTWSeTIC.tt"></File> |
| 16 | 17 | <File Permission="644" Location="Kernel/Output/HTML/Templates/Standard/CustomerHeaderNTWSeTIC.tt"></File> |
| 17 | 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 | 19 | </Filelist> |
| 20 | 20 | </otrs_package> | ... | ... |
NewTicketWizardUFSC.sopm
| 1 | 1 | <?xml version="1.0" encoding="utf-8" ?> |
| 2 | 2 | <otrs_package version="1.0"> |
| 3 | 3 | <Name>NewTicketWizardUFSC</Name> |
| 4 | - <Version>1.1.0</Version> | |
| 4 | + <Version>1.1.1</Version> | |
| 5 | 5 | <Framework>5.0.x</Framework> |
| 6 | 6 | <Vendor>SeTIC</Vendor> |
| 7 | 7 | <URL>http://www.setic.ufsc.br</URL> |
| ... | ... | @@ -10,6 +10,7 @@ |
| 10 | 10 | <ChangeLog version="1.0.0">First version</ChangeLog> |
| 11 | 11 | <ChangeLog version="1.0.1">Fix for footer</ChangeLog> |
| 12 | 12 | <ChangeLog version="1.1.0">Changes for OTRS 5.0.x</ChangeLog> |
| 13 | + <ChangeLog version="1.1.1">Media separation</ChangeLog> | |
| 13 | 14 | <IntroInstall Type="post" Title="Thank you">New Ticket Wizard UFSC Template module installed successfully!</IntroInstall> |
| 14 | 15 | <BuildDate>?</BuildDate> |
| 15 | 16 | <BuildHost>?</BuildHost> |
| ... | ... | @@ -17,6 +18,5 @@ |
| 17 | 18 | <File Permission="644" Location="Kernel/Output/HTML/Templates/Standard/CustomerFooterNTWUFSC.tt"></File> |
| 18 | 19 | <File Permission="644" Location="Kernel/Output/HTML/Templates/Standard/CustomerHeaderNTWUFSC.tt"></File> |
| 19 | 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 | 21 | </Filelist> |
| 22 | -</otrs_package> | |
| 23 | 22 | \ No newline at end of file |
| 23 | +</otrs_package> | ... | ... |
var/httpd/htdocs/js/thirdparty/alpaca/alpaca-full.min.js
| ... | ... | @@ -16770,6 +16770,10 @@ this["HandlebarsPrecompiled"]["web-edit"]["wizard"] = Handlebars.template({"1":f |
| 16770 | 16770 | { |
| 16771 | 16771 | delete settings.nonSelectedText; |
| 16772 | 16772 | } |
| 16773 | + | |
| 16774 | + if (self.options.control_width) { | |
| 16775 | + settings.floatWidth = self.options.control_width; | |
| 16776 | + } | |
| 16773 | 16777 | |
| 16774 | 16778 | $(self.getControlEl()).SumoSelect(settings); |
| 16775 | 16779 | } | ... | ... |
var/httpd/htdocs/js/thirdparty/alpaca/jquery.sumoselect.js
| ... | ... | @@ -21,7 +21,7 @@ |
| 21 | 21 | placeholder: 'Escolha', // Dont change it here. |
| 22 | 22 | csvDispCount: 3, // display no. of items in multiselect. 0 to display all. |
| 23 | 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 | 25 | forceCustomRendering: false, // force the custom modal on all devices below floatWidth resolution. |
| 26 | 26 | nativeOnDevice: ['Android', 'BlackBerry', 'iPhone', 'iPad', 'iPod', 'Opera Mini', 'IEMobile', 'Silk'], // |
| 27 | 27 | outputAsCSV: false, // true to POST data as csv ( false for Html control array ie. deafault select ) |
| ... | ... | @@ -56,7 +56,7 @@ |
| 56 | 56 | O.E.wrap('<div class="SumoSelect" tabindex="0">'); |
| 57 | 57 | O.select = O.E.parent(); |
| 58 | 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 | 60 | O.select.append(O.CaptionCont); |
| 61 | 61 | |
| 62 | 62 | if(O.E.attr('disabled')) |
| ... | ... | @@ -113,7 +113,11 @@ |
| 113 | 113 | |
| 114 | 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 | 121 | if (O.is_multi) li.prepend('<span><i></i></span>'); |
| 118 | 122 | |
| 119 | 123 | if (opt[0].disabled) |
| ... | ... | @@ -448,13 +452,16 @@ |
| 448 | 452 | var O = this; |
| 449 | 453 | //called on init and also on resize. |
| 450 | 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 | 457 | //set class isFloating |
| 454 | 458 | O.optDiv.toggleClass('isFloating', O.is_floating); |
| 455 | 459 | |
| 456 | 460 | //remove height if not floating |
| 457 | 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 | 466 | //toggle class according to okCancelInMulti flag only when it is not floating |
| 460 | 467 | O.optDiv.toggleClass('okCancelInMulti', settings.okCancelInMulti && !O.is_floating); | ... | ... |
var/httpd/htdocs/skins/Customer/default/images/new-ticket-wizard/panel_hd_bg.png
337 Bytes
var/httpd/htdocs/skins/Customer/default/images/new-ticket-wizard/panel_hd_bg_setic.png
337 Bytes