diff --git a/modules/storm/stormtask/stormtask.admin.inc b/modules/storm/stormtask/stormtask.admin.inc index 1e6a253..4ccd6d3 100644 --- a/modules/storm/stormtask/stormtask.admin.inc +++ b/modules/storm/stormtask/stormtask.admin.inc @@ -41,9 +41,11 @@ function stormtask_tasks($project) { ), array( 'data' => t('Parent'), + 'class' => 'coldrag', ), array( 'data' => t('Weight'), + 'class' => 'coldrag', ), array( 'data' => storm_icon_add_node($i, $params), diff --git a/modules/user/user.module b/modules/user/user.module index 6cd3afa..54abc73 100644 --- a/modules/user/user.module +++ b/modules/user/user.module @@ -1327,6 +1327,8 @@ function user_login(&$form_state) { $form['#validate'] = user_login_default_validators(); $form['submit'] = array('#type' => 'submit', '#value' => t('Log in'), '#weight' => 2); + drupal_add_js('$jq(function(){$("#edit-name").focus();});', 'inline', 'footer'); + return $form; } diff --git a/themes/zuitedesk/css/global.css b/themes/zuitedesk/css/global.css index b07afdc..a2031ef 100644 --- a/themes/zuitedesk/css/global.css +++ b/themes/zuitedesk/css/global.css @@ -557,7 +557,7 @@ html.js .js-hide { } #access-rules .mask { clear: both; -} */ +} #user-login-form { padding-top: 10px; @@ -582,8 +582,7 @@ html.js .js-hide { margin: .5em 0; padding: 6px 12px; background-color: #eaeaea; - border: 1px solid #aaa; /* - border-radius: 4px; */ + border: 1px solid #aaa; cursor: pointer; font-size: 14px; line-height: 1.42857; @@ -598,6 +597,14 @@ html.js .js-hide { color: #fff; background-color: #ccc; } +*/ +#user-pass #edit-submit { + width: 100%; + margin-top: 30px; +} +#user-login #edit-submit { + margin-top: 30px; +} #user-admin-filter ul { list-style: none; diff --git a/themes/zuitedesk/css/pages.css b/themes/zuitedesk/css/pages.css index aa10dfb..1738472 100644 --- a/themes/zuitedesk/css/pages.css +++ b/themes/zuitedesk/css/pages.css @@ -55,6 +55,42 @@ body.elfinder { } } +/* + * Login page layout. + */ +body.not-logged-in[class*="page-user"] { + background: #ebeae9 url(../images/bg-login.jpg) no-repeat fixed center center; + background-size: cover; +} +body.not-logged-in[class*="page-user"] #main { + margin: 30px auto 0; + max-width: 400px; + padding: 20px; + background: rgba(252, 255, 255, 0.85); +} +body.not-logged-in[class*="page-user"] #main-content { + padding: 0; +} +body.not-logged-in[class*="page-user"] #main-content .section { + background: transparent; + min-height: inherit; + padding-bottom: 0; +} +body.not-logged-in[class*="page-user"] #page, +body.not-logged-in[class*="page-user"] #page-wrapper, +body.not-logged-in[class*="page-user"] #main-wrapper, +body.not-logged-in[class*="page-user"] #main-content div.tabs { + background: transparent; +} +body.not-logged-in[class*="page-user"] #page-title { + display: none; +} +body.not-logged-in[class*="page-user"] #socket { + width: 100%; + position: absolute; + bottom: 0; +} + /* * Header. */ diff --git a/themes/zuitedesk/css/suitedesk.css b/themes/zuitedesk/css/suitedesk.css index f8dd77d..cd06bb0 100644 --- a/themes/zuitedesk/css/suitedesk.css +++ b/themes/zuitedesk/css/suitedesk.css @@ -666,6 +666,10 @@ table#tasks tr td > div.form-item > select.form-control { height: auto; font-size: 12px; } +table#tasks tr th.coldrag, +table#tasks tr td > div.form-item > select.form-control { + display: none; +} /* * "SuiteDesk Tasks" Kanban. diff --git a/themes/zuitedesk/images/bg-login.jpg b/themes/zuitedesk/images/bg-login.jpg new file mode 100644 index 0000000..59d1f83 Binary files /dev/null and b/themes/zuitedesk/images/bg-login.jpg differ diff --git a/themes/zuitedesk/images/frontpage/About.png b/themes/zuitedesk/images/frontpage/About.png deleted file mode 100644 index e65d9ef..0000000 Binary files a/themes/zuitedesk/images/frontpage/About.png and /dev/null differ diff --git a/themes/zuitedesk/images/frontpage/Client1.png b/themes/zuitedesk/images/frontpage/Client1.png deleted file mode 100644 index 583c514..0000000 Binary files a/themes/zuitedesk/images/frontpage/Client1.png and /dev/null differ diff --git a/themes/zuitedesk/images/frontpage/Client2.png b/themes/zuitedesk/images/frontpage/Client2.png deleted file mode 100644 index 583c514..0000000 Binary files a/themes/zuitedesk/images/frontpage/Client2.png and /dev/null differ diff --git a/themes/zuitedesk/images/frontpage/Client3.png b/themes/zuitedesk/images/frontpage/Client3.png deleted file mode 100644 index 583c514..0000000 Binary files a/themes/zuitedesk/images/frontpage/Client3.png and /dev/null differ diff --git a/themes/zuitedesk/images/frontpage/SuiteCRM.png b/themes/zuitedesk/images/frontpage/Costs.png similarity index 100% rename from themes/zuitedesk/images/frontpage/SuiteCRM.png rename to themes/zuitedesk/images/frontpage/Costs.png diff --git a/themes/zuitedesk/images/frontpage/Gitlab.png b/themes/zuitedesk/images/frontpage/Invoicing.png similarity index 100% rename from themes/zuitedesk/images/frontpage/Gitlab.png rename to themes/zuitedesk/images/frontpage/Invoicing.png diff --git a/themes/zuitedesk/images/frontpage/Portfolio01.png b/themes/zuitedesk/images/frontpage/Portfolio01.png deleted file mode 100644 index 0ed024c..0000000 Binary files a/themes/zuitedesk/images/frontpage/Portfolio01.png and /dev/null differ diff --git a/themes/zuitedesk/images/frontpage/Portfolio02.png b/themes/zuitedesk/images/frontpage/Portfolio02.png deleted file mode 100644 index 0ed024c..0000000 Binary files a/themes/zuitedesk/images/frontpage/Portfolio02.png and /dev/null differ diff --git a/themes/zuitedesk/images/frontpage/Portfolio03.png b/themes/zuitedesk/images/frontpage/Portfolio03.png deleted file mode 100644 index 0ed024c..0000000 Binary files a/themes/zuitedesk/images/frontpage/Portfolio03.png and /dev/null differ diff --git a/themes/zuitedesk/images/frontpage/Portfolio04.png b/themes/zuitedesk/images/frontpage/Portfolio04.png deleted file mode 100644 index 0ed024c..0000000 Binary files a/themes/zuitedesk/images/frontpage/Portfolio04.png and /dev/null differ diff --git a/themes/zuitedesk/images/frontpage/Portfolio05.png b/themes/zuitedesk/images/frontpage/Portfolio05.png deleted file mode 100644 index 0ed024c..0000000 Binary files a/themes/zuitedesk/images/frontpage/Portfolio05.png and /dev/null differ diff --git a/themes/zuitedesk/images/frontpage/Portfolio06.png b/themes/zuitedesk/images/frontpage/Portfolio06.png deleted file mode 100644 index 0ed024c..0000000 Binary files a/themes/zuitedesk/images/frontpage/Portfolio06.png and /dev/null differ diff --git a/themes/zuitedesk/images/frontpage/Slider.jpg b/themes/zuitedesk/images/frontpage/Slider.jpg deleted file mode 100644 index 28921ed..0000000 Binary files a/themes/zuitedesk/images/frontpage/Slider.jpg and /dev/null differ diff --git a/themes/zuitedesk/images/frontpage/Slider.png b/themes/zuitedesk/images/frontpage/Slider.png deleted file mode 100644 index d145e15..0000000 Binary files a/themes/zuitedesk/images/frontpage/Slider.png and /dev/null differ diff --git a/themes/zuitedesk/images/frontpage/Team1.png b/themes/zuitedesk/images/frontpage/Team1.png deleted file mode 100644 index af40b11..0000000 Binary files a/themes/zuitedesk/images/frontpage/Team1.png and /dev/null differ diff --git a/themes/zuitedesk/images/frontpage/Team2.png b/themes/zuitedesk/images/frontpage/Team2.png deleted file mode 100644 index af40b11..0000000 Binary files a/themes/zuitedesk/images/frontpage/Team2.png and /dev/null differ diff --git a/themes/zuitedesk/images/frontpage/Team3.png b/themes/zuitedesk/images/frontpage/Team3.png deleted file mode 100644 index af40b11..0000000 Binary files a/themes/zuitedesk/images/frontpage/Team3.png and /dev/null differ diff --git a/themes/zuitedesk/images/frontpage/brand-bg.png b/themes/zuitedesk/images/frontpage/brand-bg.png deleted file mode 100644 index 6011cf3..0000000 Binary files a/themes/zuitedesk/images/frontpage/brand-bg.png and /dev/null differ diff --git a/themes/zuitedesk/images/frontpage/clients/ClientLogo01.png b/themes/zuitedesk/images/frontpage/clients/ClientLogo01.png deleted file mode 100644 index 66d275d..0000000 Binary files a/themes/zuitedesk/images/frontpage/clients/ClientLogo01.png and /dev/null differ diff --git a/themes/zuitedesk/images/frontpage/clients/ClientLogo02.png b/themes/zuitedesk/images/frontpage/clients/ClientLogo02.png deleted file mode 100644 index 66d275d..0000000 Binary files a/themes/zuitedesk/images/frontpage/clients/ClientLogo02.png and /dev/null differ diff --git a/themes/zuitedesk/images/frontpage/clients/ClientLogo03.png b/themes/zuitedesk/images/frontpage/clients/ClientLogo03.png deleted file mode 100644 index 66d275d..0000000 Binary files a/themes/zuitedesk/images/frontpage/clients/ClientLogo03.png and /dev/null differ diff --git a/themes/zuitedesk/images/frontpage/clients/ClientLogo04.png b/themes/zuitedesk/images/frontpage/clients/ClientLogo04.png deleted file mode 100644 index 66d275d..0000000 Binary files a/themes/zuitedesk/images/frontpage/clients/ClientLogo04.png and /dev/null differ diff --git a/themes/zuitedesk/images/frontpage/clients/ClientLogo05.png b/themes/zuitedesk/images/frontpage/clients/ClientLogo05.png deleted file mode 100644 index 66d275d..0000000 Binary files a/themes/zuitedesk/images/frontpage/clients/ClientLogo05.png and /dev/null differ diff --git a/themes/zuitedesk/images/frontpage/clients/ClientLogo06.png b/themes/zuitedesk/images/frontpage/clients/ClientLogo06.png deleted file mode 100644 index 05c28bc..0000000 Binary files a/themes/zuitedesk/images/frontpage/clients/ClientLogo06.png and /dev/null differ diff --git a/themes/zuitedesk/template.php b/themes/zuitedesk/template.php index 18889f7..4f20c73 100644 --- a/themes/zuitedesk/template.php +++ b/themes/zuitedesk/template.php @@ -497,7 +497,7 @@ function zuitedesk_table($header, $rows, $attributes = array(), $caption = NULL) $attributes['class'] = 'table table-condensed' . (!empty($attributes['class']) ? ' ' . $attributes['class'] : ''); } if (arg(0) == 'admin' || substr($attributes['id'], 0, 5) == 'storm' || in_array($attributes['id'], array('attributes', 'tasks', 'twatcher'))) { - $attributes['class'] .= ' table-hover'; + $attributes['class'] .= (empty($attributes['class']) ? '' : ' ') . 'table-hover'; return '
' . theme_table($header, $rows, $attributes, $caption) . '
'; } return theme_table($header, $rows, $attributes, $caption); diff --git a/themes/zuitedesk/templates/page-front.tpl.php b/themes/zuitedesk/templates/page-front.tpl.php index 8706400..12a589d 100644 --- a/themes/zuitedesk/templates/page-front.tpl.php +++ b/themes/zuitedesk/templates/page-front.tpl.php @@ -97,7 +97,7 @@ if ($site_name) print '

-

'SuiteDesk')); ?>

