Fossil SCM
Style tweaks, including some CSS and moving the capability string element 'out' one level.
Commit
bdf233a7147d0c35c38d23a3f83476e8a14e7d4d
Parent
2adc03976699534…
2 files changed
+8
-3
+4
+8
-3
| --- src/setup.c | ||
| +++ src/setup.c | ||
| @@ -491,11 +491,11 @@ | ||
| 491 | 491 | @ <input type="hidden" name="info" value=""> |
| 492 | 492 | @ <input type="hidden" name="pw" value="*"> |
| 493 | 493 | } |
| 494 | 494 | @ <script type='text/javascript'> |
| 495 | 495 | @ function fossilUpdatePermissionsList(){ |
| 496 | - @ /* updates #currentPermissionsString with current permissions string based on checkboxes */ | |
| 496 | + @ /* updates #usetupEditCapability with current permissions string based on checkboxes */ | |
| 497 | 497 | @ try { |
| 498 | 498 | @ var inputs = document.getElementsByTagName('input'), i, x = 0, e, permsIds = []; |
| 499 | 499 | @ if(inputs && inputs.length){ |
| 500 | 500 | @ for( i = 0; i < inputs.length; ++i ){ |
| 501 | 501 | @ e = inputs[i]; |
| @@ -506,11 +506,11 @@ | ||
| 506 | 506 | @ } |
| 507 | 507 | @ } |
| 508 | 508 | @ } |
| 509 | 509 | @ } |
| 510 | 510 | @ permsIds.sort(); |
| 511 | - @ document.getElementById('currentPermissionsString').innerHTML = permsIds.join(''); | |
| 511 | + @ document.getElementById('usetupEditCapability').innerHTML = permsIds.join(''); | |
| 512 | 512 | @ }catch(e){/*ignore errors*/} |
| 513 | 513 | @ }</script> |
| 514 | 514 | @ <table> |
| 515 | 515 | @ <tr> |
| 516 | 516 | @ <td class="usetupEditLabel">User ID:</td> |
| @@ -590,14 +590,19 @@ | ||
| 590 | 590 | @ <label><input type="checkbox" name="ax"%s(oa['x']) onchange="fossilUpdatePermissionsList()" /> |
| 591 | 591 | @ Private%s(B('x'))</label><br /> |
| 592 | 592 | @ <label><input type="checkbox" name="az"%s(oa['z']) onchange="fossilUpdatePermissionsList()" /> |
| 593 | 593 | @ Download Zip%s(B('z'))</label> |
| 594 | 594 | @ </td></tr> |
| 595 | - @ <tr><td colspan='7'>Selected capabilities: <span id="currentPermissionsString">(missing JS?)</span></td></tr> | |
| 596 | 595 | @ </table> |
| 597 | 596 | @ </td> |
| 598 | 597 | @ </tr> |
| 598 | + @ <tr> | |
| 599 | + @ <td class="usetupEditLabel">Selected Capabilities:</td> | |
| 600 | + @ <td> | |
| 601 | + @ <span id="usetupEditCapability">(missing JS?)</span> | |
| 602 | + @ </td> | |
| 603 | + @ </tr> | |
| 599 | 604 | if( !login_is_special(zLogin) ){ |
| 600 | 605 | @ <tr> |
| 601 | 606 | @ <td align="right">Password:</td> |
| 602 | 607 | if( zPw[0] ){ |
| 603 | 608 | /* Obscure the password for all users */ |
| 604 | 609 |
| --- src/setup.c | |
| +++ src/setup.c | |
| @@ -491,11 +491,11 @@ | |
| 491 | @ <input type="hidden" name="info" value=""> |
| 492 | @ <input type="hidden" name="pw" value="*"> |
| 493 | } |
| 494 | @ <script type='text/javascript'> |
| 495 | @ function fossilUpdatePermissionsList(){ |
| 496 | @ /* updates #currentPermissionsString with current permissions string based on checkboxes */ |
| 497 | @ try { |
| 498 | @ var inputs = document.getElementsByTagName('input'), i, x = 0, e, permsIds = []; |
| 499 | @ if(inputs && inputs.length){ |
| 500 | @ for( i = 0; i < inputs.length; ++i ){ |
| 501 | @ e = inputs[i]; |
| @@ -506,11 +506,11 @@ | |
| 506 | @ } |
| 507 | @ } |
| 508 | @ } |
| 509 | @ } |
| 510 | @ permsIds.sort(); |
| 511 | @ document.getElementById('currentPermissionsString').innerHTML = permsIds.join(''); |
| 512 | @ }catch(e){/*ignore errors*/} |
| 513 | @ }</script> |
| 514 | @ <table> |
| 515 | @ <tr> |
| 516 | @ <td class="usetupEditLabel">User ID:</td> |
| @@ -590,14 +590,19 @@ | |
| 590 | @ <label><input type="checkbox" name="ax"%s(oa['x']) onchange="fossilUpdatePermissionsList()" /> |
| 591 | @ Private%s(B('x'))</label><br /> |
| 592 | @ <label><input type="checkbox" name="az"%s(oa['z']) onchange="fossilUpdatePermissionsList()" /> |
| 593 | @ Download Zip%s(B('z'))</label> |
| 594 | @ </td></tr> |
| 595 | @ <tr><td colspan='7'>Selected capabilities: <span id="currentPermissionsString">(missing JS?)</span></td></tr> |
| 596 | @ </table> |
| 597 | @ </td> |
| 598 | @ </tr> |
| 599 | if( !login_is_special(zLogin) ){ |
| 600 | @ <tr> |
| 601 | @ <td align="right">Password:</td> |
| 602 | if( zPw[0] ){ |
| 603 | /* Obscure the password for all users */ |
| 604 |
| --- src/setup.c | |
| +++ src/setup.c | |
| @@ -491,11 +491,11 @@ | |
| 491 | @ <input type="hidden" name="info" value=""> |
| 492 | @ <input type="hidden" name="pw" value="*"> |
| 493 | } |
| 494 | @ <script type='text/javascript'> |
| 495 | @ function fossilUpdatePermissionsList(){ |
| 496 | @ /* updates #usetupEditCapability with current permissions string based on checkboxes */ |
| 497 | @ try { |
| 498 | @ var inputs = document.getElementsByTagName('input'), i, x = 0, e, permsIds = []; |
| 499 | @ if(inputs && inputs.length){ |
| 500 | @ for( i = 0; i < inputs.length; ++i ){ |
| 501 | @ e = inputs[i]; |
| @@ -506,11 +506,11 @@ | |
| 506 | @ } |
| 507 | @ } |
| 508 | @ } |
| 509 | @ } |
| 510 | @ permsIds.sort(); |
| 511 | @ document.getElementById('usetupEditCapability').innerHTML = permsIds.join(''); |
| 512 | @ }catch(e){/*ignore errors*/} |
| 513 | @ }</script> |
| 514 | @ <table> |
| 515 | @ <tr> |
| 516 | @ <td class="usetupEditLabel">User ID:</td> |
| @@ -590,14 +590,19 @@ | |
| 590 | @ <label><input type="checkbox" name="ax"%s(oa['x']) onchange="fossilUpdatePermissionsList()" /> |
| 591 | @ Private%s(B('x'))</label><br /> |
| 592 | @ <label><input type="checkbox" name="az"%s(oa['z']) onchange="fossilUpdatePermissionsList()" /> |
| 593 | @ Download Zip%s(B('z'))</label> |
| 594 | @ </td></tr> |
| 595 | @ </table> |
| 596 | @ </td> |
| 597 | @ </tr> |
| 598 | @ <tr> |
| 599 | @ <td class="usetupEditLabel">Selected Capabilities:</td> |
| 600 | @ <td> |
| 601 | @ <span id="usetupEditCapability">(missing JS?)</span> |
| 602 | @ </td> |
| 603 | @ </tr> |
| 604 | if( !login_is_special(zLogin) ){ |
| 605 | @ <tr> |
| 606 | @ <td align="right">Password:</td> |
| 607 | if( zPw[0] ){ |
| 608 | /* Obscure the password for all users */ |
| 609 |
+4
| --- src/style.c | ||
| +++ src/style.c | ||
| @@ -1195,10 +1195,14 @@ | ||
| 1195 | 1195 | @ /* use default */ |
| 1196 | 1196 | }, |
| 1197 | 1197 | { "tr.row1", |
| 1198 | 1198 | "odd table row color", |
| 1199 | 1199 | @ /* Use default */ |
| 1200 | + }, | |
| 1201 | + { "#usetupEditCapability", | |
| 1202 | + "format for capabilities string, mentioned on the user edit page", | |
| 1203 | + @ font-weight: bold; | |
| 1200 | 1204 | }, |
| 1201 | 1205 | { "#canvas", "timeline graph node colors", |
| 1202 | 1206 | @ color: black; |
| 1203 | 1207 | @ background-color: white; |
| 1204 | 1208 | }, |
| 1205 | 1209 |
| --- src/style.c | |
| +++ src/style.c | |
| @@ -1195,10 +1195,14 @@ | |
| 1195 | @ /* use default */ |
| 1196 | }, |
| 1197 | { "tr.row1", |
| 1198 | "odd table row color", |
| 1199 | @ /* Use default */ |
| 1200 | }, |
| 1201 | { "#canvas", "timeline graph node colors", |
| 1202 | @ color: black; |
| 1203 | @ background-color: white; |
| 1204 | }, |
| 1205 |
| --- src/style.c | |
| +++ src/style.c | |
| @@ -1195,10 +1195,14 @@ | |
| 1195 | @ /* use default */ |
| 1196 | }, |
| 1197 | { "tr.row1", |
| 1198 | "odd table row color", |
| 1199 | @ /* Use default */ |
| 1200 | }, |
| 1201 | { "#usetupEditCapability", |
| 1202 | "format for capabilities string, mentioned on the user edit page", |
| 1203 | @ font-weight: bold; |
| 1204 | }, |
| 1205 | { "#canvas", "timeline graph node colors", |
| 1206 | @ color: black; |
| 1207 | @ background-color: white; |
| 1208 | }, |
| 1209 |