diff options
Diffstat (limited to 'themes')
28 files changed, 533 insertions, 620 deletions
diff --git a/themes/admin_wind/css/fix-ie.css b/themes/admin_wind/css/fix-ie.css index 6bc2334c..708ac782 100644 --- a/themes/admin_wind/css/fix-ie.css +++ b/themes/admin_wind/css/fix-ie.css @@ -2,17 +2,17 @@ * Fix display in IE 6 and 7 */ -#gHeader, -#gGroupAdmin, -#gDeveloperTools, -.gAvailable .gBlock { +#g-header, +#g-group-admin, +#g-developer-tools, +.g-available .g-block { zoom: 1; } -.gUnavailable { +.g-unavailable { filter: alpha(opacity=40); } -.gUnavailable:hover { +.g-unavailable:hover { filter: alpha(opacity=100); } diff --git a/themes/admin_wind/css/screen.css b/themes/admin_wind/css/screen.css index 61161967..f23472b8 100644 --- a/themes/admin_wind/css/screen.css +++ b/themes/admin_wind/css/screen.css @@ -39,11 +39,11 @@ h1 { font-size: 1.7em; } -#gSearchResults h1 { +#g-search-results h1 { margin-bottom: 1em; } -#gProgress h1 { +#g-progress h1 { font-size: 1.1em; } @@ -51,11 +51,11 @@ h2 { font-size: 1.4em; } -#gSidebar .gBlock h2 { +#g-sidebar .g-block h2 { font-size: 1.2em; } -#gSidebar .gBlock li { +#g-sidebar .g-block li { margin-bottom: .6em; } @@ -66,7 +66,7 @@ h3 { /* Links ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ a, -.gMenu a, +.g-menu a, #g-dialog a, .g-button, .g-button:hover, @@ -84,7 +84,7 @@ a:hover, text-decoration: underline; } -.gMenu a:hover { +.g-menu a:hover { text-decoration: none; } @@ -94,7 +94,7 @@ table { width: 100%; } -#gContent table { +#g-content table { margin: 1em 0 3em 0; } @@ -111,7 +111,7 @@ td { vertical-align: top; } -#gAdminMaintenance td { +#g-admin-maintenance td { vertical-align: middle; } @@ -122,9 +122,9 @@ fieldset { padding-bottom: .8em; } -#gHeader fieldset, -#gSidebar fieldset, -.gShortForm fieldset { +#g-header fieldset, +#g-sidebar fieldset, +.g-short-form fieldset { border: none; } @@ -133,11 +133,11 @@ legend { margin-left: 1em; } -#gHeader legend, -#gSidebar legend, -#gContent #gSearchForm legend, +#g-header legend, +#g-sidebar legend, +#g-content #g-search-form legend, input[type="hidden"], -.gShortForm label { +.g-short-form label { display: none; } @@ -203,23 +203,18 @@ input[type="reset"] { /* Form validation ~~~~~~~~~~~~~~~~~~~~~~~ */ -.gValidationRule { - font-size: 80%; - margin-top: .5em; -} - -form.gError input[type="text"], -li.gError input[type="text"], -form.gError input[type="password"], -li.gError input[type="password"], -form.gError input[type="checkbox"], -li.gError input[type="checkbox"], -form.gError input[type="radio"], -li.gError input[type="radio"], -form.gError textarea, -li.gError textarea, -form.gError select, -li.gError select { +form.g-error input[type="text"], +li.g-error input[type="text"], +form.g-error input[type="password"], +li.g-error input[type="password"], +form.g-error input[type="checkbox"], +li.g-error input[type="checkbox"], +form.g-error input[type="radio"], +li.g-error input[type="radio"], +form.g-error textarea, +li.g-error textarea, +form.g-error select, +li.g-error select { border: 2px solid red; } @@ -227,7 +222,7 @@ li.gError select { * 3) Reusable content blocks *********************************************************************/ -.gBlock { +.g-block { background-color: #fff; border: 1px solid #ccc; clear: both; @@ -235,138 +230,138 @@ li.gError select { padding: 1em; } -#gSidebar .gBlockContent { +#g-sidebar .g-block-content { padding: 0; } -.gBlock h2 { +.g-block h2 { background-color: #e8e8e8; padding: .3em .8em; } -.gBlockContent { +.g-block-content { margin-top: 1em; } -.gSelected img, -.gAvailable .gBlock img { +.g-selected img, +.g-available .g-block img { float: left; margin: 0 1em 1em 0; } -.rtl .gSelected img, -.rtl .gAvailable .gBlock img { +.rtl .g-selected img, +.rtl .g-available .g-block img { float: right; } -.gSelected { +.g-selected { background: #e8e8e8; } -.gAvailable .gInstalledToolkit:hover { +.g-available .g-installed-toolkit:hover { cursor: pointer; background: #eee; } -.gAvailable .g-button { +.g-available .g-button { width: 96%; } -.gSelected .g-button { +.g-selected .g-button { display: none; } -.gUnavailable { +.g-unavailable { border-color: #999; opacity: 0.4; } /* Status messages ~~~~~~~~~~~~~~~~~~~~~~~ */ -#gMessage { +#g-action-status { width: 100%; } -#gSiteStatus li, -#gMessage li, -.gModuleStatus { +#g-site-status li, +#g-action-status li, +.g-module-status { border: 1px solid #ccc; margin-bottom: .4em; } -#gSiteStatus li { +#g-site-status li { margin-bottom: 0; border: none; border-bottom: 1px solid #ccc; } -.gModuleStatus { +.g-module-status { clear: both; margin-bottom: 1em; } -.gError, -.gInfo, -.gSuccess, -.gWarning { +.g-error, +.g-info, +.g-success, +.g-warning { padding: .4em .5em .4em 30px; } -.gError, tr.gError td.gError { +.g-error, tr.g-error td.g-error { background: #f6cbca url('../../../lib/images/ico-error.png') no-repeat .4em 50%; } -.gInfo { +.g-info { background: #e8e8e8 url('../../../lib/images/ico-info.png') no-repeat .4em 50%; } -.gSuccess { +.g-success { background: #d9efc2 url('../../../lib/images/ico-success.png') no-repeat .4em 50%; } -.gWarning, tr.gWarning td.gWarning { +.g-warning, tr.g-warning td.g-warning { background: #fcf9ce url('../../../lib/images/ico-warning.png') no-repeat .4em 50%; } -.gPager .gInfo, -tr.gError, -tr.gInfo, -tr.gSuccess, -tr.gWarning { +.g-pager .g-info, +tr.g-error, +tr.g-info, +tr.g-success, +tr.g-warning { background: none; } -.gInfo td.gInfo { +.g-info td.g-info { background-color: transparent; } -.gSuccess td.gSuccess { +.g-success td.g-success { background-color: transparent; } -.gError td { +.g-error td { background-color: #f6cbca; } -.gWarning td { +.g-warning td { background-color: #fcf9ce; } -.gModuleStatus.gInfo, -#gLogEntries .gInfo, -.gModuleStatus.gSuccess, -#gLogEntries .gSuccess { +.g-module-status.g-info, +#g-log-entries .g-info, +.g-module-status.g-success, +#g-log-entries .g-success { background-color: #fff; } /* Inline layout (forms, lists) ~~~~~~~~~~ */ -.gShortForm li { +.g-short-form li { float: left; padding: .4em 0; } -.gShortForm input[type="text"] { +.g-short-form input[type="text"] { color: #666; padding: .3em .6em; width: 11em; @@ -378,7 +373,7 @@ tr.gWarning { /* View container ~~~~~~~~~~~~~~~~~~~~~~~~ */ -.gView { +.g-view { background-color: #fff; border: 1px solid #ccc; border-bottom: none; @@ -387,7 +382,7 @@ tr.gWarning { /* Layout containers ~~~~~~~~~~~~~~~~~~~~~ */ -#gHeader { +#g-header { background-color: #e8e8e8; border-bottom: 1px solid #ccc; font-size: .8em; @@ -396,20 +391,20 @@ tr.gWarning { position: relative; } -#gContent { +#g-content { font-size: 1.1em; padding-left: 20px; width: 96%; } -#gSidebar { +#g-sidebar { background-color: #fff; font-size: .9em; padding: 0 20px; width: 220px; } -#gFooter { +#g-footer { background-color: #e8e8e8; border-top: 1px solid #ccc; font-size: .8em; @@ -423,7 +418,7 @@ tr.gWarning { /* Header ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ -#gHeader #gLogo { +#g-header #g-logo { background: transparent url('../../../lib/images/logo.png') no-repeat 0 .5em; color: #A5A5A5 !important; display: block; @@ -432,63 +427,63 @@ tr.gWarning { width: 105px; } -#gHeader #gLogo:hover { +#g-header #g-logo:hover { color: #f60 !important; text-decoration: none; } -#gHeader #gQuickSearchForm { +#g-header #g-quick-search-form { clear: right; float: right; margin: 1em 0; } -#gHeader #gQuickSearchForm input[type='text'] { +#g-header #g-quick-search-form input[type='text'] { width: 17em; } -#gContent .gBlock h2 { +#g-content .g-block h2 { background-color: transparent; padding-left: 0; } -#gSidebar .gBlockContent { +#g-sidebar .g-block-content { padding-left: 1em; } /* Footer content ~~~~~~~~~~~~~~~~~~~~~~~~ */ -#gHeader #gLoginMenu li, -#gFooter #gCredits li { +#g-header #g-login-menu li, +#g-footer #g-credits li { display: inline; } -#gHeader #gLoginMenu li { +#g-header #g-login-menu li { padding-left: 1.2em; } -#gFooter #gCredits li { +#g-footer #g-credits li { padding-right: 1.2em; } -#gContent #gSearchResults { +#g-content #g-search-results { margin-top: 1em; padding-top: 1em; } -.gBlock .ui-dialog-titlebar { +.g-block .ui-dialog-titlebar { margin: -1em -1em 0; } -#gSidebar .gBlock h2 { +#g-sidebar .g-block h2 { background: none; } -#gPhotoStream { +#g-photo-stream { background-color: #e8e8e8; } -#gPhotoStream .gBlockContent ul { +#g-photo-stream .g-block-content ul { border-right: 1px solid #e8e8e8; height: 135px; overflow: auto; @@ -497,7 +492,7 @@ tr.gWarning { overflow-y: hidden; /* Hide vertical*/ } -#gContent #gPhotoStream .gItem { +#g-content #g-photo-stream .g-item { background-color: #fff; border: 1px solid #e8e8e8; border-right-color: #ccc; @@ -509,15 +504,15 @@ tr.gWarning { width: 90px; } -.rtl #gContent #gPhotoStream .gItem { +.rtl #g-content #g-photo-stream .g-item { float: right; } -#gSiteStatus { +#g-site-status { margin-bottom: 0; } -#gContent .gItem { +#g-content .g-item { background-color: #fff; border: 1px solid #e8e8e8; border-right-color: #ccc; @@ -528,65 +523,65 @@ tr.gWarning { width: 90px; } -#gAdminCommentsMenu { +#g-admin-comments-menu { margin: 1em 0; } -#gAdminCommentsMenu a { +#g-admin-comments-menu a { margin: 0; padding: .2em .6em; } -#gAdminGraphics .gAvailable .gBlock { +#g-admin-graphics .g-available .g-block { clear: none; float: left; margin-right: 1em; width: 30%; } -.rtl #gAdminGraphics .gAvailable .gBlock { +.rtl #g-admin-graphics .g-available .g-block { float: right; margin-left: 1em; margin-right: 0em; } -#gSiteTheme, -#gAdminTheme { +#g-site-theme, +#g-admin-theme { float: left; width: 48%; } -.rtl #gSiteTheme, -.rtl #gAdminTheme { +.rtl #g-site-theme, +.rtl #g-admin-theme { float: right; } -#gSiteTheme { +#g-site-theme { margin-right: 1em; } -#gUserAdminList { +#g-user-admin-list { margin-bottom: 1em; } -#gUserAdminList td { +#g-user-admin-list td { vertical-align: bottom; } -#gUserAdminList .gDraggable:hover { +#g-user-admin-list .g-draggable:hover { border: 1px dashed black; } -#gUserAdminList .admin { +#g-user-admin-list .admin { color: #55f; font-weight: bold; } -.gActions a, -.gActions span { +.g-actions a, +.g-actions span { margin-right: 3em; } -li.gGroup { +li.g-group { float: left; display: block; width: 200px; @@ -595,65 +590,65 @@ li.gGroup { margin: 0 1em 1em 0; } -.rtl li.gGroup { +.rtl li.g-group { float: right; } -li.gGroup h4 { +li.g-group h4 { background-color: #eee; border-bottom: 1px dashed #ccc; padding: .5em 0 .5em .5em; } -li.gGroup .g-button { +li.g-group .g-button { padding: 0; } -li.gGroup ul, li.gGroup div { +li.g-group ul, li.g-group div { height: 180px; margin: 1px; overflow: auto; padding-top: .2em; } -li.gGroup div p { +li.g-group div p { color: gray; text-align: center; padding: 2em .5em 0 .5em } -li.gGroup .gUser { +li.g-group .g-user { padding: .2em 0 0 .5em; } -li.gGroup .gUser .g-button { +li.g-group .g-user .g-button { vertical-align: middle; } -li.gDefaultGroup h4, li.gDefaultGroup .gUser { +li.g-default-group h4, li.g-default-group .g-user { color: gray; } -#gAdminAdvancedSettings tr.setting:hover { +#g-admin-advanced-settings tr.setting:hover { background: #ffc; } /* admin/sidebar ~~~~~~~~~~~~~~~~~~~~~~~~~ */ -.gAdminBlocksList { +.g-admin-blocks-list { float: left; height: 300px; margin-left: 20px; width: 30%; } -.gAdminBlocksList div:last-child { +.g-admin-blocks-list div:last-child { border: .1em solid; height: 100%; overflow-y: auto; } -.gAdminBlocksList ul { +.g-admin-blocks-list ul { height: 98%; margin: .1em .1em; padding: .1em; } -.gAdminBlocksList ul li { +.g-admin-blocks-list ul li { background-color: #e8e8e8; font-size: 1em; font-weight: bold; @@ -666,27 +661,27 @@ li.gDefaultGroup h4, li.gDefaultGroup .gUser { * 5) Navigation and menus *********************************************************************/ -#gSiteAdminMenu, -#gTagCloud ul { +#g-site-admin-menu, +#g-tag-cloud ul { font-size: 1.2em; } /* Login menu ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ -#gHeader #gLoginMenu { +#g-header #g-login-menu { color: #999; float: right; margin: 0; padding: 5px 0; } -.rtl #gHeader #gLoginMenu { +.rtl #g-header #g-login-menu { text-align: left; } /* Site Menu ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ -#gSiteAdminMenu { +#g-site-admin-menu { bottom: 0; display: none; font-size: 1.2em; @@ -694,44 +689,24 @@ li.gDefaultGroup h4, li.gDefaultGroup .gUser { position: absolute; } -#gSiteAdminMenu ul { +#g-site-admin-menu ul { margin-bottom: 0; } -/* Pagination ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ - -.gPager { - clear: both; - margin: 0; - padding: 5px 0 !important; - width: 100%; -} - -.gPager li { - float: left; - margin: 0; - width: 30%; -} - -.gPager .gInfo { - text-align: center; - width: 40%; -} - /** ******************************************************************* * 6) Browser hacks *********************************************************************/ -#gSiteAdminMenu:after, -#gHeader:after, -#gAdminCommentsMenu:after, -#gGroupAdmin:after, -.gSelected:after, -.gAvailable .gBlock:after, -#gModuleCreateForm ul li ul:after, -#gDeveloperTools:after, -#gPhotoStream:after, -#gViewMenu:after { +#g-site-admin-menu:after, +#g-header:after, +#g-admin-comments-menu:after, +#g-group-admin:after, +.g-selected:after, +.g-available .g-block:after, +#g-module-create-form ul li ul:after, +#g-developer-tools:after, +#g-photo-stream:after, +#g-view-menu:after { clear: both; content: "."; display: block; @@ -755,26 +730,22 @@ li.gDefaultGroup h4, li.gDefaultGroup .gUser { /* Ajax loading indicator ~~~~~~~~~~~~~~~~ */ -.gLoadingLarge { - background: #e8e8e8 url('../../../lib/images/loading-large.gif') no-repeat center center; - font-size: 0; -} - -.g-dialogLoadingLarge { +.g-loading-large, +.g-dialog-loading-large { background: url('../../../lib/images/loading-large.gif') no-repeat center center !important; font-size: 0; } -.gLoadingSmall { +.g-loading-small { background: #e8e8e8 url('../../../lib/images/loading-small.gif') no-repeat center center; font-size: 0; } -.gDraggable { +.g-draggable { cursor: move; } -.gDropTarget { +.g-drop-target { background-color: #cfdeff; border: 1px dotted #999; height: 100px; @@ -783,16 +754,16 @@ li.gDefaultGroup h4, li.gDefaultGroup .gUser { /* jQuery UI Dialog ~~~~~~~~~~~~~~~~~~~~~~ */ -#gPanel { +#g-panel { display: none; padding: 1em; } -#gPanel legend { +#g-panel legend { display: none; } -#gPanel fieldset { +#g-panel fieldset { border: none; } @@ -800,12 +771,12 @@ li.gDefaultGroup h4, li.gDefaultGroup .gUser { cursor: move; } -.gButtonSetVertical a { +.g-buttonset-vertical a { width: 8em !important; } -#gAdminDashboard .ui-dialog-titlebar, -#gAdminDashboardSidebar .ui-dialog-titlebar { +#g-admin-dashboard .ui-dialog-titlebar, +#g-admin-dashboard-sidebar .ui-dialog-titlebar { padding: .2em .4em; } @@ -816,15 +787,15 @@ li.gDefaultGroup h4, li.gDefaultGroup .gUser { /* jQuery UI ThemeRoller buttons */ -.gButtonSet { +.g-buttonset { padding-left: 1px; } -.gButtonSet li { +.g-buttonset li { float: left; } -.gButtonSet .g-button { +.g-buttonset .g-button { margin: 0; } @@ -848,169 +819,169 @@ li.gDefaultGroup h4, li.gDefaultGroup .gUser { /*************** STUFF THAT NEEDS A HOME ****************/ -#gMove ul { +#g-move ul { padding-left: 1em; } -#gMove .selected { +#g-move .selected { background: #999; } -.gProgressBar { +.g-progress-bar { height: 1em; width: 100%; margin-top: .5em; display: inline-block; } -#gAddPhotos p { +#g-add-photos p { margin: 0; padding: 0; } -#gAddPhotosCanvas { +#g-add-photos-canvas { height: 325px; width: 450px; overflow: auto; } -#gAddPhotosQueue .progressbar { +#g-add-photos-queue .progressbar { height: 4px; } -#gAddPhotosQueue .title { +#g-add-photos-queue .title { font-size: 1.25em; } -#gAddPhotosQueue .status { +#g-add-photos-queue .status { font-size: .75em; } -#gAddPhotosQueue .box { +#g-add-photos-queue .box { margin-bottom: 8px; padding: 4px; } -#gAddPhotosQueue .pending { +#g-add-photos-queue .pending { background-color: #e8e8e8; border: 1px solid #d7d7d7; } -#gAddPhotosQueue .error { +#g-add-photos-queue .error { background-color: #fcc; border: 1px solid #ebb; } -#gAddPhotosQueue .uploading { +#g-add-photos-queue .uploading { background-color: #ff9; border: 1px solid #ee8; } -#gAddPhotosQueue .complete { +#g-add-photos-queue .complete { background-color: #cfc; border: 1px solid #beb; } -#gAdminG2ImportNotes { +#g-admin-g2-import-notes { padding-bottom: 20px; } -#gAdminG2ImportDetails { +#g-admin-g2-import-details { padding-top: 20px; } -#gAdminG2ImportDetails .gWarning { +#g-admin-g2-import-details .g-warning { margin-top: 4px; } -#gAdminG2ImportDetails .gInfo { +#g-admin-g2-import-details .g-info { padding: 2px; border: 1px solid #999; margin-bottom: 10px; } -#gAdminG2ImportNotes p, -#gAdminG2ImportDetails .gInfo p { +#g-admin-g2-import-notes p, +#g-admin-g2-import-details .g-info p { padding: 0; margin: 0; } -#gAdminG2ImportNotes ul li, -#gAdminG2Import .gInfo ul li { +#g-admin-g2-import-notes ul li, +#g-admin-g2-import .g-info ul li { padding-left: 0; margin-left: 20px; list-style-type: disc; } -#gTagAdmin { +#g-tag-admin { table-layout: fixed; } -#gTagAdmin td { +#g-tag-admin td { border: 0; } -#gTagAdmin ul { +#g-tag-admin ul { padding-bottom: .3em; } -#gTagAdmin li { +#g-tag-admin li { padding: .1em 0 .2em .3em; } -#gTagAdmin .gColumn { +#g-tag-admin .g-column { float: left; width: 200px; } -.rtl #gTagAdmin .gColumn { +.rtl #g-tag-admin .g-column { float: right; } -.gEditable { +.g-editable { padding: .1em .3em .2em .3em; } -.gEditable:hover { +.g-editable:hover { background-color: #ffc; cursor: text; } -#gRenameTagForm input { +#g-rename-tag-form input { padding: 0 .2em 0 .2em; clear: none; float: left; margin: 0 .2em 0 0; } -.rtl #gRenameTagForm input { +.rtl #g-rename-tag-form input { float: right; } -#gRenameTagForm input[type="text"].gError { +#g-rename-tag-form input[type="text"].g-error { border: 2px solid red; background: none; } -#gRenameTagForm input[type="submit"] { +#g-rename-tag-form input[type="submit"] { height: 25px; } -#gRenameTagForm a, #gRenameTagForm span { +#g-rename-tag-form a, #g-rename-tag-form span { display: block; float: left; padding: .2em .2em 0 .1em; } -.rtl #gRenameTagForm a, #gRenameTagForm span { +.rtl #g-rename-tag-form a, #g-rename-tag-form span { float: right; } -#gTaskLog-dialog h1 { +#g-task-log-dialog h1 { font-size: 1.1em; } -.gTaskLog { +.g-task-log { border: 1pt solid; font-size: .9em; height: 400px; @@ -1019,69 +990,69 @@ li.gDefaultGroup h4, li.gDefaultGroup .gUser { padding: .5em } -#gServerAddAdmin { +#g-server-add-admin { margin:auto; text-align: left; } -.rtl #gServerAddAdmin { +.rtl #g-server-add-admin { text-align: right; } -#gServerAddAdmin form fieldset { +#g-server-add-admin form fieldset { border: medium none; } -#gServerAddAdmin legend { +#g-server-add-admin legend { display: none; } -#gServerAddAdmin .gWarning { +#g-server-add-admin .g-warning { background-color: #FFFF99; } -#gAuthorizedPath { +#g-authorized-path { margin: 0 !important; padding: 0.3em 1.5em 0.3em 1em; } -#gServerAdd Admin #path { +#g-server-add-admin #path { width: 80%; } -.gRemoveDir:hover { +.g-remove-dir:hover { cursor: pointer; } -#gLanguagesForm table { +g-languages-form table { width: 400px; float: left; margin: 0 3em 1em 0; } -#gLanguagesForm .installed { +g-languages-form .installed { background-color: #EEEEEE; } -#gLanguagesForm .default { +g-languages-form .default { background-color: #C5DBEC; font-weight: bold; } -#gLanguagesForm input { +g-languages-form input { clear: both; } -#gTranslations { +#g-translations { padding: 2em 0 0 0; clear: both; } -#gTranslations .g-button { +#g-translations .g-button { padding: .5em; } -.gDocLink { +.g-doc-link { float: right; } @@ -1101,9 +1072,9 @@ li.gDefaultGroup h4, li.gDefaultGroup .gUser { text-align: left; } -.rtl #gHeader #gQuickSearchForm, -.rtl #gForgotPasswordLink, -.rtl #gHeader #gLoginMenu, +.rtl #g-header #g-quick-search-form, +.rtl #g-reset-password, +.rtl #g-header #g-login-menu, .rtl .ui-icon-right .ui-icon { clear: left; float: left; @@ -1113,11 +1084,11 @@ li.gDefaultGroup h4, li.gDefaultGroup .gUser { .rtl form ul ul li, .rtl input[type="submit"], .rtl input[type="reset"], -.rtl .gShortForm li, -.rtl #gContent #gAlbumGrid .gItem, -.rtl #gSiteAdminMenu, -.rtl .gPager li, -.rtl .gButtonSet li, +.rtl .g-short-form li, +.rtl #g-content #g-album-grid .g-item, +.rtl #g-site-admin-menu, +.rtl .g-pager li, +.rtl .g-buttonset li, .rtl .ui-icon-left .ui-icon { float: right; } diff --git a/themes/admin_wind/images/avatar.jpg b/themes/admin_wind/images/avatar.jpg Binary files differdeleted file mode 100644 index 2e76b12b..00000000 --- a/themes/admin_wind/images/avatar.jpg +++ /dev/null diff --git a/themes/admin_wind/images/ico-album.png b/themes/admin_wind/images/ico-album.png Binary files differdeleted file mode 100644 index affa1b84..00000000 --- a/themes/admin_wind/images/ico-album.png +++ /dev/null diff --git a/themes/admin_wind/images/ico-print.png b/themes/admin_wind/images/ico-print.png Binary files differdeleted file mode 100644 index b82a8e1e..00000000 --- a/themes/admin_wind/images/ico-print.png +++ /dev/null diff --git a/themes/admin_wind/images/ico-separator.gif b/themes/admin_wind/images/ico-separator.gif Binary files differdeleted file mode 100644 index 3de2d0d3..00000000 --- a/themes/admin_wind/images/ico-separator.gif +++ /dev/null diff --git a/themes/admin_wind/images/ico-view-comments.png b/themes/admin_wind/images/ico-view-comments.png Binary files differdeleted file mode 100644 index e5d3630f..00000000 --- a/themes/admin_wind/images/ico-view-comments.png +++ /dev/null diff --git a/themes/admin_wind/images/ico-view-fullsize.png b/themes/admin_wind/images/ico-view-fullsize.png Binary files differdeleted file mode 100644 index 0be23e9b..00000000 --- a/themes/admin_wind/images/ico-view-fullsize.png +++ /dev/null diff --git a/themes/admin_wind/images/ico-view-hybrid.png b/themes/admin_wind/images/ico-view-hybrid.png Binary files differdeleted file mode 100644 index ee902e55..00000000 --- a/themes/admin_wind/images/ico-view-hybrid.png +++ /dev/null diff --git a/themes/admin_wind/images/ico-view-slideshow.png b/themes/admin_wind/images/ico-view-slideshow.png Binary files differdeleted file mode 100644 index 82f61f63..00000000 --- a/themes/admin_wind/images/ico-view-slideshow.png +++ /dev/null diff --git a/themes/admin_wind/js/ui.init.js b/themes/admin_wind/js/ui.init.js index a603f87f..8d34241f 100644 --- a/themes/admin_wind/js/ui.init.js +++ b/themes/admin_wind/js/ui.init.js @@ -1,7 +1,7 @@ $(document).ready(function(){ // Initialize Superfish menus - $("#gSiteAdminMenu ul.gMenu").addClass("sf-menu"); - $("ul.gMenu").addClass("sf-menu"); + $("#g-site-admin-menu ul.g-menu").addClass("sf-menu"); + $("ul.g-menu").addClass("sf-menu"); $("ul.sf-menu").superfish({ delay: 500, animation: { @@ -11,41 +11,41 @@ $(document).ready(function(){ pathClass: "current", speed: "fast" }); - $("#gSiteAdminMenu").css("display", "block"); + $("#g-site-admin-menu").css("display", "block"); // Initialize status message effects - $("#gMessage li").gallery_show_message(); + $("#g-action-status li").gallery_show_message(); // Initialize modal dialogs - $(".g-dialogLink").gallery_dialog(); + $(".g-dialog-link").gallery_dialog(); // Initialize ajax links - $(".gAjaxLink").gallery_ajax(); + $(".g-ajax-link").gallery_ajax(); // Initialize panels - $(".gPanelLink").gallery_panel(); + $(".g-panel-link").gallery_panel(); - if ($("#gPhotoStream").length) { + if ($("#g-photo-stream").length) { // Vertically align thumbs in photostream - $(".gItem").gallery_valign(); + $(".g-item").gallery_valign(); } // Apply jQuery UI button css to submit inputs - $("input[type=submit]:not(.gShortForm input)").addClass("ui-state-default ui-corner-all"); + $("input[type=submit]:not(.g-short-form input)").addClass("ui-state-default ui-corner-all"); // Round view menu buttons - if ($("#gAdminCommentsMenu").length) { - $("#gAdminCommentsMenu ul").removeClass("gMenu").removeClass("sf-menu"); - $("#gAdminCommentsMenu").addClass("gButtonSet"); - $("#gAdminCommentsMenu a").addClass("g-button ui-state-default"); - $("#gAdminCommentsMenu ul li:first a").addClass("ui-corner-left"); - $("#gAdminCommentsMenu ul li:last a").addClass("ui-corner-right"); + if ($("#g-admin-comments-menu").length) { + $("#g-admin-comments-menu ul").removeClass("g-menu").removeClass("sf-menu"); + $("#g-admin-comments-menu").addClass("g-buttonset"); + $("#g-admin-comments-menu a").addClass("g-button ui-state-default"); + $("#g-admin-comments-menu ul li:first a").addClass("ui-corner-left"); + $("#g-admin-comments-menu ul li:last a").addClass("ui-corner-right"); } // Round corners - $(".gSelected").addClass("ui-corner-all"); - $(".gAvailable .gBlock").addClass("ui-corner-all"); - $(".gUnavailable").addClass("ui-corner-all"); + $(".g-selected").addClass("ui-corner-all"); + $(".g-available .g-block").addClass("ui-corner-all"); + $(".g-unavailable").addClass("ui-corner-all"); // Add hover state for buttons $(".ui-state-default").hover( diff --git a/themes/admin_wind/views/admin.html.php b/themes/admin_wind/views/admin.html.php index b18f010a..5b2d41ad 100644 --- a/themes/admin_wind/views/admin.html.php +++ b/themes/admin_wind/views/admin.html.php @@ -36,21 +36,21 @@ <body <?= $theme->body_attributes() ?>> <?= $theme->admin_page_top() ?> <? if ($sidebar): ?> - <div id="doc3" class="yui-t5 gView"> + <div id="doc3" class="yui-t5 g-view"> <? else: ?> - <div id="doc3" class="yui-t7 gView"> + <div id="doc3" class="yui-t7 g-view"> <? endif; ?> <?= $theme->site_status() ?> - <div id="gHeader"> + <div id="g-header"> <?= $theme->admin_header_top() ?> - <ul id="gLoginMenu"> + <ul id="g-login-menu"> <li class="first"><?= html::anchor(item::root()->abs_url(), "← ".t("Back to the Gallery")) ?></li> - <li id="gLogoutLink"><a href="<?= url::site("logout?csrf=$csrf&continue=" . urlencode(item::root()->url())) ?>"><?= t("Logout") ?></a></li> + <li id="g-logoutLink"><a href="<?= url::site("logout?csrf=$csrf&continue=" . urlencode(item::root()->url())) ?>"><?= t("Logout") ?></a></li> </ul> - <a id="gLogo" href="<?= item::root()->url() ?>" title="<?= t("go back to the Gallery")->for_html_attr() ?>"> + <a id="g-logo" href="<?= item::root()->url() ?>" title="<?= t("go back to the Gallery")->for_html_attr() ?>"> ← <?= t("back to the ...") ?> </a> - <div id="gSiteAdminMenu" style="display: none;"> + <div id="g-site-admin-menu" style="display: none;"> <?= $theme->admin_menu() ?> </div> <?= $theme->admin_header_bottom() ?> @@ -58,19 +58,19 @@ <div id="bd"> <div id="yui-main"> <div class="yui-b"> - <div id="gContent" class="yui-g"> + <div id="g-content" class="yui-g"> <?= $theme->messages() ?> <?= $content ?> </div> </div> </div> <? if ($sidebar): ?> - <div id="gSidebar" class="yui-b"> + <div id="g-sidebar" class="yui-b"> <?= $sidebar ?> </div> <? endif ?> </div> - <div id="gFooter"> + <div id="g-footer"> <?= $theme->admin_footer() ?> <div> <?= $theme->admin_credits() ?> diff --git a/themes/admin_wind/views/block.html.php b/themes/admin_wind/views/block.html.php index 6cbea76e..d1d2d088 100644 --- a/themes/admin_wind/views/block.html.php +++ b/themes/admin_wind/views/block.html.php @@ -2,9 +2,9 @@ <? if ($anchor): ?> <a name="<?= $anchor ?>"></a> <? endif ?> -<div block_id="<?= $id ?>" id="<?= $css_id ?>" class="gBlock ui-widget"> +<div block_id="<?= $id ?>" id="<?= $css_id ?>" class="g-block ui-widget"> <div class="ui-dialog-titlebar ui-widget-header ui-helper-clearfix ui-icon-right"> - <? if ($css_id != "gBlockAdder"): ?> + <? if ($css_id != "g-block-adder"): ?> <a href="<?= url::site("admin/dashboard/remove_block/$id?csrf=$csrf") ?>" class="ui-dialog-titlebar-close ui-corner-all"> <span class="ui-icon ui-icon-closethick">remove</span> @@ -12,7 +12,7 @@ <? endif ?> <?= $title ?> </div> - <div class="gBlockContent"> + <div class="g-block-content"> <?= $content ?> </div> </div> diff --git a/themes/admin_wind/views/pager.html.php b/themes/admin_wind/views/pager.html.php index 29b9f9d0..555a4950 100644 --- a/themes/admin_wind/views/pager.html.php +++ b/themes/admin_wind/views/pager.html.php @@ -1,6 +1,6 @@ <?php defined("SYSPATH") or die("No direct script access.") ?> <? // See http://docs.kohanaphp.com/libraries/pagination ?> -<ul class="gPager"> +<ul class="g-pager"> <? /* @todo This message isn't easily localizable */ $from_to_msg = t2("Item %from_number of %count", "Items %from_number - %to_number of %count", @@ -24,7 +24,7 @@ <span class="ui-icon ui-icon-seek-prev"></span><?= t("previous") ?></a> <? endif ?> </li> - <li class="gInfo"><?= $from_to_msg ?></li> + <li class="g-info"><?= $from_to_msg ?></li> <li class="g-txt-right"> <? if ($next_page): ?> <a href="<?= str_replace('{page}', $next_page, $url) ?>" class="g-button ui-icon-right ui-state-default ui-corner-all"> diff --git a/themes/wind/css/fix-ie.css b/themes/wind/css/fix-ie.css index 8899ec59..d6405c36 100644 --- a/themes/wind/css/fix-ie.css +++ b/themes/wind/css/fix-ie.css @@ -2,15 +2,15 @@ * Fix display in IE 6, 7 */ -#gBanner, -.gBreadcrumbs, -#gAlbumGrid, -#gPager, -#gViewMenu { +#g-banner, +.g-breadcrumbs, +#g-album-grid, +#g-pager, +#g-view-menu { zoom: 1; } -#gBanner { +#g-banner { z-index: 2; } @@ -19,7 +19,7 @@ input.submit { display: inline !important; } -#gAddTagForm input.textbox { +#g-add-tag-form input.textbox { width: 110px; } @@ -28,10 +28,10 @@ input.submit { float: none !important; } -.gPager .g-txt-right { +.g-pager .g-txt-right { width: 29%; } -.gPager .ui-icon-right { +.g-pager .ui-icon-right { width: 60px; } diff --git a/themes/wind/css/screen.css b/themes/wind/css/screen.css index ec75d310..dac6a899 100644 --- a/themes/wind/css/screen.css +++ b/themes/wind/css/screen.css @@ -39,11 +39,11 @@ h1 { font-size: 1.7em; } -#gSearchResults h1 { +#g-search-results h1 { margin-bottom: 1em; } -#gProgress h1 { +#g-progress h1 { font-size: 1.1em; } @@ -51,11 +51,11 @@ h2 { font-size: 1.4em; } -#gSidebar .gBlock h2 { +#g-sidebar .g-block h2 { font-size: 1.2em; } -#gSidebar .gBlock li { +#g-sidebar .g-block li { margin-bottom: .6em; } @@ -66,7 +66,7 @@ h3 { /* Links ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ a, -.gMenu a, +.g-menu a, #g-dialog a, .g-button, .g-button:hover, @@ -85,11 +85,11 @@ a:hover, text-decoration: underline; } -.gMenu a:hover { +.g-menu a:hover { text-decoration: none; } -#g-dialog #gMessage li { +#g-dialog #g-action-status li { width: 400px; white-space: normal; padding-left: 32px; @@ -101,7 +101,7 @@ table { width: 100%; } -#gContent table { +#g-content table { margin: 1em 0; } @@ -125,9 +125,9 @@ fieldset { padding-bottom: .8em; } -#gBanner fieldset, -#gSidebar fieldset, -.gShortForm fieldset { +#g-banner fieldset, +#g-sidebar fieldset, +.g-short-form fieldset { border: none; } @@ -136,11 +136,11 @@ legend { margin-left: 1em; } -#gBanner legend, -#gSidebar legend, -#gContent #gSearchForm legend, +#g-banner legend, +#g-sidebar legend, +#g-content #g-search-form legend, input[type="hidden"], -.gShortForm label { +.g-short-form label { display: none; } @@ -206,23 +206,18 @@ input[type="reset"] { /* Form validation ~~~~~~~~~~~~~~~~~~~~~~~ */ -.gValidationRule { - font-size: 80%; - margin-top: .5em; -} - -form.gError input[type="text"], -li.gError input[type="text"], -form.gError input[type="password"], -li.gError input[type="password"], -form.gError input[type="checkbox"], -li.gError input[type="checkbox"], -form.gError input[type="radio"], -li.gError input[type="radio"], -form.gError textarea, -li.gError textarea, -form.gError select, -li.gError select { +form.g-error input[type="text"], +li.g-error input[type="text"], +form.g-error input[type="password"], +li.g-error input[type="password"], +form.g-error input[type="checkbox"], +li.g-error input[type="checkbox"], +form.g-error input[type="radio"], +li.g-error input[type="radio"], +form.g-error textarea, +li.g-error textarea, +form.g-error select, +li.g-error select { border: 2px solid red; } @@ -230,91 +225,91 @@ li.gError select { * 3) Reusable content blocks *********************************************************************/ -.gBlock { +.g-block { clear: both; margin-bottom: 2.5em; } -.gBlock h2 { +.g-block h2 { background-color: #e8e8e8; padding: .3em .8em; } -.gBlockContent { +.g-block-content { margin-top: 1em; } /* Status messages ~~~~~~~~~~~~~~~~~~~~~~~ */ -#gContent #gMessage { +#g-content #g-action-status { width: 100%; } -#gSiteStatus li, -#gMessage li, -.gModuleStatus { +#g-site-status li, +#g-action-status li, +.g-module-status { border: 1px solid #ccc; margin-bottom: .4em; } -#gSiteStatus li { +#g-site-status li { margin-bottom: 0; border: none; border-bottom: 1px solid #ccc; } -.gModuleStatus { +.g-module-status { clear: both; margin-bottom: 1em; } -.gError, -.gInfo, -.gSuccess, -.gWarning { +.g-error, +.g-info, +.g-success, +.g-warning { background-position: .4em 50%; background-repeat: no-repeat; padding: .4em .5em .4em 30px; } -.gError { +.g-error { background-color: #f6cbca; background-image: url('../../../lib/images/ico-error.png'); } -.gInfo { +.g-info { background-color: #e8e8e8; background-image: url('../../../lib/images/ico-info.png'); } -.gSuccess { +.g-success { background-color: #d9efc2; background-image: url('../../../lib/images/ico-success.png'); } -.gWarning { +.g-warning { background-color: #fcf9ce; background-image: url('../../../lib/images/ico-warning.png'); } -form .gError, -.gPager .gInfo { +form .g-error, +.g-pager .g-info { background-color: #fff !important; } -.gPager .gInfo { +.g-pager .g-info { background-image: none !important; padding: 0 !important; } /* Inline layout (forms, lists) ~~~~~~~~~~ */ -.gShortForm li { +.g-short-form li { float: left; padding: .4em 0; } -.gShortForm input[type="text"] { +.g-short-form input[type="text"] { color: #666; padding: .3em .6em; width: 11em; @@ -326,7 +321,7 @@ form .gError, /* View container ~~~~~~~~~~~~~~~~~~~~~~~~ */ -.gView { +.g-view { background-color: #fff; border: 1px solid #ccc; border-bottom: none; @@ -334,11 +329,11 @@ form .gError, /* Layout containers ~~~~~~~~~~~~~~~~~~~~~ */ -#gHeader { +#g-header { margin-bottom: 1em; } -#gBanner { +#g-banner { background-color: #e8e8e8; border-bottom: 1px solid #ccc; font-size: .8em; @@ -347,20 +342,20 @@ form .gError, position: relative; } -#gContent { +#g-content { font-size: 1.2em; padding-left: 20px; position: relative; width: 696px; } -#gSidebar { +#g-sidebar { font-size: .9em; padding: 0 20px; width: 220px; } -#gFooter { +#g-footer { background-color: #e8e8e8; border-top: 1px solid #ccc; font-size: .8em; @@ -374,38 +369,38 @@ form .gError, /* Header ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ -#gBanner #gLogo img { +#g-banner #g-logo img { margin: 0; } -#gBanner #gQuickSearchForm { +#g-banner #g-quick-search-form { clear: right; float: right; margin-top: 1em; } -#gBanner #gQuickSearchForm input[type='text'] { +#g-banner #g-quick-search-form input[type='text'] { width: 17em; } -#gContent .gBlock h2 { +#g-content .g-block h2 { background-color: transparent; padding-left: 0; } -#gSidebar .gBlockContent { +#g-sidebar .g-block-content { padding-left: 1em; } /* Album content ~~~~~~~~~~~~~~~~~~~~~~~~~ */ -#gContent #gAlbumGrid { +#g-content #g-album-grid { margin: 1em 0; position: relative; z-index: 1; } -#gContent #gAlbumGrid .gItem { +#g-content #g-album-grid .g-item { background-color: #fff; border: 1px solid #fff; float: left; @@ -417,21 +412,21 @@ form .gError, z-index: 1; } -#gContent #gAlbumGrid .gItem h2 { +#g-content #g-album-grid .g-item h2 { margin: 5px 0; } -#gContent .gPhoto h2, -#gContent .gItem .gMetadata { +#g-content .g-photo h2, +#g-content .g-item .g-metadata { display: none; margin-bottom: .6em; } -#gContent #gAlbumGrid .gAlbum { +#g-content #g-album-grid .g-album { background-color: #e8e8e8; } -#gContent #gAlbumGrid .gAlbum h2 span { +#g-content #g-album-grid .g-album h2 span { background: transparent url('../images/ico-album.png') no-repeat top left; display: inline-block; height: 16px; @@ -439,18 +434,18 @@ form .gError, width: 16px; } -#gContent #gAlbumGrid .gHoverItem { +#g-content #g-album-grid .g-hover-item { border: 1px solid #000; position: absolute !important; z-index: 1000 !important; } -#gContent .gHoverItem h2, -#gContent .gHoverItem .gMetadata { +#g-content .g-hover-item h2, +#g-content .g-hover-item .g-metadata { display: block; } -#gContent #gAlbumGrid #gPlaceHolder { +#g-content #g-album-grid #g-place-holder { position: relative; visibility: hidden; z-index: 1; @@ -458,80 +453,80 @@ form .gError, /* Individual photo content ~~~~~~~~~~~~~~ */ -#gContent #gItem { +#g-content #g-item { position: relative; width: 99%; } -#gContent #gPhoto { +#g-content #g-photo { position: relative; } -#gContent #gItem .gFullSizeLink img { +#g-content #g-item .g-fullsize-link img { display: block; margin: 1em auto !important; } -#gContent #gComments { +#g-content #g-comments { margin-top: 2em; position: relative; } -#gContent #gComments ul li { +#g-content #g-comments ul li { margin: 1em 0; } -#gContent #gComments .gAuthor { +#g-content #g-comments .g-author { border-bottom: 1px solid #ccc; color: #999; height: 32px; line-height: 32px; } -#gContent #gComments ul li div { +#g-content #g-comments ul li div { padding: 0 8px 8px 43px; } -#gContent #gComments ul li #gRecaptcha { +#g-content #g-comments ul li #g-recaptcha { padding: 0; } -#gContent #gComments ul li #gRecaptcha div { +#g-content #g-comments ul li #g-recaptcha div { padding: 0; } -#gContent #gComments .gAvatar { +#g-content #g-comments .g-avatar { height: 32px; margin-right: .4em; width: 32px; } -#gAddCommentButton { +#g-admin-comment-button { position: absolute; right: 0; top: 2px; } -#gContent #gAddCommentForm { +#g-content #g-comment-form { margin-top: 2em; } /* Footer content ~~~~~~~~~~~~~~~~~~~~~~~~ */ -#gBanner #gLoginMenu li, -#gFooter #gCredits li { +#g-banner #g-login-menu li, +#g-footer #g-credits li { display: inline; } -#gBanner #gLoginMenu li { +#g-banner #g-login-menu li { padding-left: 1.2em; } -#gFooter #gCredits li { +#g-footer #g-credits li { padding-right: 1.2em; } -#gContent #gSearchResults { +#g-content #g-search-results { margin-top: 1em; padding-top: 1em; } @@ -540,245 +535,185 @@ form .gError, * 5) Navigation and menus *********************************************************************/ -#gSiteMenu, -#gTagCloud ul { +#g-site-menu, +#g-tag-cloud ul { font-size: 1.2em; } /* Login menu ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ -#gBanner #gLoginMenu { +#g-banner #g-login-menu { color: #999; float: right; } /* Site Menu ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ -#gSiteMenu { +#g-site-menu { bottom: 0; display: none; left: 140px; position: absolute; } -#gSiteMenu ul { +#g-site-menu ul { margin-bottom: 0 !important; } /* Context Menu ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ -.gContextMenu { +.g-context-menu { background-color: #fff; bottom: 0; left: 0; position: absolute; } -.gItem .gContextMenu { +.g-item .g-context-menu { display: none; margin-top: 2em; width: 100%; } -#gItem .gContextMenu { +#g-item .g-context-menu { font-size: .7em; } -#gItem .gContextMenu ul { +#g-item .g-context-menu ul { display: none; } -.gContextMenu li { +.g-context-menu li { border-left: none; border-right: none; border-bottom: none; } -.gContextMenu li a { +.g-context-menu li a { display: block; line-height: 1.6em; } -.gHoverItem .gContextMenu { +.g-hover-item .g-context-menu { display: block; } -.gHoverItem .gContextMenu li { +.g-hover-item .g-context-menu li { text-align: left; } -.gHoverItem .gContextMenu a:hover { +.g-hover-item .g-context-menu a:hover { text-decoration: none; } /* View Menu ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ -#gViewMenu { +#g-view-menu { margin-bottom: 1em; } -#gViewMenu a { +#g-view-menu a { background-repeat: no-repeat; background-position: 50% 50%; height: 28px !important; width: 43px !important; } -#gViewMenu #gHybridLink { - background-image: url('../images/ico-view-hybrid.png'); -} - -#gViewMenu #gSlideshowLink { +#g-view-menu #g-slideshow-link { background-image: url('../images/ico-view-slideshow.png'); } -#gViewMenu .gFullSizeLink { +#g-view-menu .g-fullsize-link { background-image: url('../images/ico-view-fullsize.png'); } -#gViewMenu #gCommentsLink { +#g-view-menu #g-comments-link { background-image: url('../images/ico-view-comments.png'); } -#gViewMenu #gDigibugLink { +#g-view-menu #g-print-digibug-link { background-image: url('../images/ico-print.png'); } -/* Breadcrumbs ~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ - -.gBreadcrumbs { - padding: 0 20px; -} - -.gBreadcrumbs li { - background: transparent url('../images/ico-separator.gif') no-repeat scroll left center; - float: left; - padding: 10px 6px 10px 16px !important; -} - -.gBreadcrumbs li.root { - background: transparent; -} - -.gBreadcrumbs li a, -.gBreadcrumbs li span { - display: block; -} - -.gBreadcrumbs li.active, -.gBreadcrumbs li.active span { - font-weight: bold; -} - -#g-dialog ul.gBreadcrumbs { - clear: both; - margin-left: 0; - padding-left: 0; -} - -#g-dialog .gBreadcrumbs li { - font-size: .9em; -} - /* Tags and cloud ~~~~~~~~~~~~~~~~~~~~~~~~ */ -#gTagCloud ul { +#g-tag-cloud ul { text-align: justify; } -#gTagCloud ul li { +#g-tag-cloud ul li { display: inline; line-height: 1.5em; text-align: justify; } -#gTagCloud ul li a { +#g-tag-cloud ul li a { text-decoration: none; } -#gTagCloud ul li span { +#g-tag-cloud ul li span { display: none; } -#gTagCloud ul li.size1 a { +#g-tag-cloud ul li.size1 a { color: #9cf; font-size: 80%; font-weight: 100; } -#gTagCloud ul li.size2 a { +#g-tag-cloud ul li.size2 a { color: #69f; font-size: 90%; font-weight: 300; } -#gTagCloud ul li.size3 a { +#g-tag-cloud ul li.size3 a { color: #69c; font-size: 100%; font-weight: 500; } -#gTagCloud ul li.size4 a { +#g-tag-cloud ul li.size4 a { color: #369; font-size: 110%; font-weight: 700; } -#gTagCloud ul li.size5 a { +#g-tag-cloud ul li.size5 a { color: #0e2b52; font-size: 120%; font-weight: 900; } -#gTagCloud ul li.size6 a { +#g-tag-cloud ul li.size6 a { color: #0e2b52; font-size: 130%; font-weight: 900; } -#gTagCloud ul li.size7 a { +#g-tag-cloud ul li.size7 a { color: #0e2b52; font-size: 140%; font-weight: 900; } -#gTagCloud ul li a:hover { +#g-tag-cloud ul li a:hover { color: #f30; text-decoration: underline; } -#gWelcomeMessage p { +#g-welcome-message p { padding-bottom: 1em; } -/* Pagination ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ - -.gPager { - clear: both; - margin: 0; - padding: 5px 0 !important; - width: 100%; -} - -.gPager li { - float: left; - margin: 0; - width: 30%; -} - -.gPager .gInfo { - text-align: center; - width: 40%; -} - /** ******************************************************************* * 6) Browser hacks *********************************************************************/ -#gHeader:after, -#gAlbumGrid:after, -.gPager:after, -#gViewMenu:after { +#g-header:after, +#g-album-grid:after, +.g-pager:after, +#g-view-menu:after { clear: both; content: "."; display: block; @@ -802,26 +737,26 @@ form .gError, /* Ajax loading indicator ~~~~~~~~~~~~~~~~ */ -.gLoadingLarge { +.g-loading-large { background: #e8e8e8 url('../../../lib/images/loading-large.gif') no-repeat center center; font-size: 0; } -.g-dialogLoadingLarge { +.g-dialog-loading-large { background: url('../../../lib/images/loading-large.gif') no-repeat center center !important; font-size: 0; } -.gLoadingSmall { +.g-loading-small { background: #e8e8e8 url('../../../lib/images/loading-small.gif') no-repeat center center; font-size: 0; } -.gDraggable { +.g-draggable { cursor: move; } -.gDropTarget { +.g-drop-target { background-color: #cfdeff; border: 1px dotted #999; height: 100px; @@ -837,15 +772,15 @@ form .gError, /* jQuery UI ThemeRoller buttons */ -.gButtonSet { +.g-buttonset { padding-left: 1px; } -.gButtonSet li { +.g-buttonset li { float: left; } -.gButtonSet .g-button { +.g-buttonset .g-button { margin: 0; } @@ -869,36 +804,36 @@ form .gError, /* STUFF THAT NEEDS A HOME */ -#gMove ul { +#g-move ul { padding-left: 1em; } -#gMove .selected { +#g-move .selected { background: #999; } /* Server Add */ -#gServerAdd button { +#g-server-add button { margin-bottom: .5em; } -#gServerAddTree { +#g-server-add-tree { cursor: pointer; padding-left: 4px; width: 95%; } -#gServerAddTree li { +#g-server-add-tree li { padding: 0; float: none; } -#gServerAddTree span.selected { +#g-server-add-tree span.selected { background: #ddd; } -#gServerAddTree { +#g-server-add-tree { border: 1px solid #ccc; height: 20em; overflow: auto; @@ -906,59 +841,66 @@ form .gError, padding: .5em; } -#gServerAdd ul ul li { +#g-server-add ul ul li { padding-left: 1.2em; } /* Permissions ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ -#gEditPermissionForm { +#g-edit-permissions-form { clear: both; } -#gEditPermissionForm fieldset { - border: 1px solid #cccccc; + +#g-edit-permissions-form td { + background-image: none; +} + +#g-edit-permissions-form fieldset { + border: 1px solid #ccc; padding: 0; } -#gPermissions .gDenied, -#gPermissions .gAllowed { +#g-permissions .g-denied, +#g-permissions .g-allowed { text-align: center; vertical-align: middle; } -#gPermissions .gDenied { + +#g-permissions .g-denied { background-color: #fcc; } -#gPermissions .gAllowed { + +#g-permissions .g-allowed { background-color: #cfc; } /*************** STUFF THAT NEEDS A HOME ****************/ -.gProgressBar { +.g-progress-bar { height: 1em; width: 100%; margin-top: .5em; display: inline-block; } -#gAddPhotos #SWFUpload_0 { +#g-add-photos #SWFUpload_0 { position: relative; top: -200px; left: 134px; } -#gAddPhotos .gBreadcrumbs { +#g-add-photos .g-breadcrumbs { border: 0; margin: 0; padding-left:10px; } -#gAddPhotosCanvas { +#g-add-photos-canvas { border: 1px solid #CCCCCC; margin: .5em 0 .5em 0; width: 469px; height: 325px; overflow: auto; } -#gAddPhotos button { +#g-add-photos button { margin-bottom: .5em; float: right; } @@ -970,73 +912,73 @@ form .gError, cursor: pointer; } -#gAddPhotosCanvas { +#g-add-photos-canvas { } -#gAddPhotosQueue .progressbar { +#g-add-photos-queue .progressbar { height: 4px; } -#gAddPhotosQueue .title { +#g-add-photos-queue .title { font-size: 1.25em; } -#gAddPhotosQueue .status { +#g-add-photos-queue .status { font-size: .75em; } -#gAddPhotosQueue .box { +#g-add-photos-queue .box { margin-bottom: 8px; padding: 4px; } -#gAddPhotosQueue .pending { +#g-add-photos-queue .pending { background-color: #e8e8e8; border: 1px solid #d7d7d7; } -#gAddPhotosQueue .error { +#g-add-photos-queue .error { background-color: #fcc; border: 1px solid #ebb; } -#gAddPhotosQueue .uploading { +#g-add-photos-queue .uploading { background-color: #ff9; border: 1px solid #ee8; } -#gAddPhotosQueue .complete { +#g-add-photos-queue .complete { background-color: #cfc; border: 1px solid #beb; } -#gAdminG2ImportNotes { +#g-admin-g2-import-notes { padding-bottom: 20px; } -#gAdminG2ImportDetails { +#g-admin-g2-import-details { padding-top: 20px; } -#gAdminG2ImportDetails .gWarning { +#g-admin-g2-import-details .g-warning { margin-top: 4px; } -#gAdminG2ImportDetails .gInfo { +#g-admin-g2-import-details .g-info { padding: 2px; border: 1px solid #999; margin-bottom: 10px; } -#gAdminG2ImportNotes p, -#gAdminG2ImportDetails .gInfo p { +#g-admin-g2-import-notes p, +#g-admin-g2-import-details .g-info p { padding: 0; margin: 0; } -#gAdminG2ImportNotes ul li, -#gAdminG2Import .gInfo ul li { +#g-admin-g2-import-notes ul li, +#g-admin-g2-import .g-info ul li { padding-left: 0; margin-left: 20px; list-style-type: disc; @@ -1054,9 +996,9 @@ form .gError, text-align: right; } -.rtl #gHeader #gQuickSearchForm, -.rtl #gForgotPasswordLink, -.rtl #gHeader #gLoginMenu, +.rtl #g-header #g-quick-search-form, +.rtl #g-reset-password, +.rtl #g-header #g-login-menu, .rtl .ui-icon-right .ui-icon { clear: left; float: left; @@ -1066,13 +1008,13 @@ form .gError, .rtl form ul ul li, .rtl input[type="submit"], .rtl input[type="reset"], -.rtl .gShortForm li, -.rtl #gHeader #gLogo img, -.rtl #gContent #gAlbumGrid .gItem, -.rtl #gSiteMenu, -.rtl .gBreadcrumbs li, -.rtl .gPager li, -.rtl .gButtonSet li, +.rtl .g-short-form li, +.rtl #g-header #g-logo img, +.rtl #g-content #g-album-grid .g-item, +.rtl #g-site-menu, +.rtl .g-breadcrumbs li, +.rtl .g-pager li, +.rtl .g-buttonset li, .rtl .ui-icon-left .ui-icon { float: right; } diff --git a/themes/wind/images/ico-separator.gif b/themes/wind/images/ico-separator.gif Binary files differdeleted file mode 100644 index 3de2d0d3..00000000 --- a/themes/wind/images/ico-separator.gif +++ /dev/null diff --git a/themes/wind/images/ico-view-hybrid.png b/themes/wind/images/ico-view-hybrid.png Binary files differdeleted file mode 100644 index ee902e55..00000000 --- a/themes/wind/images/ico-view-hybrid.png +++ /dev/null diff --git a/themes/wind/js/ui.init.js b/themes/wind/js/ui.init.js index 4b3b4306..27fb9664 100644 --- a/themes/wind/js/ui.init.js +++ b/themes/wind/js/ui.init.js @@ -2,16 +2,10 @@ * Initialize jQuery UI and Gallery Plugin elements */ -var short_forms = new Array( - "#gQuickSearchForm", - "#gAddTagForm", - "#gSearchForm" -); - $(document).ready(function() { // Initialize Superfish menus - $("ul.gMenu").addClass("sf-menu"); + $("ul.g-menu").addClass("sf-menu"); $('ul.sf-menu').superfish({ delay: 500, animation: { @@ -20,63 +14,69 @@ $(document).ready(function() { }, speed: 'fast' }); - $("#gSiteMenu").css("display", "block"); + $("#g-site-menu").css("display", "block"); // Initialize status message effects - $("#gMessage li").gallery_show_message(); + $("#g-action-status li").gallery_show_message(); // Initialize dialogs - $("#gLoginLink").addClass("g-dialogLink"); - $(".g-dialogLink").gallery_dialog(); + $("#g-login-link").addClass("g-dialog-link"); + $(".g-dialog-link").gallery_dialog(); // Initialize view menu - if ($("#gViewMenu").length) { - $("#gViewMenu ul").removeClass("gMenu").removeClass("sf-menu"); - $("#gViewMenu a").addClass("ui-icon"); + if ($("#g-view-menu").length) { + $("#g-view-menu ul").removeClass("g-menu").removeClass("sf-menu"); + $("#g-view-menu a").addClass("ui-icon"); } // Initialize short forms + var short_forms = new Array( + "#g-quick-search-form", + "#g-add-tag-form", + "#g-search-form" + ); + for (var i in short_forms) { short_form_init(short_forms[i]); - $(short_forms[i]).addClass("gShortForm"); + $(short_forms[i]).addClass("g-short-form"); } - $(".gShortForm input[type=text]").addClass("ui-corner-left"); - $(".gShortForm input[type=submit]").addClass("ui-state-default ui-corner-right"); + $(".g-short-form input[type=text]").addClass("ui-corner-left"); + $(".g-short-form input[type=submit]").addClass("ui-state-default ui-corner-right"); // Apply jQuery UI button css to submit inputs - $("input[type=submit]:not(.gShortForm input)").addClass("ui-state-default ui-corner-all"); - - // Apply styles and icon classes to gContextMenu - if ($(".gContextMenu").length) { - $(".gContextMenu li").addClass("ui-state-default"); - $(".gContextMenu a").addClass("g-button ui-icon-left"); - $(".gContextMenu a").prepend("<span class=\"ui-icon\"></span>"); - $(".gContextMenu a span").each(function() { + $("input[type=submit]:not(.g-short-form input)").addClass("ui-state-default ui-corner-all"); + + // Apply styles and icon classes to g-context-menu + if ($(".g-context-menu").length) { + $(".g-context-menu li").addClass("ui-state-default"); + $(".g-context-menu a").addClass("g-button ui-icon-left"); + $(".g-context-menu a").prepend("<span class=\"ui-icon\"></span>"); + $(".g-context-menu a span").each(function() { var iconClass = $(this).parent().attr("class").match(/ui-icon-.[^\s]+/).toString(); $(this).addClass(iconClass); }); } // Album view only - if ($("#gAlbumGrid").length) { + if ($("#g-album-grid").length) { // Set equal height for album items and vertically align thumbnails/metadata - $('.gItem').equal_heights().gallery_valign(); + $('.g-item').equal_heights().gallery_valign(); // Initialize thumbnail hover effect - $(".gItem").hover( + $(".g-item").hover( function() { // Insert a placeholder to hold the item's position in the grid - var placeHolder = $(this).clone().attr("id", "gPlaceHolder"); + var placeHolder = $(this).clone().attr("id", "g-place-holder"); $(this).after($(placeHolder)); // Style and position the hover item var position = $(this).position(); $(this).css("top", position.top).css("left", position.left); - $(this).addClass("gHoverItem"); + $(this).addClass("g-hover-item"); // Initialize the contextual menu $(this).gallery_context_menu(); // Set the hover item's height $(this).height("auto"); - var context_menu = $(this).find(".gContextMenu"); + var context_menu = $(this).find(".g-context-menu"); var adj_height = $(this).height() + context_menu.height(); $(this).height(adj_height); }, @@ -94,19 +94,19 @@ $(document).ready(function() { $(this).css("position", "relative"); $(this).css("top", 0).css("left", 0); // Remove the placeholder and hover class from the item - $(this).removeClass("gHoverItem"); - $("#gPlaceHolder").remove(); + $(this).removeClass("g-hover-item"); + $("#g-place-holder").remove(); } ); } // Photo/Item item view - if ($("#gItem").length) { + if ($("#g-item").length) { // Ensure the resized image fits within its container - $("#gItem").gallery_fit_photo(); + $("#g-item").gallery_fit_photo(); // Initialize context menus - var resize = $("#gItem").gallery_get_photo(); + var resize = $("#g-item").gallery_get_photo(); $(resize).hover(function(){ $(this).gallery_context_menu(); }); diff --git a/themes/wind/views/album.html.php b/themes/wind/views/album.html.php index fd647f81..57760de4 100644 --- a/themes/wind/views/album.html.php +++ b/themes/wind/views/album.html.php @@ -1,27 +1,27 @@ <?php defined("SYSPATH") or die("No direct script access.") ?> <? // @todo Set hover on AlbumGrid list items for guest users ?> -<div id="gInfo"> +<div id="g-info"> <?= $theme->album_top() ?> <h1><?= html::purify($item->title) ?></h1> - <div class="gDescription"><?= nl2br(html::purify($item->description)) ?></div> + <div class="g-description"><?= nl2br(html::purify($item->description)) ?></div> </div> -<ul id="gAlbumGrid"> +<ul id="g-album-grid"> <? if (count($children)): ?> <? foreach ($children as $i => $child): ?> - <? $item_class = "gPhoto"; ?> + <? $item_class = "g-photo"; ?> <? if ($child->is_album()): ?> - <? $item_class = "gAlbum"; ?> + <? $item_class = "g-album"; ?> <? endif ?> - <li id="gItemId-<?= $child->id ?>" class="gItem <?= $item_class ?>"> + <li id="g-itemId-<?= $child->id ?>" class="g-item <?= $item_class ?>"> <?= $theme->thumb_top($child) ?> <a href="<?= $child->url() ?>"> - <?= $child->thumb_img(array("class" => "gThumbnail")) ?> + <?= $child->thumb_img(array("class" => "g-thumbnail")) ?> </a> <?= $theme->thumb_bottom($child) ?> - <?= $theme->context_menu($child, "#gItemId-{$child->id} .gThumbnail") ?> + <?= $theme->context_menu($child, "#g-itemId-{$child->id} .g-thumbnail") ?> <h2><span></span><a href="<?= $child->url() ?>"><?= html::purify($child->title) ?></a></h2> - <ul class="gMetadata"> + <ul class="g-metadata"> <?= $theme->thumb_info($child) ?> </ul> </li> @@ -30,7 +30,7 @@ <? if ($user->admin || access::can("add", $item)): ?> <? $addurl = url::file("index.php/simple_uploader/app/$item->id") ?> <li><?= t("There aren't any photos here yet! <a %attrs>Add some</a>.", - array("attrs" => html::mark_clean("href=\"$addurl\" class=\"g-dialogLink\""))) ?></li> + array("attrs" => html::mark_clean("href=\"$addurl\" class=\"g-dialog-link\""))) ?></li> <? else: ?> <li><?= t("There aren't any photos here yet!") ?></li> <? endif; ?> diff --git a/themes/wind/views/block.html.php b/themes/wind/views/block.html.php index e8cff833..699d7c22 100644 --- a/themes/wind/views/block.html.php +++ b/themes/wind/views/block.html.php @@ -2,9 +2,9 @@ <? if ($anchor): ?> <a name="<?= $anchor ?>"></a> <? endif ?> -<div id="<?= $css_id ?>" class="gBlock"> +<div id="<?= $css_id ?>" class="g-block"> <h2><?= $title ?></h2> - <div class="gBlockContent"> + <div class="g-block-content"> <?= $content ?> </div> </div> diff --git a/themes/wind/views/dynamic.html.php b/themes/wind/views/dynamic.html.php index 9ed9d69b..9d50f8a8 100644 --- a/themes/wind/views/dynamic.html.php +++ b/themes/wind/views/dynamic.html.php @@ -1,24 +1,24 @@ <?php defined("SYSPATH") or die("No direct script access.") ?> -<div id="gAlbumHeader"> - <div id="gAlbumHeaderButtons"> +<div id="g-albumHeader"> + <div id="g-albumHeaderButtons"> <?= $theme->dynamic_top() ?> </div> <h1><?= html::clean($title) ?></h1> </div> -<ul id="gAlbumGrid"> +<ul id="g-album-grid"> <? foreach ($children as $i => $child): ?> - <li class="gItem <?= $child->is_album() ? "gAlbum" : "" ?>"> + <li class="g-item <?= $child->is_album() ? "g-album" : "" ?>"> <?= $theme->thumb_top($child) ?> <a href="<?= $child->url() ?>"> - <img id="gPhotoId-<?= $child->id ?>" class="gThumbnail" + <img id="g-photoId-<?= $child->id ?>" class="g-thumbnail" alt="photo" src="<?= $child->thumb_url() ?>" width="<?= $child->thumb_width ?>" height="<?= $child->thumb_height ?>" /> </a> <h2><?= html::purify($child->title) ?></h2> <?= $theme->thumb_bottom($child) ?> - <ul class="gMetadata"> + <ul class="g-metadata"> <?= $theme->thumb_info($child) ?> </ul> </li> diff --git a/themes/wind/views/movie.html.php b/themes/wind/views/movie.html.php index cf7c9b7f..17b519ba 100644 --- a/themes/wind/views/movie.html.php +++ b/themes/wind/views/movie.html.php @@ -1,8 +1,8 @@ <?php defined("SYSPATH") or die("No direct script access.") ?> -<div id="gItem"> +<div id="g-item"> <?= $theme->photo_top() ?> - <ul class="gPager"> + <ul class="g-pager"> <li> <? if ($previous_item): ?> <a href="<?= $previous_item->url() ?>" class="g-button ui-icon-left ui-state-default ui-corner-all"> @@ -12,7 +12,7 @@ <span class="ui-icon ui-icon-triangle-1-w"></span><?= t("previous") ?></a> <? endif; ?> </li> - <li class="gInfo"><?= t("%position of %total", array("position" => $position, "total" => $sibling_count)) ?></li> + <li class="g-info"><?= t("%position of %total", array("position" => $position, "total" => $sibling_count)) ?></li> <li class="g-txt-right"> <? if ($next_item): ?> <a href="<?= $next_item->url() ?>" class="g-button ui-icon-right ui-state-default ui-corner-all"> @@ -25,13 +25,13 @@ </ul> - <?= $item->movie_img(array("class" => "gMovie", "id" => "gMovieId-{$item->id}")) ?> + <?= $item->movie_img(array("class" => "g-movie", "id" => "g-movie-id-{$item->id}")) ?> - <div id="gInfo"> + <div id="g-info"> <h1><?= html::purify($item->title) ?></h1> <div><?= nl2br(html::purify($item->description)) ?></div> </div> <?= $theme->photo_bottom() ?> - <?= $theme->context_menu($item, "#gMovieId-{$item->id}") ?> + <?= $theme->context_menu($item, "#g-movie-id-{$item->id}") ?> </div> diff --git a/themes/wind/views/no_sidebar.html.php b/themes/wind/views/no_sidebar.html.php index 7324cf9e..c609d4d9 100644 --- a/themes/wind/views/no_sidebar.html.php +++ b/themes/wind/views/no_sidebar.html.php @@ -1,5 +1,5 @@ <?php defined("SYSPATH") or die("No direct script access.") ?> -<div class="gWarning"> +<div class="g-warning"> <?= t("No active sidebar panels. <a href=\"%url\">Add panels</a>", array("url" => html::mark_clean(url::site("admin/sidebar")))) ?> </div> diff --git a/themes/wind/views/page.html.php b/themes/wind/views/page.html.php index 414174b6..6e1e3a53 100644 --- a/themes/wind/views/page.html.php +++ b/themes/wind/views/page.html.php @@ -38,7 +38,7 @@ <? $new_width = $thumb_proportion * 213 ?> <? $new_height = $thumb_proportion * 240 ?> <style type="text/css"> - #gContent #gAlbumGrid .gItem { + #g-content #g-album-grid .g-item { width: <?= $new_width ?>px; height: <?= $new_height ?>px; /* <?= $thumb_proportion ?> */ @@ -74,26 +74,26 @@ <body <?= $theme->body_attributes() ?>> <?= $theme->page_top() ?> - <div id="doc4" class="yui-t5 gView"> + <div id="doc4" class="yui-t5 g-view"> <?= $theme->site_status() ?> - <div id="gHeader"> - <div id="gBanner"> + <div id="g-header"> + <div id="g-banner"> <?= $theme->header_top() ?> <? if ($header_text = module::get_var("gallery", "header_text")): ?> <?= $header_text ?> <? else: ?> - <a id="gLogo" href="<?= item::root()->url() ?>" title="<?= t("go back to the Gallery home")->for_html_attr() ?>"> + <a id="g-logo" href="<?= item::root()->url() ?>" title="<?= t("go back to the Gallery home")->for_html_attr() ?>"> <img width="107" height="48" alt="<?= t("Gallery logo: Your photos on your web site")->for_html_attr() ?>" src="<?= url::file("lib/images/logo.png") ?>" /> </a> <? endif ?> - <div id="gSiteMenu"> + <div id="g-site-menu"> <?= $theme->site_menu() ?> </div> <?= $theme->header_bottom() ?> </div> <? if (!empty($parents)): ?> - <ul class="gBreadcrumbs"> + <ul class="g-breadcrumbs"> <? foreach ($parents as $parent): ?> <li> <!-- Adding ?show=<id> causes Gallery3 to display the page @@ -113,26 +113,26 @@ <div id="bd"> <div id="yui-main"> <div class="yui-b"> - <div id="gContent" class="yui-g"> + <div id="g-content" class="yui-g"> <?= $theme->messages() ?> <?= $content ?> </div> </div> </div> - <div id="gSidebar" class="yui-b"> + <div id="g-sidebar" class="yui-b"> <? if ($theme->page_type != "login"): ?> <?= new View("sidebar.html") ?> <? endif ?> </div> </div> - <div id="gFooter"> + <div id="g-footer"> <?= $theme->footer() ?> <? if ($footer_text = module::get_var("gallery", "footer_text")): ?> <?= $footer_text ?> <? endif ?> <? if (module::get_var("gallery", "show_credits")): ?> - <ul id="gCredits"> + <ul id="g-credits"> <?= $theme->credits() ?> </ul> <? endif ?> diff --git a/themes/wind/views/pager.html.php b/themes/wind/views/pager.html.php index 155c8d16..5e79add6 100644 --- a/themes/wind/views/pager.html.php +++ b/themes/wind/views/pager.html.php @@ -1,6 +1,6 @@ <?php defined("SYSPATH") or die("No direct script access.") ?> <? // See http://docs.kohanaphp.com/libraries/pagination ?> -<ul class="gPager"> +<ul class="g-pager"> <? /* @todo This message isn't easily localizable */ $from_to_msg = t2("Photo %from_number of %count", "Photos %from_number - %to_number of %count", @@ -24,7 +24,7 @@ <span class="ui-icon ui-icon-seek-prev"></span><?= t("previous") ?></a> <? endif ?> </li> - <li class="gInfo"><?= $from_to_msg ?></li> + <li class="g-info"><?= $from_to_msg ?></li> <li class="g-txt-right"> <? if ($next_page): ?> <a href="<?= str_replace('{page}', $next_page, $url) ?>" class="g-button ui-icon-right ui-state-default ui-corner-all"> diff --git a/themes/wind/views/photo.html.php b/themes/wind/views/photo.html.php index def3d8b7..497c61bc 100644 --- a/themes/wind/views/photo.html.php +++ b/themes/wind/views/photo.html.php @@ -4,7 +4,7 @@ <!-- Use javascript to show the full size as an overlay on the current page --> <script> $(document).ready(function() { - $(".gFullSizeLink").click(function() { + $(".g-fullsize-link").click(function() { $.gallery_show_full_size(<?= html::js_string($theme->item()->file_url()) ?>, "<?= $theme->item()->width ?>", "<?= $theme->item()->height ?>"); return false; }); @@ -12,10 +12,10 @@ </script> <? endif ?> -<div id="gItem"> +<div id="g-item"> <?= $theme->photo_top() ?> - <ul class="gPager"> + <ul class="g-pager"> <li> <? if ($previous_item): ?> <a href="<?= $previous_item->url() ?>" class="g-button ui-icon-left ui-state-default ui-corner-all"> @@ -25,7 +25,7 @@ <span class="ui-icon ui-icon-triangle-1-w"></span><?= t("previous") ?></a> <? endif; ?> </li> - <li class="gInfo"><?= t("%position of %total", array("position" => $position, "total" => $sibling_count)) ?></li> + <li class="g-info"><?= t("%position of %total", array("position" => $position, "total" => $sibling_count)) ?></li> <li class="g-txt-right"> <? if ($next_item): ?> <a href="<?= $next_item->url() ?>" class="g-button ui-icon-right ui-state-default ui-corner-all"> @@ -37,20 +37,20 @@ </li> </ul> - <div id="gPhoto"> + <div id="g-photo"> <?= $theme->resize_top($item) ?> <? if (access::can("view_full", $item)): ?> - <a href="<?= $item->file_url() ?>" class="gFullSizeLink" title="<?= t("View full size")->for_html_attr() ?>"> + <a href="<?= $item->file_url() ?>" class="g-fullsize-link" title="<?= t("View full size")->for_html_attr() ?>"> <? endif ?> - <?= $item->resize_img(array("id" => "gPhotoId-{$item->id}", "class" => "gResize")) ?> + <?= $item->resize_img(array("id" => "g-photoId-{$item->id}", "class" => "g-resize")) ?> <? if (access::can("view_full", $item)): ?> </a> <? endif ?> <?= $theme->resize_bottom($item) ?> - <?= $theme->context_menu($item, "#gPhotoId-{$item->id}") ?> + <?= $theme->context_menu($item, "#g-photoId-{$item->id}") ?> </div> - <div id="gInfo"> + <div id="g-info"> <h1><?= html::purify($item->title) ?></h1> <div><?= nl2br(html::purify($item->description)) ?></div> </div> diff --git a/themes/wind/views/sidebar.html.php b/themes/wind/views/sidebar.html.php index 04379eb6..d2551c52 100644 --- a/themes/wind/views/sidebar.html.php +++ b/themes/wind/views/sidebar.html.php @@ -1,7 +1,7 @@ <?php defined("SYSPATH") or die("No direct script access.") ?> <?= $theme->sidebar_top() ?> -<div class="gToolbar"> - <div id="gViewMenu" class="gButtonSet"> +<div class="g-toolbar"> + <div id="g-view-menu" class="g-buttonset"> <? if ($page_type == "album"):?> <?= $theme->album_menu() ?> <? elseif ($page_type == "photo") : ?> |