+

'SuiteDesk')); ?>

<?php print t('Welcome to SuiteDesk'); ?> @@ -139,7 +139,7 @@ if ($site_name) print '
-

+

@@ -181,10 +181,10 @@ if ($site_name) print '
-

Doks

+

-

+

Doks are documents and knowledge'); ?>
With hyperlinking and taxonomies'); ?>
@@ -219,6 +219,50 @@ if ($site_name) print '
+
+ CRM +
+
+
+
+

+ +
+

+
+
Log spent effort to the detail you need'); ?>
+
Monitor how much time you have spent on your activities'); ?>
+
Reports to control de cost of your projects'); ?>
+
Plan the cost for each project phase'); ?>
+
+
+
+
+ + +
+
+ <?php print 'I love Gitlab'; ?> +
+
+
+
+

+ +
+

+
+
Compile invoices according to the work done'); ?>
+
Time billing and automated invoicing'); ?>
+
Choose which units to include: hours, days, fixed'); ?>
+
View lists for both billable and unbilled items'); ?>
+
+
+
+
+ + +
<?php print 'Responsive Design'; ?>
@@ -239,50 +283,6 @@ if ($site_name) print '
- -
-
- CRM -
-
-
-
-

- -
-

-
-
Track all accounts and related contacts'); ?>
-
Never lose track of an important email'); ?>
-
Create and execute campaigns'); ?>
-
Close deals and keep customers happy'); ?>
-
-
-
-
- - -
-
- <?php print 'I love Gitlab'; ?> -
-
-
-
-

I ♥ Gitlab

- -
-

-
-
Git advanced repository management'); ?>
-
Code reviews with activity feeds'); ?>
-
Fine grained access controls'); ?>
-
' . t('Link') . ' https://gitlab.cillero.es'; ?>
-
-
-
-
-
-
  • +
  • - <?php print 'Responsive Design'; ?> + CRM -

    -

    -
    -
    -
    • -
  • -
    - CRM - - - -

    CRM

    -

    +

    +

  • - <?php print 'I love Gitlab'; ?> + <?php print 'I love Gitlab'; ?> + + + +

    +

    +
    +
    +
    • +
  • +
    + <?php print 'Responsive Design'; ?> -

    I ♥ Gitlab

    -

    +

    +

    • diff --git a/themes/zuitedesk/zuitedesk.info b/themes/zuitedesk/zuitedesk.info index b60c4e8..d2ebe54 100644 --- a/themes/zuitedesk/zuitedesk.info +++ b/themes/zuitedesk/zuitedesk.info @@ -1,6 +1,6 @@ name = SuiteDesk Theme description = SuiteDesk Theme Zen. -version = 0.2.61 +version = 0.2.62 screenshot = screenshot.png