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

(-)a/C4/Labels/Label.pm (-3 / +3 lines)
Lines 273-279 sub _BIB { Link Here
273
273
274
sub _BAR {
274
sub _BAR {
275
    my $self = shift;
275
    my $self = shift;
276
    my $barcode_llx = $self->{'llx'} + $self->{'left_text_margin'};     # this places the bottom left of the barcode the left text margin distance to right of the the left edge of the label ($llx)
276
    my $barcode_llx = $self->{'llx'} + $self->{'left_text_margin'};     # this places the bottom left of the barcode the left text margin distance to right of the left edge of the label ($llx)
277
    my $barcode_lly = $self->{'lly'} + $self->{'top_text_margin'};      # this places the bottom left of the barcode the top text margin distance above the bottom of the label ($lly)
277
    my $barcode_lly = $self->{'lly'} + $self->{'top_text_margin'};      # this places the bottom left of the barcode the top text margin distance above the bottom of the label ($lly)
278
    my $barcode_width = 0.8 * $self->{'width'};                         # this scales the barcode width to 80% of the label width
278
    my $barcode_width = 0.8 * $self->{'width'};                         # this scales the barcode width to 80% of the label width
279
    my $barcode_y_scale_factor = 0.01 * $self->{'height'};              # this scales the barcode height to 10% of the label height
279
    my $barcode_y_scale_factor = 0.01 * $self->{'height'};              # this scales the barcode height to 10% of the label height
Lines 282-288 sub _BAR { Link Here
282
282
283
sub _BIBBAR {
283
sub _BIBBAR {
284
    my $self = shift;
284
    my $self = shift;
285
    my $barcode_llx = $self->{'llx'} + $self->{'left_text_margin'};     # this places the bottom left of the barcode the left text margin distance to right of the the left edge of the label ($self->{'llx'})
285
    my $barcode_llx = $self->{'llx'} + $self->{'left_text_margin'};     # this places the bottom left of the barcode the left text margin distance to right of the left edge of the label ($self->{'llx'})
286
    my $barcode_lly = $self->{'lly'} + $self->{'top_text_margin'};      # this places the bottom left of the barcode the top text margin distance above the bottom of the label ($lly)
286
    my $barcode_lly = $self->{'lly'} + $self->{'top_text_margin'};      # this places the bottom left of the barcode the top text margin distance above the bottom of the label ($lly)
287
    my $barcode_width = 0.8 * $self->{'width'};                         # this scales the barcode width to 80% of the label width
287
    my $barcode_width = 0.8 * $self->{'width'};                         # this scales the barcode width to 80% of the label width
288
    my $barcode_y_scale_factor = 0.01 * $self->{'height'};              # this scales the barcode height to 10% of the label height
288
    my $barcode_y_scale_factor = 0.01 * $self->{'height'};              # this scales the barcode height to 10% of the label height
Lines 294-300 sub _BIBBAR { Link Here
294
294
295
sub _BARBIB {
295
sub _BARBIB {
296
    my $self = shift;
296
    my $self = shift;
297
    my $barcode_llx = $self->{'llx'} + $self->{'left_text_margin'};                             # this places the bottom left of the barcode the left text margin distance to right of the the left edge of the label ($self->{'llx'})
297
    my $barcode_llx = $self->{'llx'} + $self->{'left_text_margin'};                             # this places the bottom left of the barcode the left text margin distance to right of the left edge of the label ($self->{'llx'})
298
    my $barcode_lly = ($self->{'lly'} + $self->{'height'}) - $self->{'top_text_margin'};        # this places the bottom left of the barcode the top text margin distance below the top of the label ($self->{'lly'})
298
    my $barcode_lly = ($self->{'lly'} + $self->{'height'}) - $self->{'top_text_margin'};        # this places the bottom left of the barcode the top text margin distance below the top of the label ($self->{'lly'})
299
    my $barcode_width = 0.8 * $self->{'width'};                                                 # this scales the barcode width to 80% of the label width
299
    my $barcode_width = 0.8 * $self->{'width'};                                                 # this scales the barcode width to 80% of the label width
300
    my $barcode_y_scale_factor = 0.01 * $self->{'height'};                                      # this scales the barcode height to 10% of the label height
300
    my $barcode_y_scale_factor = 0.01 * $self->{'height'};                                      # this scales the barcode height to 10% of the label height
(-)a/C4/Record.pm (-1 / +1 lines)
Lines 398-404 sub marcrecord2csv { Link Here
398
    # Getting the marcfields as an array
398
    # Getting the marcfields as an array
399
    my @marcfieldsarray = split('\|', $marcfieldslist);
399
    my @marcfieldsarray = split('\|', $marcfieldslist);
400
400
401
   # Separating the marcfields from the the user-supplied headers
401
   # Separating the marcfields from the user-supplied headers
402
    my @marcfields;
402
    my @marcfields;
403
    foreach (@marcfieldsarray) {
403
    foreach (@marcfieldsarray) {
404
        my @result = split('=', $_);
404
        my @result = split('=', $_);
(-)a/etc/zebradb/ccl.properties (-1 / +1 lines)
Lines 831-837 Title-uniform-heading 1=Title-uniform-heading Link Here
831
Title-uniform-see 1=Title-uniform-see
831
Title-uniform-see 1=Title-uniform-see
832
Title-uniform-seealso 1=Title-uniform-seealso
832
Title-uniform-seealso 1=Title-uniform-seealso
833
833
834
#Authority-number           Koha-Auth-Number  The identifier of the the authority
834
#Authority-number           Koha-Auth-Number  The identifier of the authority
835
#                           record, stored in 001 in the authority record, and $9/$0 in the
835
#                           record, stored in 001 in the authority record, and $9/$0 in the
836
#                           field that record is linked to in the bib record
836
#                           field that record is linked to in the bib record
837
Authority-Number 1=Koha-Auth-Number
837
Authority-Number 1=Koha-Auth-Number
(-)a/installer/data/mysql/kohastructure.sql (-2 / +2 lines)
Lines 1393-1399 CREATE TABLE `old_reserves` ( -- this table holds all holds/reserves that have b Link Here
1393
  `cancellationdate` date default NULL, -- the date this hold was cancelled
1393
  `cancellationdate` date default NULL, -- the date this hold was cancelled
1394
  `reservenotes` mediumtext, -- notes related to this hold
1394
  `reservenotes` mediumtext, -- notes related to this hold
1395
  `priority` smallint(6) default NULL, -- where in the queue the patron sits
1395
  `priority` smallint(6) default NULL, -- where in the queue the patron sits
1396
  `found` varchar(1) default NULL, -- a one letter code defining what the the status is of the hold is after it has been confirmed
1396
  `found` varchar(1) default NULL, -- a one letter code defining what the status is of the hold is after it has been confirmed
1397
  `timestamp` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP, -- the date and time this hold was last updated
1397
  `timestamp` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP, -- the date and time this hold was last updated
1398
  `itemnumber` int(11) default NULL, -- foreign key from the items table defining the specific item the patron has placed on hold or the item this hold was filled with
1398
  `itemnumber` int(11) default NULL, -- foreign key from the items table defining the specific item the patron has placed on hold or the item this hold was filled with
1399
  `waitingdate` date default NULL, -- the date the item was marked as waiting for the patron at the library
1399
  `waitingdate` date default NULL, -- the date the item was marked as waiting for the patron at the library
Lines 1568-1574 CREATE TABLE `reserves` ( -- information related to holds/reserves in Koha Link Here
1568
  `cancellationdate` date default NULL, -- the date this hold was cancelled
1568
  `cancellationdate` date default NULL, -- the date this hold was cancelled
1569
  `reservenotes` mediumtext, -- notes related to this hold
1569
  `reservenotes` mediumtext, -- notes related to this hold
1570
  `priority` smallint(6) default NULL, -- where in the queue the patron sits
1570
  `priority` smallint(6) default NULL, -- where in the queue the patron sits
1571
  `found` varchar(1) default NULL, -- a one letter code defining what the the status is of the hold is after it has been confirmed
1571
  `found` varchar(1) default NULL, -- a one letter code defining what the status is of the hold is after it has been confirmed
1572
  `timestamp` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP, -- the date and time this hold was last updated
1572
  `timestamp` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP, -- the date and time this hold was last updated
1573
  `itemnumber` int(11) default NULL, -- foreign key from the items table defining the specific item the patron has placed on hold or the item this hold was filled with
1573
  `itemnumber` int(11) default NULL, -- foreign key from the items table defining the specific item the patron has placed on hold or the item this hold was filled with
1574
  `waitingdate` date default NULL, -- the date the item was marked as waiting for the patron at the library
1574
  `waitingdate` date default NULL, -- the date the item was marked as waiting for the patron at the library
(-)a/koha-tmpl/intranet-tmpl/prog/en/js/tinymce/changelog (-2 / +2 lines)
Lines 243-249 Version 2.0.6 (2006-05-03) Link Here
243
	Added new CSS style properties support, this was as a plugin called style.
243
	Added new CSS style properties support, this was as a plugin called style.
244
	Fixed bug where TinyMCE was reporting a warning when inserting a image while running on HTTPS.
244
	Fixed bug where TinyMCE was reporting a warning when inserting a image while running on HTTPS.
245
	Fixed bug where pressing the browser back button after submit removed empty paragraphs in MSIE.
245
	Fixed bug where pressing the browser back button after submit removed empty paragraphs in MSIE.
246
	Fixed bug where links the the same page as the editor page was converted into a /.
246
	Fixed bug where links the same page as the editor page was converted into a /.
247
	Fixed bug where the getSelectedHTML method was returning undefined when selecting controls in MSIE.
247
	Fixed bug where the getSelectedHTML method was returning undefined when selecting controls in MSIE.
248
	Fixed bug with unterminated string literal errors where reported in some browsers.
248
	Fixed bug with unterminated string literal errors where reported in some browsers.
249
	Fixed bug where src and href where converted into xsrc and xhref in text.
249
	Fixed bug where src and href where converted into xsrc and xhref in text.
Lines 728-734 Version 1.45 RC1 (2005-05-27) Link Here
728
	Fixed so the contextmenu plugin uses images from the configurated theme instead of the advanced theme.
728
	Fixed so the contextmenu plugin uses images from the configurated theme instead of the advanced theme.
729
	Fixed so the external_link_list_url/external_image_list_url options can use relative or absolute path.
729
	Fixed so the external_link_list_url/external_image_list_url options can use relative or absolute path.
730
	Fixed so the external_link_list_url/external_image_list_url has a random query parameter to prevent it from cache.
730
	Fixed so the external_link_list_url/external_image_list_url has a random query parameter to prevent it from cache.
731
	Added new mceInsertRawHTML command, this inserts raw as it is HTML code in the the selected position.
731
	Added new mceInsertRawHTML command, this inserts raw as it is HTML code in the selected position.
732
	Added paste plain text plugin contributed by Ryan Demmer, converted it into a paste plugin.
732
	Added paste plain text plugin contributed by Ryan Demmer, converted it into a paste plugin.
733
	Added updated paste plugin contributed by speednet, includes paste directly feature for MSIE.
733
	Added updated paste plugin contributed by speednet, includes paste directly feature for MSIE.
734
	Added split/merge table cells support, to table plugin and context menus.
734
	Added split/merge table cells support, to table plugin and context menus.
(-)a/koha-tmpl/intranet-tmpl/prog/en/js/tinymce/jscripts/tiny_mce/themes/advanced/css/editor_content.css (-1 / +1 lines)
Lines 1-5 Link Here
1
/* This file contains the CSS data for the editable area(iframe) of TinyMCE */
1
/* This file contains the CSS data for the editable area(iframe) of TinyMCE */
2
/* You can extend this CSS by adding your own CSS file with the the content_css option */
2
/* You can extend this CSS by adding your own CSS file with the content_css option */
3
3
4
body, td, pre {
4
body, td, pre {
5
	font-family: Verdana, Arial, Helvetica, sans-serif;
5
	font-family: Verdana, Arial, Helvetica, sans-serif;
(-)a/koha-tmpl/intranet-tmpl/prog/en/lib/yui/calendar/calendar-debug.js (-1 / +1 lines)
Lines 2446-2452 Calendar.prototype = { Link Here
2446
        * </p>
2446
        * </p>
2447
        * <p>
2447
        * <p>
2448
        * This property can also be set to an object literal containing configuration properties for the CalendarNavigator UI.
2448
        * This property can also be set to an object literal containing configuration properties for the CalendarNavigator UI.
2449
        * The configuration object expects the the following case-sensitive properties, with the "strings" property being a nested object.
2449
        * The configuration object expects the following case-sensitive properties, with the "strings" property being a nested object.
2450
        * Any properties which are not provided will use the default values (defined in the CalendarNavigator class).
2450
        * Any properties which are not provided will use the default values (defined in the CalendarNavigator class).
2451
        * </p>
2451
        * </p>
2452
        * <dl>
2452
        * <dl>
(-)a/koha-tmpl/intranet-tmpl/prog/en/lib/yui/calendar/calendar.js (-1 / +1 lines)
Lines 2436-2442 Calendar.prototype = { Link Here
2436
        * </p>
2436
        * </p>
2437
        * <p>
2437
        * <p>
2438
        * This property can also be set to an object literal containing configuration properties for the CalendarNavigator UI.
2438
        * This property can also be set to an object literal containing configuration properties for the CalendarNavigator UI.
2439
        * The configuration object expects the the following case-sensitive properties, with the "strings" property being a nested object.
2439
        * The configuration object expects the following case-sensitive properties, with the "strings" property being a nested object.
2440
        * Any properties which are not provided will use the default values (defined in the CalendarNavigator class).
2440
        * Any properties which are not provided will use the default values (defined in the CalendarNavigator class).
2441
        * </p>
2441
        * </p>
2442
        * <dl>
2442
        * <dl>
(-)a/koha-tmpl/intranet-tmpl/prog/en/lib/yui/dragdrop/dragdrop-debug.js (-1 / +1 lines)
Lines 245-251 YAHOO.util.DragDropMgr = function() { Link Here
245
        locked: false,
245
        locked: false,
246
246
247
        /**
247
        /**
248
         * Provides additional information about the the current set of
248
         * Provides additional information about the current set of
249
         * interactions.  Can be accessed from the event handlers. It
249
         * interactions.  Can be accessed from the event handlers. It
250
         * contains the following properties:
250
         * contains the following properties:
251
         *
251
         *
(-)a/koha-tmpl/intranet-tmpl/prog/en/lib/yui/dragdrop/dragdrop.js (-1 / +1 lines)
Lines 241-247 YAHOO.util.DragDropMgr = function() { Link Here
241
        locked: false,
241
        locked: false,
242
242
243
        /**
243
        /**
244
         * Provides additional information about the the current set of
244
         * Provides additional information about the current set of
245
         * interactions.  Can be accessed from the event handlers. It
245
         * interactions.  Can be accessed from the event handlers. It
246
         * contains the following properties:
246
         * contains the following properties:
247
         *
247
         *
(-)a/koha-tmpl/intranet-tmpl/prog/en/lib/yui/editor/editor-debug.js (-1 / +1 lines)
Lines 953-959 var Dom = YAHOO.util.Dom, Link Here
953
953
954
            /**
954
            /**
955
            * @attribute collapse
955
            * @attribute collapse
956
            * @description Boolean indicating if the the titlebar should have a collapse button.
956
            * @description Boolean indicating if the titlebar should have a collapse button.
957
            * The collapse button will not remove the toolbar, it will minimize it to the titlebar
957
            * The collapse button will not remove the toolbar, it will minimize it to the titlebar
958
            * @default false
958
            * @default false
959
            * @type Boolean
959
            * @type Boolean
(-)a/koha-tmpl/intranet-tmpl/prog/en/lib/yui/editor/editor.js (-1 / +1 lines)
Lines 944-950 var Dom = YAHOO.util.Dom, Link Here
944
944
945
            /**
945
            /**
946
            * @attribute collapse
946
            * @attribute collapse
947
            * @description Boolean indicating if the the titlebar should have a collapse button.
947
            * @description Boolean indicating if the titlebar should have a collapse button.
948
            * The collapse button will not remove the toolbar, it will minimize it to the titlebar
948
            * The collapse button will not remove the toolbar, it will minimize it to the titlebar
949
            * @default false
949
            * @default false
950
            * @type Boolean
950
            * @type Boolean
(-)a/koha-tmpl/intranet-tmpl/prog/en/lib/yui/editor/simpleeditor-debug.js (-1 / +1 lines)
Lines 953-959 var Dom = YAHOO.util.Dom, Link Here
953
953
954
            /**
954
            /**
955
            * @attribute collapse
955
            * @attribute collapse
956
            * @description Boolean indicating if the the titlebar should have a collapse button.
956
            * @description Boolean indicating if the titlebar should have a collapse button.
957
            * The collapse button will not remove the toolbar, it will minimize it to the titlebar
957
            * The collapse button will not remove the toolbar, it will minimize it to the titlebar
958
            * @default false
958
            * @default false
959
            * @type Boolean
959
            * @type Boolean
(-)a/koha-tmpl/intranet-tmpl/prog/en/lib/yui/editor/simpleeditor.js (-1 / +1 lines)
Lines 944-950 var Dom = YAHOO.util.Dom, Link Here
944
944
945
            /**
945
            /**
946
            * @attribute collapse
946
            * @attribute collapse
947
            * @description Boolean indicating if the the titlebar should have a collapse button.
947
            * @description Boolean indicating if the titlebar should have a collapse button.
948
            * The collapse button will not remove the toolbar, it will minimize it to the titlebar
948
            * The collapse button will not remove the toolbar, it will minimize it to the titlebar
949
            * @default false
949
            * @default false
950
            * @type Boolean
950
            * @type Boolean
(-)a/koha-tmpl/intranet-tmpl/prog/en/lib/yui/get/get-debug.js (-1 / +1 lines)
Lines 562-568 YAHOO.util.Get = function() { Link Here
562
        TIMEOUT: 2000,
562
        TIMEOUT: 2000,
563
        
563
        
564
        /**
564
        /**
565
         * Called by the the helper for detecting script load in Safari
565
         * Called by the helper for detecting script load in Safari
566
         * @method _finalize
566
         * @method _finalize
567
         * @param id {string} the transaction id
567
         * @param id {string} the transaction id
568
         * @private
568
         * @private
(-)a/koha-tmpl/intranet-tmpl/prog/en/lib/yui/get/get.js (-1 / +1 lines)
Lines 549-555 YAHOO.util.Get = function() { Link Here
549
        TIMEOUT: 2000,
549
        TIMEOUT: 2000,
550
        
550
        
551
        /**
551
        /**
552
         * Called by the the helper for detecting script load in Safari
552
         * Called by the helper for detecting script load in Safari
553
         * @method _finalize
553
         * @method _finalize
554
         * @param id {string} the transaction id
554
         * @param id {string} the transaction id
555
         * @private
555
         * @private
(-)a/koha-tmpl/intranet-tmpl/prog/en/lib/yui/menu/menu-debug.js (-2 / +2 lines)
Lines 2385-2391 _subscribeToItemEvents: function (p_oItem) { Link Here
2385
2385
2386
/**
2386
/**
2387
* @method _onVisibleChange
2387
* @method _onVisibleChange
2388
* @description Change event handler for the the menu's "visible" configuration
2388
* @description Change event handler for the menu's "visible" configuration
2389
* property.
2389
* property.
2390
* @private
2390
* @private
2391
* @param {String} p_sType String representing the name of the event that 
2391
* @param {String} p_sType String representing the name of the event that 
Lines 4852-4858 _setScrollHeight: function (p_nScrollHeight) { Link Here
4852
	
4852
	
4853
4853
4854
			/*
4854
			/*
4855
				Only clear the the "width" configuration property if it was set the 
4855
				Only clear the "width" configuration property if it was set the 
4856
				"_setScrollHeight" method and wasn't changed by some other means after it was set.
4856
				"_setScrollHeight" method and wasn't changed by some other means after it was set.
4857
			*/	
4857
			*/	
4858
	
4858
	
(-)a/koha-tmpl/intranet-tmpl/prog/en/lib/yui/menu/menu.js (-2 / +2 lines)
Lines 2350-2356 _subscribeToItemEvents: function (p_oItem) { Link Here
2350
2350
2351
/**
2351
/**
2352
* @method _onVisibleChange
2352
* @method _onVisibleChange
2353
* @description Change event handler for the the menu's "visible" configuration
2353
* @description Change event handler for the menu's "visible" configuration
2354
* property.
2354
* property.
2355
* @private
2355
* @private
2356
* @param {String} p_sType String representing the name of the event that 
2356
* @param {String} p_sType String representing the name of the event that 
Lines 4811-4817 _setScrollHeight: function (p_nScrollHeight) { Link Here
4811
	
4811
	
4812
4812
4813
			/*
4813
			/*
4814
				Only clear the the "width" configuration property if it was set the 
4814
				Only clear the "width" configuration property if it was set the 
4815
				"_setScrollHeight" method and wasn't changed by some other means after it was set.
4815
				"_setScrollHeight" method and wasn't changed by some other means after it was set.
4816
			*/	
4816
			*/	
4817
	
4817
	
(-)a/koha-tmpl/intranet-tmpl/prog/en/lib/yui/yahoo/yahoo-debug.js (-1 / +1 lines)
Lines 128-134 YAHOO.namespace = function() { Link Here
128
 * @param  {String}  cat  The log category for the message.  Default
128
 * @param  {String}  cat  The log category for the message.  Default
129
 *                        categories are "info", "warn", "error", time".
129
 *                        categories are "info", "warn", "error", time".
130
 *                        Custom categories can be used as well. (opt)
130
 *                        Custom categories can be used as well. (opt)
131
 * @param  {String}  src  The source of the the message (opt)
131
 * @param  {String}  src  The source of the message (opt)
132
 * @return {Boolean}      True if the log operation was successful.
132
 * @return {Boolean}      True if the log operation was successful.
133
 */
133
 */
134
YAHOO.log = function(msg, cat, src) {
134
YAHOO.log = function(msg, cat, src) {
(-)a/koha-tmpl/intranet-tmpl/prog/en/lib/yui/yahoo/yahoo.js (-1 / +1 lines)
Lines 128-134 YAHOO.namespace = function() { Link Here
128
 * @param  {String}  cat  The log category for the message.  Default
128
 * @param  {String}  cat  The log category for the message.  Default
129
 *                        categories are "info", "warn", "error", time".
129
 *                        categories are "info", "warn", "error", time".
130
 *                        Custom categories can be used as well. (opt)
130
 *                        Custom categories can be used as well. (opt)
131
 * @param  {String}  src  The source of the the message (opt)
131
 * @param  {String}  src  The source of the message (opt)
132
 * @return {Boolean}      True if the log operation was successful.
132
 * @return {Boolean}      True if the log operation was successful.
133
 */
133
 */
134
YAHOO.log = function(msg, cat, src) {
134
YAHOO.log = function(msg, cat, src) {
(-)a/koha-tmpl/intranet-tmpl/prog/en/lib/yui/yuiloader/yuiloader-debug.js (-3 / +3 lines)
Lines 128-134 YAHOO.namespace = function() { Link Here
128
 * @param  {String}  cat  The log category for the message.  Default
128
 * @param  {String}  cat  The log category for the message.  Default
129
 *                        categories are "info", "warn", "error", time".
129
 *                        categories are "info", "warn", "error", time".
130
 *                        Custom categories can be used as well. (opt)
130
 *                        Custom categories can be used as well. (opt)
131
 * @param  {String}  src  The source of the the message (opt)
131
 * @param  {String}  src  The source of the message (opt)
132
 * @return {Boolean}      True if the log operation was successful.
132
 * @return {Boolean}      True if the log operation was successful.
133
 */
133
 */
134
YAHOO.log = function(msg, cat, src) {
134
YAHOO.log = function(msg, cat, src) {
Lines 1618-1624 YAHOO.util.Get = function() { Link Here
1618
        TIMEOUT: 2000,
1618
        TIMEOUT: 2000,
1619
        
1619
        
1620
        /**
1620
        /**
1621
         * Called by the the helper for detecting script load in Safari
1621
         * Called by the helper for detecting script load in Safari
1622
         * @method _finalize
1622
         * @method _finalize
1623
         * @param id {string} the transaction id
1623
         * @param id {string} the transaction id
1624
         * @private
1624
         * @private
Lines 2462-2468 YAHOO.register("get", YAHOO.util.Get, {version: "2.8.0r4", build: "2449"}); Link Here
2462
        this.comboBase = YUI.info.comboBase;
2462
        this.comboBase = YUI.info.comboBase;
2463
2463
2464
        /**
2464
        /**
2465
         * If configured, YUI will use the the combo handler on the
2465
         * If configured, YUI will use the combo handler on the
2466
         * Yahoo! CDN to pontentially reduce the number of http requests
2466
         * Yahoo! CDN to pontentially reduce the number of http requests
2467
         * required.
2467
         * required.
2468
         * @property combine
2468
         * @property combine
(-)a/koha-tmpl/intranet-tmpl/prog/en/lib/yui/yuiloader/yuiloader.js (-3 / +3 lines)
Lines 128-134 YAHOO.namespace = function() { Link Here
128
 * @param  {String}  cat  The log category for the message.  Default
128
 * @param  {String}  cat  The log category for the message.  Default
129
 *                        categories are "info", "warn", "error", time".
129
 *                        categories are "info", "warn", "error", time".
130
 *                        Custom categories can be used as well. (opt)
130
 *                        Custom categories can be used as well. (opt)
131
 * @param  {String}  src  The source of the the message (opt)
131
 * @param  {String}  src  The source of the message (opt)
132
 * @return {Boolean}      True if the log operation was successful.
132
 * @return {Boolean}      True if the log operation was successful.
133
 */
133
 */
134
YAHOO.log = function(msg, cat, src) {
134
YAHOO.log = function(msg, cat, src) {
Lines 1618-1624 YAHOO.util.Get = function() { Link Here
1618
        TIMEOUT: 2000,
1618
        TIMEOUT: 2000,
1619
        
1619
        
1620
        /**
1620
        /**
1621
         * Called by the the helper for detecting script load in Safari
1621
         * Called by the helper for detecting script load in Safari
1622
         * @method _finalize
1622
         * @method _finalize
1623
         * @param id {string} the transaction id
1623
         * @param id {string} the transaction id
1624
         * @private
1624
         * @private
Lines 2462-2468 YAHOO.register("get", YAHOO.util.Get, {version: "2.8.0r4", build: "2449"}); Link Here
2462
        this.comboBase = YUI.info.comboBase;
2462
        this.comboBase = YUI.info.comboBase;
2463
2463
2464
        /**
2464
        /**
2465
         * If configured, YUI will use the the combo handler on the
2465
         * If configured, YUI will use the combo handler on the
2466
         * Yahoo! CDN to pontentially reduce the number of http requests
2466
         * Yahoo! CDN to pontentially reduce the number of http requests
2467
         * required.
2467
         * required.
2468
         * @property combine
2468
         * @property combine
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/manage-marc-import.tt (-1 / +1 lines)
Lines 40-46 Link Here
40
</li>
40
</li>
41
</ul>
41
</ul>
42
42
43
<p><strong>See the full documentation for the the Managing Staged MARC Records in the <a href="http://manual.koha-community.org/3.6/en/managestaged.html">manual</a> (online).</strong></p>
43
<p><strong>See the full documentation for the Managing Staged MARC Records in the <a href="http://manual.koha-community.org/3.6/en/managestaged.html">manual</a> (online).</strong></p>
44
44
45
[% INCLUDE 'help-bottom.inc' %]
45
[% INCLUDE 'help-bottom.inc' %]
46
46
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/overduerules.tt (-1 / +1 lines)
Lines 41-47 Link Here
41
41
42
<p>Sincerely, Library Staff</p>
42
<p>Sincerely, Library Staff</p>
43
43
44
<p><strong>See the full documentation for the the Overdue Notice/Status Triggers in the <a href="http://manual.koha-community.org/3.6/en/noticetriggers.html">manual</a> (online).</strong></p>
44
<p><strong>See the full documentation for the Overdue Notice/Status Triggers in the <a href="http://manual.koha-community.org/3.6/en/noticetriggers.html">manual</a> (online).</strong></p>
45
45
46
[% INCLUDE 'help-bottom.inc' %]
46
[% INCLUDE 'help-bottom.inc' %]
47
47
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/picture-upload.tt (-2 / +2 lines)
Lines 20-25 Link Here
20
20
21
<p style="color:#990000;">Important: There is a limit of 520K on the size of the picture uploaded and it is recommended that the image be 200x300 pixels, but smaller images will work as well.</p>
21
<p style="color:#990000;">Important: There is a limit of 520K on the size of the picture uploaded and it is recommended that the image be 200x300 pixels, but smaller images will work as well.</p>
22
22
23
<p><strong>See the full documentation for the the Patron Image Uploader in the <a href="http://manual.koha-community.org/3.6/en/uploadpatronimages.html">manual</a> (online).</strong></p>
23
<p><strong>See the full documentation for the Patron Image Uploader in the <a href="http://manual.koha-community.org/3.6/en/uploadpatronimages.html">manual</a> (online).</strong></p>
24
24
25
[% INCLUDE 'help-bottom.inc' %]
25
[% INCLUDE 'help-bottom.inc' %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/scheduler.tt (-3 / +2 lines)
Lines 23-28 Link Here
23
23
24
<p>Task scheduler will not work if the user the web server runs as doesn't have the permission to use it. To find out if the right user has the permissions necessary, check /etc/at.allow to see what users are in it. If you don't have that file, check etc/at.deny. If at.deny exists but is blank, then every user can use it. Talk to your system admin about adding the user to the right place to make the task scheduler work.</p>
24
<p>Task scheduler will not work if the user the web server runs as doesn't have the permission to use it. To find out if the right user has the permissions necessary, check /etc/at.allow to see what users are in it. If you don't have that file, check etc/at.deny. If at.deny exists but is blank, then every user can use it. Talk to your system admin about adding the user to the right place to make the task scheduler work.</p>
25
25
26
<p><strong>See the full documentation for the the Task Scheduler in the <a href="http://manual.koha-community.org/3.6/en/taskscheduler.html">manual</a> (online).</strong></p>
26
<p><strong>See the full documentation for the Task Scheduler in the <a href="http://manual.koha-community.org/3.6/en/taskscheduler.html">manual</a> (online).</strong></p>
27
27
28
[% INCLUDE 'help-bottom.inc' %]
28
[% INCLUDE 'help-bottom.inc' %]
29
- 

Return to bug 7356