diff options
| -rw-r--r-- | admin/js/users.js | 4 | ||||
| -rw-r--r-- | admin/templates/users.php | 2 | ||||
| -rw-r--r-- | core/css/styles.css | 6 | ||||
| -rw-r--r-- | files/css/files.css | 2 | ||||
| -rw-r--r-- | help/css/help.css | 2 | ||||
| -rw-r--r-- | help/templates/index.php | 4 | ||||
| -rw-r--r-- | settings/css/settings.css | 6 |
7 files changed, 15 insertions, 11 deletions
diff --git a/admin/js/users.js b/admin/js/users.js index 994ce6f6cbd..5a99362726c 100644 --- a/admin/js/users.js +++ b/admin/js/users.js @@ -57,7 +57,7 @@ $(document).ready(function(){ // Add user to table var newrow = '<tr x-uid="'+username+'"><td x-use="username"><div x-use="usernamediv">'+username+'</div></td>'; newrow = newrow+'<td x-use="usergroups"><div x-use="usergroupsdiv">'+groups+'</td>'; - newrow = newrow+'<td><a class="removeuserbutton" href="">remove</a></td></tr>'; + newrow = newrow+'<td><input type="submit" class="removeuserbutton" value="Remove" /></td></tr>'; $("#usertable").append( newrow ); // Clear forms @@ -71,7 +71,7 @@ $(document).ready(function(){ function groupCreated( groupname ){ var newrow = '<tr x-gid="'+groupname+'"><td>' + groupname + '</td>'; - newrow = newrow + '<td><a class="removegroupbutton" href="">remove</a></td></tr>'; + newrow = newrow + '<td><input type="submit" class="removeuserbutton" value="Remove" /></td></tr>'; $("#grouptable").append( newrow ); // Delete form content diff --git a/admin/templates/users.php b/admin/templates/users.php index c16270edbf4..fbb0fe79f39 100644 --- a/admin/templates/users.php +++ b/admin/templates/users.php @@ -56,7 +56,7 @@ <td><?php echo $group["name"] ?></td> <td> <?php if( $group["name"] != "admin" ): ?> - <input type="submit" class="removegroupbutton" value="<?php echo $l->t( 'remove' ); ?>" /> + <input type="submit" class="removegroupbutton" value="<?php echo $l->t( 'Remove' ); ?>" /> <?php else: ?> <?php endif; ?> diff --git a/core/css/styles.css b/core/css/styles.css index a0e67b4bde9..0f05850e265 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -24,15 +24,15 @@ input[type="checkbox"] { width:auto; } #remember_login { margin:.8em .2em 0 1em; } form.searchbox input[type="search"] { position:fixed; font-size:1.2em; top:.3em; right:7em; padding:.2em .5em .2em 1.5em; background:#f8f8f8 url('../img/actions/search.png') .5em center no-repeat; border:0; -moz-border-radius:1em; -webkit-border- radius:1em; border-radius:1em; } -input[type="submit"].enabled { background:#aea; -moz-box-shadow:0 1px 1px #f8f8f8, 0 1px 1px #cfc inset; -webkit-box-shadow:0 1px 1px #f8f8f8, 0 1px 1px #cfc inset; box-shadow:0 1px 1px #f8f8f8, 0 1px 1px #cfc inset; } -input[type="submit"].highlight{ background:#ffc100; border:1px solid #dda600; text-shadow:#ffeedd 0 1px 0; -moz-box-shadow:0 1px 1px #f8f8f8, 0 1px 1px #ffeedd inset; -webkit-box-shadow:0 1px 1px #f8f8f8, 0 1px 1px #ffeedd inset; box-shadow:0 1px 1px #f8f8f8, 0 1px 1px #ffeedd inset; } +input[type="submit"].enabled { background:#66f866; border:1px solid #5e5; -moz-box-shadow:0 1px 1px #f8f8f8, 0 1px 1px #cfc inset; -webkit-box-shadow:0 1px 1px #f8f8f8, 0 1px 1px #cfc inset; box-shadow:0 1px 1px #f8f8f8, 0 1px 1px #cfc inset; } +input[type="submit"].highlight{ background:#ffc100; border:1px solid #db0; text-shadow:#ffeedd 0 1px 0; -moz-box-shadow:0 1px 1px #f8f8f8, 0 1px 1px #ffeedd inset; -webkit-box-shadow:0 1px 1px #f8f8f8, 0 1px 1px #ffeedd inset; box-shadow:0 1px 1px #f8f8f8, 0 1px 1px #ffeedd inset; } form#user_settings { max-width:600px; } form#user_settings p label { display:block; float:left; width:35%; padding:0.4em 0.5em 0 0; text-align:right; } form p { padding:0.5em 4em 0.5em 0.5em; text-align:left; } form p.form_footer { margin:1em 0 0 0; text-align:right; } form label { cursor:pointer; } -fieldset { padding:1em; width:40em; margin:1em; +#body-settings fieldset { padding:1em; width:40em; margin:1em; border:1px solid #ddd; font-weight:bold; cursor:pointer; background:#f2f2f2; color:#555; text-shadow:#fff 0 1px 0; -moz-box-shadow:0 1px 1px #fff, 0 1px 1px #fff inset; -webkit-box-shadow:0 1px 1px #fff, 0 1px 1px #fff inset; -moz-border-radius:.5em; -webkit-border-radius:.5em; border-radius:.5em;} legend { padding:.2em; font-size:1.2em; } .template{display:none;} diff --git a/files/css/files.css b/files/css/files.css index 004e42338fc..bfd96bc2acf 100644 --- a/files/css/files.css +++ b/files/css/files.css @@ -9,7 +9,7 @@ .file_upload_wrapper { background:url("../img/file.png"); font-weight:bold; position:relative; top:-1.2em; left:-2em; display:-moz-inline-box; /* fallback for older firefox versions*/ display:inline-block; width:8em; } .file_upload_start { opacity:0; filter:alpha(opacity=0); } -#file_newfolder_name { background-image:url("../img/folder.png"); font-weight:bold; width:12em; } +#file_newfolder_name { background-image:url("../img/folder.png"); font-weight:bold; width:8em; } .file_upload_start, .file_upload_filename { position:absolute; top:0; left:0; font-size:1em; } #file_newfolder_submit, #file_upload_submit { width:3em; } .file_upload_target { display:none; } diff --git a/help/css/help.css b/help/css/help.css index e8c42f808d1..2722c676a66 100644 --- a/help/css/help.css +++ b/help/css/help.css @@ -6,3 +6,5 @@ table td.selection, table th.selection, table td.fileaction { width:2em; text-al table td.name a { padding:6px; text-decoration:none; color:#555555; } .type { text-decoration:none; color:#888888; font-size:.8em; } .description { text-decoration:none; color:#666666; font-size:.9em; } + +table#help tr td { white-space:normal; } diff --git a/help/templates/index.php b/help/templates/index.php index f859a8ae70c..ef5510e78b4 100644 --- a/help/templates/index.php +++ b/help/templates/index.php @@ -1,12 +1,12 @@ <?php if(is_null($_["kbe"])):?> Can't connect to Q&A database <?php else:?> - <table cellspacing="0" width="100%"> + <table id="help" cellspacing="20"> <tbody> <?php foreach($_["kbe"] as $kb): ?> <tr> <td width="1"><?php if($kb["preview1"] <> "") { echo('<img class="preview" border="0" src="'.$kb["preview1"].'" />'); } ?> </a></td> - <td class="name"><?php echo $kb["name"]; ?><br /><?php echo('<span class="type">'.$kb['description'].'</span>'); ?> + <td class="name"><p><strong><?php echo $kb["name"]; ?></strong></p><?php echo('<span class="type">'.$kb['description'].'</span>'); ?> <?php if($kb['answer']<>'') echo('<br /><span class="type"><b>Answer:</b></span><br /><span class="type">'.$kb['answer'].'</span>');?> </td> </tr> diff --git a/settings/css/settings.css b/settings/css/settings.css index 23561ec367d..66299b1faa0 100644 --- a/settings/css/settings.css +++ b/settings/css/settings.css @@ -1,2 +1,4 @@ -#passworderror{display:none;} -#passwordchanged{display:none;}
\ No newline at end of file +#passworderror { display:none; } +#passwordchanged { display:none; } + +input#identity { width:20em; } |