diff options
Diffstat (limited to 'themes')
| -rw-r--r-- | themes/admin_default/css/screen.css | 36 | ||||
| -rw-r--r-- | themes/default/views/login_page.html.php | 24 |
2 files changed, 34 insertions, 26 deletions
diff --git a/themes/admin_default/css/screen.css b/themes/admin_default/css/screen.css index 2d5f086c..38fcf089 100644 --- a/themes/admin_default/css/screen.css +++ b/themes/admin_default/css/screen.css @@ -192,6 +192,9 @@ #gUserAdminList { margin-bottom: 1em; } +#gUserAdminList td { + vertical-align: bottom; +} #gUserAdminList .gDraggable:hover { border: 1px dashed black; @@ -211,11 +214,38 @@ li.gGroup { float: left; display: block; width: 200px; - height: 200px; border: 1px solid gray; - padding: .5em; - margin-right: 0 1em 1em 0; + padding: 0; + margin: 0 1em 1em 0; +} +li.gGroup h4 { + background-color: #EEEEEE; + border-bottom: 1px dashed #CCCCCC; + padding: .5em 0 .5em .5em; +} +li.gGroup .gButtonLink { + padding: 0; +} +li.gGroup ul, li.gGroup div { + height: 180px; + margin: 1px; overflow: auto; + padding-top: .2em; +} +li.gGroup div p { + color: gray; + text-align: center; + padding: 2em .5em 0 .5em +} +li.gGroup .gUser { + padding: .2em 0 0 .5em; +} +li.gGroup .gUser .gButtonLink { + vertical-align: middle; +} + +li.gDefaultGroup h4, li.gDefaultGroup .gUser { + color: gray; } #gAdminAdvancedSettings tr.setting:hover { diff --git a/themes/default/views/login_page.html.php b/themes/default/views/login_page.html.php index 1bd76c18..27f8571e 100644 --- a/themes/default/views/login_page.html.php +++ b/themes/default/views/login_page.html.php @@ -7,33 +7,11 @@ <title> <?= t("Please Login to Gallery") ?> </title> - <link rel="shortcut icon" href="<?= $theme->url("images/favicon.ico") ?>" type="image/x-icon" /> - <link rel="stylesheet" type="text/css" href="<?= url::file("lib/yui/reset-fonts-grids.css") ?>" - media="screen,print,projection" /> - <link rel="stylesheet" type="text/css" href="<?= url::file("lib/superfish/css/superfish.css") ?>" - media="screen" /> - <link rel="stylesheet" type="text/css" href="<?= url::file("lib/themeroller/ui.base.css") ?>" - media="screen,print,projection" /> <link rel="stylesheet" type="text/css" href="<?= $theme->url("css/screen.css") ?>" media="screen,print,projection" /> - <!--[if IE]> - <link rel="stylesheet" type="text/css" href="<?= $theme->url("css/fix-ie.css") ?>" - media="screen,print,projection" /> - <![endif]--> - <script src="<?= url::file("lib/jquery.js") ?>" type="text/javascript"></script> - <script src="<?= url::file("lib/jquery.form.js") ?>" type="text/javascript"></script> - <script src="<?= url::file("lib/jquery-ui.js") ?>" type="text/javascript"></script> - <script src="<?= url::file("lib/gallery.dialog.js") ?>" type="text/javascript"></script> - <script src="<?= url::file("lib/superfish/js/superfish.js") ?>" type="text/javascript"></script> - <script src="<?= $theme->url("js/ui.init.js") ?>" type="text/javascript"></script> - <script> - $("#gLoginLink").ready(function() { - $("#gLoginLink").click(); - }); - </script> </head> <body> - <a id="gLoginLink" href="<?= url::site("login/ajax") ?>">Log in</a> + <?= user::get_login_form("login/auth_html") ?> </body> </html> |