diff --git a/build.gradle b/build.gradle index 6025fa9..412e93e 100644 --- a/build.gradle +++ b/build.gradle @@ -26,7 +26,7 @@ def version() { jar { baseName = 'davos' - version = version() + version = '0.0.1-SNAPSHOT' } sourceCompatibility = 1.8 diff --git a/src/main/resources/static/css/davos.css b/src/main/resources/static/css/davos.css index 648c536..9ebff60 100644 --- a/src/main/resources/static/css/davos.css +++ b/src/main/resources/static/css/davos.css @@ -1,52 +1,19 @@ -#main-nav { - position: fixed; - height: 100%; - width: 250px; - box-shadow: 0 2px 5px 0 rgba(0, 0, 0, 0.16), 0 2px 10px 0 rgba(0, 0, 0, 0.12); -} -#logo { - width: 100%; - height: 200px; - position: relative; -} -#navigation ul li { - line-height: 50px; - margin: 5px 0; - cursor: pointer; - font-size: 15px; - font-weight: 300; - position: relative; -} -#navigation ul li a { - display: block; - padding-left: 45px; - color: #666; -} -#navigation ul li.active, -#navigation ul li.active:hover { - background-color: #80cbc4; - font-weight: 500; - color: #fff; -} -#navigation ul li.active a { - color: #fff; -} -#navigation ul li i.material-icons { - position: absolute; - font-size: 25px; - margin: auto; - height: 25px; - width: 25px; - top: 0; - bottom: 0; - left: 10px; -} -#navigation ul li:hover { - background-color: #efefef; -} html { color: #666; } +nav ul li { + padding: 0 15px; +} +nav ul li.active { + background-color: rgba(0, 0, 0, 0.1); +} +nav ul a { + padding: 0 15px 0 0; +} +nav .brand-logo { + padding: 0 15px; + font-weight: 300; +} #logo-text { font-size: 40px; color: #666; @@ -57,20 +24,12 @@ html { top: 0; bottom: 0; } -main { - padding-left: 250px; -} h1.header { color: #fff; } h2.header { color: #80cbc4; } -@media only screen and (min-width: 993px) { - .container { - width: 85%; - } -} span.badge.info { font-weight: 300; font-size: 0.8rem; @@ -83,15 +42,12 @@ span.badge.info.idle { span.badge.info.idle:after { content: "Idle"; } - span.badge.info.in-progress:after { content: "Download in Progress"; } - span.badge.info.in-progress { background-color: #26a69a; } - a.collection-item.schedule { font-weight: 300; color: #666; @@ -99,26 +55,40 @@ a.collection-item.schedule { .collapsible-body { padding: 40px } - .collapsible-header { position: relative; } - .subtext { font-size: 12px; - padding: 10px !important; } - .chip { margin-bottom: 10px; } - .action_type { text-transform: capitalize; font-weight: 500; } - .remove_action { cursor: pointer; font-size: 16px; -} \ No newline at end of file +} +.card-image i { + font-size: 250px; + color: #fff; + position: absolute; + right: 0; + top: -50px; + opacity: 0.3; +} +.heading { + margin-bottom: 30px; +} +.side-nav i { + color: #666; +} +a.button-collapse > i { + margin-left: 15px; +} +.card.small { + height: 210px; +} diff --git a/src/main/resources/static/js/davos.js b/src/main/resources/static/js/davos.js index 9399fb5..3fbea25 100644 --- a/src/main/resources/static/js/davos.js +++ b/src/main/resources/static/js/davos.js @@ -61,22 +61,22 @@ var action = (function ($) { addMove = function () { - var newAction = $('
move
close
'); + var newAction = $('
move
close
'); $('#download_actions').append(newAction); }; addPushbullet = function () { - var newAction = $('
pushbullet
close
'); + var newAction = $('
pushbullet
close
'); $('#download_actions').append(newAction); }; addApi = function () { - var newAction = $('
api

' + + var newAction = $('
api

' + '


close
'); + ' placeholder="Message body" class="f4" />
close
'); $('#download_actions').append(newAction); }; diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html index f475c14..30089d1 100644 --- a/src/main/resources/templates/index.html +++ b/src/main/resources/templates/index.html @@ -13,21 +13,26 @@
-
@@ -43,6 +48,11 @@ + diff --git a/src/main/resources/templates/scheduling.html b/src/main/resources/templates/scheduling.html index f942d89..18806ef 100644 --- a/src/main/resources/templates/scheduling.html +++ b/src/main/resources/templates/scheduling.html @@ -6,6 +6,8 @@ + Scheduling + @@ -13,49 +15,54 @@
-
+ +
-
-
-
-
-

Scheduling

-

Create and configure automated downloads

-
-
-
-
-

A schedule allows you to create automated processes that poll a given FTP server based on a pre-defined interval. Schedules are especially useful when you need to download files on a regular basis from any given server. They are highly configurable, with the ability to filter down the kinds of files the schedule pulls down, as well - as completion hooks which allow you to define what happens when a file has successfully finished downloading.

+

A schedule allows you to create automated processes that poll a given FTP server based on a pre-defined interval. Schedules are especially useful when you need to download files on a regular basis from any given server. They are highly configurable, with the ability to filter down the kinds of files the schedule pulls down, as well as completion hooks which allow you to define what happens when a file has successfully finished downloading.

Current Schedules

-
- +
+
+ +
+
+ schedule + +
+
+ Edit +
+
+
@@ -76,9 +83,10 @@ - diff --git a/src/main/resources/templates/schedulingedit.html b/src/main/resources/templates/schedulingedit.html index 505f547..12a5d2e 100644 --- a/src/main/resources/templates/schedulingedit.html +++ b/src/main/resources/templates/schedulingedit.html @@ -15,35 +15,31 @@
-
-
-
-
-
-

Edit

-

Configure your schedule

-
-
-
-
@@ -51,243 +47,231 @@

-

Click on the list items below to edit the schedule

+
+
+ +
+
settings_applicationsGeneral
+
+ +
+ +
+ + +
+
+

+ Give this schedule a meaningful name so you know what its purpose is. +

+
+
+ +
+
+ + Start Automatically +
+
+

+ Select this if you want this schedule to automatically start when davos starts. This is a useful option if davos needs to restart and you don't want to have to manually kick off this process. +

-
    -
  • -
    settings_applicationsGeneral
    -
    +
    + +
    +
    +

    + The interval that defines how often this schedule will poll the server to check for new files. +

    +
    +
    -
    +
    +
    businessServer
    +
    -
    - - -
    -
    -

    - Give this schedule a meaningful name so you know what its purpose is. -

    -
    -
    +
    +
    + + +
    +
    + + +
    +
    + + +
    +
    -
    -
    - - Start Automatically -
    -
    -

    - Select this if you want this schedule to automatically start when davos starts. This is a useful option if davos needs to restart and you don't want to have to manually kick off this process. -

    -
    -
    +
    -
    +
    + business + + +
    +
    + settings_input_svideo + + +
    +
    +
    +
    + perm_identity + + +
    +
    + vpn_key + + +
    +
    +
    +
    + track_changes + + +
    +
    + play_for_work + + +
    +
    -
    - -
    -
    -

    - The interval that defines how often this schedule will poll the server to check for new files. -

    -
    -
    +
    +
    swap_vertFile Transfers
    +
    + +
    +
    + + +
    +
    +

    + Only download files in the remote folder. Ignore sub-folders. +

    +
    +
    +
    +
    + + +
    +
    +

    + Look inside any sub-folders in the remote folder. If any files are found, download them. +

    +
    +
    + +
    +
    sort_by_alphaFilters
    +
    + +
    +
    +

    + If you do not want davos to pull down all recent files from the server during the next scheduled run, please define a filter (or more). A filter works by telling davos that a file must adhere to a particular naming structure (file name or extension) before it decides to download it. For example, if you only want the schedule to download .doc files, you should enter a filter of *.doc. You may use a question mark (?) to denote a single wildcard character, or an asterisk (*) to denote any number of wildcard characters. +

    + +
    + +
    +
    + + +
    +
    + +
    +
    + +
    +
    + +
    + + + close
    -
    • -
  • -
    businessServer
    -
    -
    -
    - - -
    -
    - - -
    -
    - - -
    -
    -
    -
    +
    +
    +
-
- business - - -
-
- settings_input_svideo - - -
-
-
-
- perm_identity - - -
-
- vpn_key - - -
-
-
-
- track_changes - - -
-
- play_for_work - - -
-
+
+
codePost-Download Actions
+
-
- -
  • -
    swap_vertFile Transfers
    -
    -
    -
    - - -
    -
    -

    - Only download files in the remote folder. Ignore sub-folders. -

    -
    -
    -
    -
    - - -
    -
    -

    - Look inside any sub-folders in the remote folder. If any files are found, download them. -

    -
    -
    -
    -
    • -
  • -
    sort_by_alphaFilters
    -
    -
    -
    -
    -

    - If you do not want davos to pull down all recent files from the server during the next scheduled run, please define a filter (or more). A filter works by telling davos that a file must adhere to a particular naming structure (file name or extension) before it decides to download it. For example, if you only want the schedule to download .doc files, you should enter a filter of *.doc. You may use a question mark (?) to denote a single wildcard character, or an asterisk (*) to denote any number of wildcard characters. -

    +
    +
    +

    + Add actions for davos to perform after each file has been successfully downloaded. +

    +
    +
    -
    +
    -
    -
    - - -
    -
    - -
    -
    +
    + -
    -
    +
    +
    -
    - - - close -
    +
    +
    -
    -
    - -
    -
    -
    • -
  • -
    codePost-download Actions
    -
    -
    -
    -

    - Add actions for davos to perform after each file has been successfully downloaded. -

    -
    -
    +
    -
    +
    + +
    -
    - +
    + +
    -
    -
    +
    + +
    + +
    + +
    + +
    +
    -
    - -
    - -
    - -
    - -
    - -
    - -
    - -
    - -
    - -
    - -
    -
    - -
    close
    - -
    - -
    -
    • - +
    close
    +
    @@ -309,7 +293,9 @@