Skip to content
This repository was archived by the owner on Sep 10, 2021. It is now read-only.

Commit d11847a

Browse files
author
Jamie Snape
committed
Remove trailing spaces
1 parent 40234c8 commit d11847a

File tree

5 files changed

+55
-55
lines changed

5 files changed

+55
-55
lines changed

core/public/smartoptimizer/config.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
//use this to set file concatenation On or Off
4343
$settings['concatenate'] = true;
4444

45-
//specifies whether to emebed files included in css files using the data URI scheme or not
45+
//specifies whether to emebed files included in css files using the data URI scheme or not
4646
$settings['embed'] = false;
4747
}
4848
else
@@ -56,15 +56,15 @@
5656
//use this to set file concatenation On or Off
5757
$settings['concatenate'] = false;
5858

59-
//specifies whether to emebed files included in css files using the data URI scheme or not
59+
//specifies whether to emebed files included in css files using the data URI scheme or not
6060
$settings['embed'] = false;
6161
}
6262

6363
//base dir (a relative path to the base directory)
6464
$settings['baseDir'] = '../';
6565

6666
//Encoding of your js and css files. FOR THE LOVE OF GOD ONLY USE UTF8
67-
$settings['charSet'] = 'utf-8';
67+
$settings['charSet'] = 'utf-8';
6868

6969
//Show error messages if any error occurs (true or false)
7070
$settings['debug'] = false;
@@ -73,7 +73,7 @@
7373
$settings['compressionLevel'] = 9;
7474

7575
//these types of files will not be gzipped nor minified
76-
$settings['gzipExceptions'] = array('gif','jpeg','jpg','png','swf');
76+
$settings['gzipExceptions'] = array('gif','jpeg','jpg','png','swf');
7777

7878
//separator for files to be concatenated
7979
$settings['separator'] = ',';
@@ -82,7 +82,7 @@
8282
$settings['embedMaxSize'] = 5120; //5KB
8383

8484
//these types of files will not be embedded
85-
$settings['embedExceptions'] = array('htc');
85+
$settings['embedExceptions'] = array('htc');
8686

8787
//to set server-side cache On or Off
8888
$settings['serverCache'] = true;

core/views/element/serversidefilechooser.phtml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -58,15 +58,15 @@
5858
display:none;
5959
background:#000000;
6060
opacity:0.5;
61-
filter:alpha(opacity=90);
62-
position:absolute;
63-
top:0px;
64-
left:0px;
65-
min-width:100%;
66-
min-height:100%;
67-
z-index:100;
68-
}
69-
61+
filter:alpha(opacity=90);
62+
position:absolute;
63+
top:0px;
64+
left:0px;
65+
min-width:100%;
66+
min-height:100%;
67+
z-index:100;
68+
}
69+
7070
.fp-fileTree {
7171
width: <?php echo $this->width?>px;
7272
height: 300px;

core/views/helpers/Dateago.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ function dateago($timestamp)
2727
$component=new DateComponent();
2828
return $component->ago($timestamp);
2929
}
30-
30+
3131

3232
/** Set view*/
3333
public function setView(Zend_View_Interface $view)

