View | Details | Raw Unified | Return to bug 38036
Collapse All | Expand All

(-)a/branches/ucs-4.0/ucs-4.0-1/management/univention-management-console-module-ucr/debian/changelog (+6 lines)
 Lines 1-3    Link Here 
1 
univention-management-console-module-ucr (4.1.1-4) unstable; urgency=low
2 

            

            

              3
              
  * Bug #38036: Encode HTML entities in description and tool-tip

            

            

              4
              

            

            

              5
              
 -- Philipp Hahn <hahn@univention.de>  Fri, 13 Mar 2015 11:52:02 +0100

            

            

              6
              

            

        

          1
          
univention-management-console-module-ucr (4.1.1-3) unstable; urgency=medium

          7
          
univention-management-console-module-ucr (4.1.1-3) unstable; urgency=medium

        

        

          2
          

          8
          

        

        

          3
          
  * Bug #37742: fix dialog design for small devices

          9
          
  * Bug #37742: fix dialog design for small devices

        



(-)a/branches/ucs-4.0/ucs-4.0-1/management/univention-management-console-module-ucr/umc/js/ucr.js
      (-4 / +4 lines)




  

    

    

       Lines 35-40
      define([ 
    
  Link Here 
    

  

        

          35
          
	"dojo/_base/array",

          35
          
	"dojo/_base/array",

        

        

          36
          
	"dojo/aspect",

          36
          
	"dojo/aspect",

        

        

          37
          
	"dojo/sniff",

          37
          
	"dojo/sniff",

        

            

              
              
              38
              
	"dojox/html/entities",

            

        

          38
          
	"dijit/Dialog",

          39
          
	"dijit/Dialog",

        

        

          39
          
	"dijit/form/_TextBoxMixin",

          40
          
	"dijit/form/_TextBoxMixin",

        

        

          40
          
	"umc/tools",

          41
          
	"umc/tools",

        

  

    

    

       Lines 52-58
      define([ 
    
  Link Here 
    

  

        

          52
          
	"umc/widgets/Tooltip",

          53
          
	"umc/widgets/Tooltip",

        

        

          53
          
	"umc/i18n!umc/modules/ucr",

          54
          
	"umc/i18n!umc/modules/ucr",

        

        

          54
          
	"xstyle/css!./ucr.css"

          55
          
	"xstyle/css!./ucr.css"

        

          
            

              55
              
], function(declare, lang, kernel, array, aspect, has, Dialog, _TextBoxMixin, tools, dialog, Form, Grid, Module, Page, SearchForm, StandbyMixin, TextBox, Text, HiddenInput, ComboBox, Tooltip, _) {


              56
              
], function(declare, lang, kernel, array, aspect, has, entities, Dialog, _TextBoxMixin, tools, dialog, Form, Grid, Module, Page, SearchForm, StandbyMixin, TextBox, Text, HiddenInput, ComboBox, Tooltip, _) {

            

        

          56
          

          57
          

        

        

          57
          
	var _DetailDialog = declare([Dialog, StandbyMixin], {

          58
          
	var _DetailDialog = declare([Dialog, StandbyMixin], {

        

        

          58
          
		_form: null,

          59
          
		_form: null,

        

  

    

    

       Lines 135-141
      define([ 
    
  Link Here 
    

  

        

          135
          
				if (text) {

          136
          
				if (text) {

        

        

          136
          
					// we have description, update the description field

          137
          
					// we have description, update the description field

        

        

          137
          
					descWidget.set('visible', true);

          138
          
					descWidget.set('visible', true);

        

          
            

              138
              
					descWidget.set('content', '<i>' + text + '</i>');


              139
              
					descWidget.set('content', '<i>' + entities.encode(text) + '</i>');

            

        

          139
          
				}

          140
          
				}

        

        

          140
          
				else {

          141
          
				else {

        

        

          141
          
					// no description -> hide widget and label

          142
          
					// no description -> hide widget and label

        

  

    

    

       Lines 368-374
      define([ 
    
  Link Here 
    

  

        

          368
          
			var item = this._grid.getRowValues(rowIndex);

          369
          
			var item = this._grid.getRowValues(rowIndex);

        

        

          369
          
			if (item.description) {

          370
          
			if (item.description) {

        

        

          370
          
				var tooltip = new Tooltip({

          371
          
				var tooltip = new Tooltip({

        

          
            

              371
              
					label: item.description,


              372
              
					label: entities.encode(item.description),

            

        

          372
          
					connectId: [widget.domNode],

          373
          
					connectId: [widget.domNode],

        

        

          373
          
					position: ['below']

          374
          
					position: ['below']

        

        

          374
          
				});

          375
          
				});

        

            

              375
              
- 

              
              
            






  

  Return to bug 38036