core/views/helpers/Userthumbnail.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ class Zend_View_Helper_Userthumbnail
2323
/** translation helper */
2424
function userthumbnail($thumbnail, $id = '')
2525
{
26-
if(empty($thumbnail))
26+
if(empty($thumbnail))
2727
{
2828
echo "<img id='{$id}' class='thumbnailSmall' " .
2929
"src='{$this->view->coreWebroot}/public/images/icons/unknownUser.png'" .

core/views/helpers/serversidefilepicker.phtml

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
* http://www.regular-expressions.info/javascriptexample.html
3131
* @param $fileFilterErrorMsg : Message to display when regular expression is false
3232
* @param $destSelector : jquery selector to insert the filename when user click on 'OK'
33-
*
33+
*
3434
**/
3535

3636
// assign unique identifier to this element
@@ -44,15 +44,15 @@
4444
}
4545
$fp_uuid = Configure::read('filePickerId');
4646

47-
47+
4848
if( ! isset($script) ) $script = $this->webroot . 'admin/filePicker';
4949
if( ! isset($width) ) $width = 400;
5050
if( ! isset($height) ) $height = 400;
5151
if( ! isset($fileFilter) ) $fileFilter = '';
5252
if( ! isset($fileFilterErrorMsg) ) $fileFilterErrorMsg = 'Incorrect file type';
5353
if( ! isset($destSelector) ) $destSelector = 'body>XX'; // default selector return 0 elements
5454
if( ! isset($msg) ) $msg = '';
55-
55+
5656
// Find root:
5757
/*if( strpos( strtolower(PHP_OS), 'win') !== false )
5858
{
@@ -63,43 +63,43 @@
6363
$root = '/';
6464
}*/
6565
$root = '';
66-
66+
6767
?>
6868

6969
<!-- FILE PICKER -->
70-
<link rel="stylesheet" type="text/css" href="<?php echo $this->webroot?>css/jqueryFileTree.css" media="screen" />
70+
<link rel="stylesheet" type="text/css" href="<?php echo $this->webroot?>css/jqueryFileTree.css" media="screen" />
7171
<style>
7272
.fp-container {
73-
}
74-
73+
}
74+
7575
/* The fp-XXX-pannel is the div that gets lighted */
7676
#fp-<?php echo $fp_uuid?>-panel {
77-
display:none;
77+
display:none;
7878
position:fixed;
79-
top:100px;
80-
left:50%;
81-
margin-left:-200px;
82-
width:<?php echo $width?>px;
83-
background:#FFFFFF;
84-
padding:10px 15px 10px 15px;
85-
border:2px solid #CCCCCC;
79+
top:100px;
80+
left:50%;
81+
margin-left:-200px;
82+
width:<?php echo $width?>px;
83+
background:#FFFFFF;
84+
padding:10px 15px 10px 15px;
85+
border:2px solid #CCCCCC;
8686
z-index:1001;
8787
}
88-
89-
/* The fp-XXX-pannel is the div that covers the rest of the page */
90-
#fp-<?php echo $fp_uuid?>-background {
91-
display:none;
92-
background:#000000;
93-
opacity:0.5;
94-
filter:alpha(opacity=90);
95-
position:absolute;
96-
top:0px;
97-
left:0px;
98-
min-width:100%;
99-
min-height:100%;
100-
z-index:1000;
101-
}
10288

89+
/* The fp-XXX-pannel is the div that covers the rest of the page */
90+
#fp-<?php echo $fp_uuid?>-background {
91+
display:none;
92+
background:#000000;
93+
opacity:0.5;
94+
filter:alpha(opacity=90);
95+
position:absolute;
96+
top:0px;
97+
left:0px;
98+
min-width:100%;
99+
min-height:100%;
100+
z-index:1000;
101+
}
102+
103103
.fp-fileTree {
104104
width: <?php echo $width?>px;
105105
height: 300px;
@@ -112,22 +112,22 @@
112112
padding: 5px;
113113
text-align: left;
114114
}
115-
115+
116116
.fp-inputFile {
117117
position: relative;
118118
width: <?php echo $width+5?>px;
119119
}
120-
120+
121121
.fp-inputButton {
122122
position: relative;
123123
float: left;
124124
display: block;
125125
width: 100px;
126126
margin: 3px 40px;
127127
}
128-
128+
129129
.fp-open {
130-
}
130+
}
131131
</style>
132132

133133
<?php if($fp_uuid == 1) {?>
@@ -148,9 +148,9 @@ $(document).ready( function() {
148148

149149
$('#fp-<?php echo $fp_uuid?>-fileTree').fileTree(
150150
{
151-
root: '',
152-
script: '<?php echo $script?>'
153-
},
151+
root: '',
152+
script: '<?php echo $script?>'
153+
},
154154
function(file) {
155155
$("#fp-<?php echo $fp_uuid?>-inputFile").val('<?php echo $root?>' + file);
156156
},
@@ -169,7 +169,7 @@ $(document).ready( function() {
169169
// if destSelector is valid set its value to file
170170
if( $("<?php echo $destSelector?>").length !== 0 )
171171
{
172-
$("<?php echo $destSelector?>").val(file);
172+
$("<?php echo $destSelector?>").val(file);
173173
$("#fp-<?php echo $fp_uuid?>-panel, #fp-<?php echo $fp_uuid?>-background").fadeOut(300);
174174
}
175175
}
@@ -179,15 +179,15 @@ $(document).ready( function() {
179179
}
180180
return false; // important to return false to prevent a form that include
181181
// this element to be submitted when the user just want to
182-
// select a file.
182+
// select a file.
183183
});
184184

185185
//$("#fp-<?php echo $fp_uuid?>-panel").draggable();
186186
});
187187
</script>
188188
<input type="submit" id="fp-<?php echo $fp_uuid?>-open" class="fp-open" value="Choose"></input>
189189
<div id="fp-<?php echo $fp_uuid?>-container" class="fp-container">
190-
190+
191191
<div id="fp-<?php echo $fp_uuid?>-background"></div>
192192
<div id="fp-<?php echo $fp_uuid?>-panel">
193193
<b><?php echo $msg; ?></b>

0 commit comments

Comments
 (0)