diff --git a/app/views/contact_us/contacts/new.html.erb b/app/views/contact_us/contacts/new.html.erb index bd68e8c..4d704f0 100644 --- a/app/views/contact_us/contacts/new.html.erb +++ b/app/views/contact_us/contacts/new.html.erb @@ -8,7 +8,7 @@ organisation_url: Rails.configuration.branding[:organisation][:url], application_name: Rails.configuration.branding[:application][:name]} %>

-
+
diff --git a/app/views/guidance_groups/admin_edit.html.erb b/app/views/guidance_groups/admin_edit.html.erb index 77146d5..4edeb0f 100644 --- a/app/views/guidance_groups/admin_edit.html.erb +++ b/app/views/guidance_groups/admin_edit.html.erb @@ -1,4 +1,3 @@ -<%= stylesheet_link_tag "admin" %> <% javascript 'admin.js' %>

@@ -16,6 +15,7 @@
+
<%= form_for(@guidance_group, url: admin_update_guidance_group_path(@guidance_group), html: {method: :put}) do |f| %> @@ -74,5 +74,6 @@
<% end %> + diff --git a/app/views/guidance_groups/admin_new.html.erb b/app/views/guidance_groups/admin_new.html.erb index 8ea92b8..922ab5d 100644 --- a/app/views/guidance_groups/admin_new.html.erb +++ b/app/views/guidance_groups/admin_new.html.erb @@ -1,4 +1,3 @@ -<%= stylesheet_link_tag "admin" %> <% javascript 'admin.js' %>

@@ -16,6 +15,7 @@
+
<%= form_for :guidance_group, url: {action: "admin_create"} do |f| %>

@@ -48,5 +48,6 @@
<% end %> + diff --git a/app/views/guidance_groups/admin_show.html.erb b/app/views/guidance_groups/admin_show.html.erb index d73054d..318e8f9 100644 --- a/app/views/guidance_groups/admin_show.html.erb +++ b/app/views/guidance_groups/admin_show.html.erb @@ -1,5 +1,3 @@ -<%= stylesheet_link_tag "admin" %> -

<%= _('Guidance group') %> @@ -16,7 +14,7 @@
- +

@@ -58,5 +56,6 @@ <%= link_to _('Back'), :back, class: "btn cancel" %>
+ \ No newline at end of file diff --git a/app/views/guidances/admin_edit.html.erb b/app/views/guidances/admin_edit.html.erb index 1a04cc8..4162018 100644 --- a/app/views/guidances/admin_edit.html.erb +++ b/app/views/guidances/admin_edit.html.erb @@ -1,4 +1,3 @@ -<%= stylesheet_link_tag "admin" %> <% javascript 'admin.js' %>

diff --git a/app/views/guidances/admin_index.html.erb b/app/views/guidances/admin_index.html.erb index 6010b35..ebd3bd6 100644 --- a/app/views/guidances/admin_index.html.erb +++ b/app/views/guidances/admin_index.html.erb @@ -1,4 +1,3 @@ -<%= stylesheet_link_tag "admin" %> <% javascript "admin.js" %> diff --git a/app/views/guidances/admin_new.html.erb b/app/views/guidances/admin_new.html.erb index f77a3f6..cea5678 100644 --- a/app/views/guidances/admin_new.html.erb +++ b/app/views/guidances/admin_new.html.erb @@ -1,4 +1,3 @@ -<%= stylesheet_link_tag "admin" %> <% javascript 'admin.js' %>

diff --git a/app/views/guidances/admin_show.html.erb b/app/views/guidances/admin_show.html.erb index 4742641..08054c1 100644 --- a/app/views/guidances/admin_show.html.erb +++ b/app/views/guidances/admin_show.html.erb @@ -1,5 +1,3 @@ -<%= stylesheet_link_tag "admin" %> -

<%= _('Guidance') %> diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb index 09bc946..4c6cbec 100644 --- a/app/views/layouts/_header.html.erb +++ b/app/views/layouts/_header.html.erb @@ -3,7 +3,7 @@
@@ -11,13 +11,12 @@ <%= render "layouts/branding" %>
- -
<%= render "layouts/navigation" %>
+ diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 3aacad1..b569d9c 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -1,85 +1,91 @@ - - <%= _('%{application_name}') % { :application_name => Rails.configuration.branding[:application][:name] } %> + + <%= _('%{application_name}') % { :application_name => Rails.configuration.branding[:application][:name] } %> <%= favicon_link_tag "favicon.ico" %> - - - + + + - <%= stylesheet_link_tag "application" %> - <%= javascript_include_tag "application"%> - - <%= javascript_include_tag "jquery.tablesorter"%> - - + // Set the JS locale equal to the one Rails has + I18n.defaultLocale = "<%= I18n.default_locale %>"; + I18n.locale = "<%= I18n.locale %>"; + - + - <%= yield(:head) %> - <%= csrf_meta_tags %> + <%= yield(:head) %> + <%= csrf_meta_tags %> - - - - - - - + + + + + + + - - <%= render "layouts/header" %> - + + <%= render "layouts/header" %> + -
- <% if notice || flash[:notice] %> -

<%= raw notice %>

- <% end %> - <% if alert || flash[:alert] || flash[:error] %> -

<%= raw alert %>

- <% end %> - -
- <%= yield %> -
-
+
+ <% if notice || flash[:notice] %> +
+ + <%= raw notice %> +
+ <% end %> + <% if alert || flash[:alert] || flash[:error] %> +
+ + <%= raw alert %> +
+ <% end %> + +
+ <%= yield %> +
+
- - <%= render "layouts/footer" %> - - + + <%= render "layouts/footer" %> + + diff --git a/app/views/orgs/admin_edit.html.erb b/app/views/orgs/admin_edit.html.erb index adbc664..4530930 100644 --- a/app/views/orgs/admin_edit.html.erb +++ b/app/views/orgs/admin_edit.html.erb @@ -1,4 +1,3 @@ -<%= stylesheet_link_tag "admin" %> <% javascript 'admin.js' %>

@@ -8,6 +7,7 @@
+
<%= form_for(@org, url: admin_update_org_path(@org), html: { multipart: true, id: "edit_org_details", method: :put}) do |f| %> @@ -75,7 +75,7 @@ <%= link_to _('Cancel'), :back, class: 'btn btn-primary' %>
<% end %> - +
diff --git a/app/views/orgs/admin_show.html.erb b/app/views/orgs/admin_show.html.erb index fffd4ef..c966805 100644 --- a/app/views/orgs/admin_show.html.erb +++ b/app/views/orgs/admin_show.html.erb @@ -1,5 +1,3 @@ -<%= stylesheet_link_tag "admin" %> -

<%= _('Organisation details') %>

@@ -9,7 +7,7 @@
- +
<%= _('Name') %>
<% if @org.name.present? then %> @@ -78,5 +76,6 @@ <%= link_to _('Edit'), admin_edit_org_path(current_user.org), class: 'btn btn-primary'%>
+ \ No newline at end of file diff --git a/app/views/phases/admin_add.html.erb b/app/views/phases/admin_add.html.erb index 72a9a66..91cd45e 100644 --- a/app/views/phases/admin_add.html.erb +++ b/app/views/phases/admin_add.html.erb @@ -1,5 +1,4 @@ <%- model_class = Phase -%> -<%= stylesheet_link_tag "admin" %> <% javascript "admin.js" %>

diff --git a/app/views/phases/admin_preview.html.erb b/app/views/phases/admin_preview.html.erb index 59ce2d0..95b1b6a 100644 --- a/app/views/phases/admin_preview.html.erb +++ b/app/views/phases/admin_preview.html.erb @@ -1,5 +1,4 @@ <%- model_class = Phase -%> -<%= stylesheet_link_tag "admin" %>

<%= @template.title %> diff --git a/app/views/phases/admin_show.html.erb b/app/views/phases/admin_show.html.erb index 321ac60..9ccde64 100644 --- a/app/views/phases/admin_show.html.erb +++ b/app/views/phases/admin_show.html.erb @@ -1,5 +1,4 @@ <%- model_class = Phase -%> -<%= stylesheet_link_tag "admin" %> <% javascript 'admin.js' %> <%= tinymce %> diff --git a/app/views/static_pages/about_us.html.erb b/app/views/static_pages/about_us.html.erb index b0e80a9..386420e 100644 --- a/app/views/static_pages/about_us.html.erb +++ b/app/views/static_pages/about_us.html.erb @@ -1,5 +1,3 @@ -<% javascript 'static_pages/utils.js' %> -

<%= _('About %{application_name}') % { :application_name => Rails.configuration.branding[:application][:name] } %>

diff --git a/app/views/static_pages/help.html.erb b/app/views/static_pages/help.html.erb index a2ad20a..c982d16 100644 --- a/app/views/static_pages/help.html.erb +++ b/app/views/static_pages/help.html.erb @@ -1,34 +1,24 @@ - -

<%= _('Help')%>

- -
-
-
+
+ + +
+
<%= raw _("

When you login to %{application_name} you will be directed to the 'My plans' page. From here you can edit, share, export or delete any of your plans. You will also see plans that have been shared with you by others.

Create a plan

To create a plan, click the 'Create plan' button from the 'My plans' page or the top menu. Select options from the drop-down menus and tickboxes to determine what questions and guidance you should be presented with. Confirm your selection by clicking 'Yes, create plan'

Write your plan

The tabbed interface allows you to navigate through different functions when editing your plan.

  • - 'Plan details' includes basic administrative details, tells you what sets of questions and guidance your plan is based on and gives you an overview to the questions that you will be asked.
  • - The following tab(s) present the questions to answer. There may be more than one tab if your funder or university asks different sets of questions at different stages e.g. at grant application and post-award.
  • - The 'Share' tab allows you to invite others to read or contribute to your plan.
  • - The 'Export' tab allows you to download your plan in various formats. This may be useful if you need to submit your plan as part of a grant application.

When viewing any of the question tabs, you will see the different sections of your plan displayed. Click into these in turn to answer the questions. You can format your responses using the text editing buttons.

Guidance is displayed in the right-hand panel. Click the '+' symbol to view this.

Remember to 'save' your responses before moving on.

Share plans

Insert the email address of any collaborators you would like to invite to read or edit your plan. Set the level of permissions you would like to grant them via the drop-down options and click to 'Add collaborator'

Export plans

From here you can download your plan in various formats. This may be useful if you need to submit your plan as part of a grant application. Choose what format you would like to view/download your plan in and click to export. When you login to %{application_name} you will be directed to the 'My plans' page. From here you can edit, share, export or delete any of your plans. You will also see plans that have been shared with you by others.

") % { :application_name => Rails.configuration.branding[:application][:name] } %>
-
+
<%= raw _("

Useful resources on Data Management Planning

Example Data Management Plans

  • Technical plan submitted to the AHRC [PDF, 7 pages]
    A DMP submitted by a researcher from the University of Bristol, also including comments from the reviewers
  • Two social science DMPs [PDF, 7 pages]
    Example plans from researchers at the University of Leeds, shared as part of the Leeds RoaDMaP training materials
  • Health sciences DMP [PDF, 11 pages]
    Example DMP produced by the DATUM for Health RDM training project
  • Psychology DMP [PDF, 11 pages]
    A very detailed, fictional psychology DMP produced by the DMTpsych RDM training project, based on a seminal psychology experiment
  • UCSD Example Data Management Plans [webpage]
    Over 20 example plans submitted to the National Science Foundation (NSF) in the United States by academics at UC San Diego
  • Colorado School of Mines examples [webpage]
    A variety of US example DMPs from Mines and elsewhere
  • NSF data management plans [webpage]
    5 DMPs submitted to the NSF, shared by the DataOne initiative
  • Biology and chemistry DMPs [webpage]
    Three example DMPs from the USA shared by NECDMC, an instructional tool for teaching RDM to undergraduates, graduate students, and researchers in the health sciences, sciences and engineering.

Useful guides on Research Data Management in general

  • Managing and Sharing Data: best practice for researchers [PDF, 36 pages]
    A guide by the UK Data Service covering a range of topics including data formats, documentaion, ethics, copyright and data sharing.
  • How to Cite Datasets and Link to Publications [PDF, 12 pages]
    A guide by the Digital Curation Centre giving practical guidelines on how to cite data and the different tools and infrastructure that can be used to support data citation.
  • How to License Research Data [PDF, 16 pages]
    A guide by the Digital Curation Centre that outlines different types of licenses, the pros and cons of each and how they can be applied.
  • How to Appraise and Select Research Data for Curation [PDF, 8 pages]
    A guide by ANDS and the Digital Curation Centre on how to select which data to keep for long-term preservation, sharing and reuse. The guide puts forward several criteria to aid selection decisions.
  • Research Data MANTRA [online resource]
    An online training course designed for researchers or others planning to manage digital data as part of the research process. The course includes a number of software practicals on using SPSS, R, ArcGIS and NVivo.
") % { :application_name => Rails.configuration.branding[:application][:name] } %>
diff --git a/app/views/static_pages/roadmap.html.erb b/app/views/static_pages/roadmap.html.erb index 9d9a0f2..c670f71 100644 --- a/app/views/static_pages/roadmap.html.erb +++ b/app/views/static_pages/roadmap.html.erb @@ -1,7 +1,5 @@ -<% javascript 'static_pages/utils.js' %> -

- <%= _('Future plans')%> + <%= _('Future plans')%>

@@ -17,24 +15,24 @@
-

<%= raw _("The %{organisation_abbreviation} are now collaborating to develop a joint codebase for Data Management Planning called") %> <%= Rails.configuration.branding[:application][:name] %>. <%= _("Both of our tools will be delivered using this in the future. We've agreed what features need to be included and are planning a few sprints to deliver these. The initial release will include all of the main priorities we already had flagged, including:

  • - APIs to create plans, extract guidance and generate statistics from %{application_name}
  • - Multi-lingual support so foreign language versions can be presented
  • - Locales to provide a refined set of content for particular countries or other contexts
  • - A lifecycle to indicate the status of DMPs and allow institutional access to plans
  • - Support for reviewing Data Management Plans

%{application_name} has an active and growing user base, and we are grateful to the members who suggest ideas for new and improved features. If you would like to help shape our future plans, please join the user group. More information on how you can engage with us is available under the 'Get involved' tab.


Current release

The current version of %{application_name} is %{application_version}.

The code is available on GitHub


") % { - :organisation_email => Rails.configuration.branding[:organisation][:email], - :organisation_abbreviation => Rails.configuration.branding[:organisation][:abbreviation], - :application_name => Rails.configuration.branding[:application][:name], - :application_url => Rails.configuration.branding[:application][:url], - :application_version => Rails.configuration.branding[:application][:version], - :application_release_notes_url => Rails.configuration.branding[:application][:release_notes_url] } %> -
+ <%= raw _("

The %{organisation_abbreviation} are now collaborating to develop a joint codebase for Data Management Planning called DMP Roadmap. Both of our tools will be delivered using this in the future. We've agreed what features need to be included and are planning a few sprints to deliver these. The initial release will include all of the main priorities we already had flagged, including:

  • - APIs to create plans, extract guidance and generate statistics from %{application_name}
  • - Multi-lingual support so foreign language versions can be presented
  • - Locales to provide a refined set of content for particular countries or other contexts
  • - A lifecycle to indicate the status of DMPs and allow institutional access to plans
  • - Support for reviewing Data Management Plans

%{application_name} has an active and growing user base, and we are grateful to the members who suggest ideas for new and improved features. If you would like to help shape our future plans, please join the user group. More information on how you can engage with us is available under the 'Get involved' tab.


Current release

The current version of %{application_name} is %{application_version}.

The code is available on GitHub


") % { + :organisation_email => Rails.configuration.branding[:organisation][:email], + :organisation_abbreviation => Rails.configuration.branding[:organisation][:abbreviation], + :application_name => Rails.configuration.branding[:application][:name], + :application_url => Rails.configuration.branding[:application][:url], + :application_version => Rails.configuration.branding[:application][:version], + :application_release_notes_url => Rails.configuration.branding[:application][:release_notes_url] } %> +
- <%= raw _("

%{application_name} is developed and maintained by the UK %{organisation_name}. We’re a small team, and are happy to collaborate with others. There are various ways you can get involved:

Join the user group

We run a listserv for the %{application_name} user group that you can request to join. We also host periodic meetings to consult on our plans. Being part of the user group gives you the opportunity to be informed about future developments and to provide feedback to help shape our plans.

Our user group sessions are usually focused around a certain topic (e.g. fleshing out use cases for an API) so invites are sent based on your areas of expertise. It is helpful for us to know your role and interests to invite relevant people to each session. Please introduce yourself on the list and share your ideas.

Notes from previous user group sessions are provided below:

Please let us know your interests and share your ideas for future developments via the mailing list so the community as a whole can feedback on them.


Customise %{application_name}

%{application_name} can be customised by institutions and disciplines. You can add templates for users in your organisation and tailored guidance that explains local support and services. Example answers can also be offered to help users understand what to write in a Data Management Plan. To do this you’ll need to request admin access, so please email us on dmponline@dcc.ac.uk.

Futher guidance on customising %{application_name} is available on the %{application_name} website.


Contribute to the code

%{application_name} is a Ruby on Rails application. The source code is made available under an MIT License. This permits others to reuse the code freely, but obligates you to share the source code for any extensions in the same way. Please inform us if you install an instance of %{application_name} and offer your contributions back to the community.

If you install an instance of %{application_name} we require that you credit the %{organisation_abbreviation} as originators of the tool. We recommend that the acknowledgement takes the form of the %{application_name} logo with a link back to the %{organisation_abbreviation}-hosted version of the tool.

We are willing to work with external developers to add new features to the tool. We are also open to delivering new features on a chargeable basis. If there are extensions you would like to see prioritised and have resource to support additional developer effort, please contact us on dmponline@dcc.ac.uk to negotiate terms.

The code is available on GitHub

Support our work

We are impressed by the uptake of %{application_name} both in the UK and internationally and are really keen to hear how you are using the tool and promoting it in your context. We are aware that others have run training courses, developed guidance materials and advocated use of the tool. Please notify us of this as it helps to show impact.

We are currently investigating options for revenue generation. This will help us serve the increased demand more effectively and safeguard the long-term sustainability of %{application_name}. Plans will be released for consultation soon but we also welcome your suggestions on how best to support our work.

") % { - organisation_name: Rails.configuration.branding[:organisation][:name], - organisation_email: Rails.configuration.branding[:organisation][:email], - organisation_url: Rails.configuration.branding[:organisation][:url], - organisation_abbreviation: Rails.configuration.branding[:organisation][:abbreviation], - application_name: Rails.configuration.branding[:application][:name], - application_url: Rails.configuration.branding[:application][:url], - application_user_group_subscription_url: Rails.configuration.branding[:application][:user_group_subscription_url] } %> -
-
+ <%= raw _("

%{application_name} is developed and maintained by the UK %{organisation_name}. We’re a small team, and are happy to collaborate with others. There are various ways you can get involved:

Join the user group

We run a listserv for the %{application_name} user group that you can request to join. We also host periodic meetings to consult on our plans. Being part of the user group gives you the opportunity to be informed about future developments and to provide feedback to help shape our plans.

Our user group sessions are usually focused around a certain topic (e.g. fleshing out use cases for an API) so invites are sent based on your areas of expertise. It is helpful for us to know your role and interests to invite relevant people to each session. Please introduce yourself on the list and share your ideas.

Notes from previous user group sessions are provided below:

Please let us know your interests and share your ideas for future developments via the mailing list so the community as a whole can feedback on them.


Customise %{application_name}

%{application_name} can be customised by institutions and disciplines. You can add templates for users in your organisation and tailored guidance that explains local support and services. Example answers can also be offered to help users understand what to write in a Data Management Plan. To do this you’ll need to request admin access, so please email us on dmponline@dcc.ac.uk.

Futher guidance on customising %{application_name} is available on the %{application_name} website.


Contribute to the code

%{application_name} is a Ruby on Rails application. The source code is made available under an MIT License. This permits others to reuse the code freely, but obligates you to share the source code for any extensions in the same way. Please inform us if you install an instance of %{application_name} and offer your contributions back to the community.

If you install an instance of %{application_name} we require that you credit the %{organisation_abbreviation} as originators of the tool. We recommend that the acknowledgement takes the form of the %{application_name} logo with a link back to the %{organisation_abbreviation}-hosted version of the tool.

We are willing to work with external developers to add new features to the tool. We are also open to delivering new features on a chargeable basis. If there are extensions you would like to see prioritised and have resource to support additional developer effort, please contact us on dmponline@dcc.ac.uk to negotiate terms.

The code is available on GitHub

Support our work

We are impressed by the uptake of %{application_name} both in the UK and internationally and are really keen to hear how you are using the tool and promoting it in your context. We are aware that others have run training courses, developed guidance materials and advocated use of the tool. Please notify us of this as it helps to show impact.

We are currently investigating options for revenue generation. This will help us serve the increased demand more effectively and safeguard the long-term sustainability of %{application_name}. Plans will be released for consultation soon but we also welcome your suggestions on how best to support our work.

") % { + organisation_name: Rails.configuration.branding[:organisation][:name], + organisation_email: Rails.configuration.branding[:organisation][:email], + organisation_url: Rails.configuration.branding[:organisation][:url], + organisation_abbreviation: Rails.configuration.branding[:organisation][:abbreviation], + application_name: Rails.configuration.branding[:application][:name], + application_url: Rails.configuration.branding[:application][:url], + application_user_group_subscription_url: Rails.configuration.branding[:application][:user_group_subscription_url] } %> +
+
\ No newline at end of file diff --git a/app/views/templates/admin_index.html.erb b/app/views/templates/admin_index.html.erb index 2acb25a..49dfcb3 100644 --- a/app/views/templates/admin_index.html.erb +++ b/app/views/templates/admin_index.html.erb @@ -1,5 +1,3 @@ -<%= stylesheet_link_tag "admin" %> -

<%= _('Templates') %>

diff --git a/app/views/templates/admin_new.html.erb b/app/views/templates/admin_new.html.erb index e180b4a..74223aa 100644 --- a/app/views/templates/admin_new.html.erb +++ b/app/views/templates/admin_new.html.erb @@ -1,4 +1,3 @@ -<%= stylesheet_link_tag "admin" %> <% javascript "admin.js" %>

diff --git a/app/views/templates/admin_template.html.erb b/app/views/templates/admin_template.html.erb index 77b956a..e8217ad 100644 --- a/app/views/templates/admin_template.html.erb +++ b/app/views/templates/admin_template.html.erb @@ -1,4 +1,3 @@ -<%= stylesheet_link_tag "admin" %> <% javascript 'admin.js' %>

diff --git a/app/views/templates/admin_template_history.html.erb b/app/views/templates/admin_template_history.html.erb index 95897a8..c845d66 100644 --- a/app/views/templates/admin_template_history.html.erb +++ b/app/views/templates/admin_template_history.html.erb @@ -1,5 +1,3 @@ -<%= stylesheet_link_tag "admin" %> -

<%= @template.title %>

diff --git a/app/views/users/admin_grant_permissions.html.erb b/app/views/users/admin_grant_permissions.html.erb index e15b781..9a7b4fd 100644 --- a/app/views/users/admin_grant_permissions.html.erb +++ b/app/views/users/admin_grant_permissions.html.erb @@ -1,5 +1,3 @@ -<%= stylesheet_link_tag "admin" %> -

<%= _('Edit User Privileges') %>

diff --git a/app/views/users/admin_index.html.erb b/app/views/users/admin_index.html.erb index 5a8a19c..0f81351 100644 --- a/app/views/users/admin_index.html.erb +++ b/app/views/users/admin_index.html.erb @@ -1,5 +1,3 @@ -<%= stylesheet_link_tag "admin" %> -

<%= _('List of users') %>

diff --git a/config/application.rb b/config/application.rb index 2999b56..9b3ab8e 100644 --- a/config/application.rb +++ b/config/application.rb @@ -83,8 +83,7 @@ roadmap-form.css roadmap-hacks.css) - config.assets.precompile += %w(roadmap.js - answers/status.js + config.assets.precompile += %w(answers/status.js devise/passwords/new.js devise/registrations/edit.js contacts/new_contact.js diff --git a/lib/assets/images/dcc_logo.png b/lib/assets/images/dcc_logo.png index 593a7dd..961e4bb 100644 --- a/lib/assets/images/dcc_logo.png +++ b/lib/assets/images/dcc_logo.png Binary files differ diff --git a/lib/assets/images/logo.jpg b/lib/assets/images/logo.jpg deleted file mode 100644 index b45a9a3..0000000 --- a/lib/assets/images/logo.jpg +++ /dev/null Binary files differ diff --git a/lib/assets/images/logo.png b/lib/assets/images/logo.png new file mode 100644 index 0000000..fdead19 --- /dev/null +++ b/lib/assets/images/logo.png Binary files differ diff --git a/lib/assets/images/uc3_logo.jpg b/lib/assets/images/uc3_logo.jpg index 46ac993..f29d8ec 100644 --- a/lib/assets/images/uc3_logo.jpg +++ b/lib/assets/images/uc3_logo.jpg Binary files differ diff --git a/lib/assets/javascripts/application.js b/lib/assets/javascripts/application.js index 35450e3..e33ba11 100644 --- a/lib/assets/javascripts/application.js +++ b/lib/assets/javascripts/application.js @@ -24,6 +24,7 @@ //= require jquery-accessible-autocomplet-list-aria.js //= require roadmap-utils.js //= require roadmap-form.js +//= require roadmap-tabs.js //= require shared/login_form.js //= require shared/register_form.js diff --git a/lib/assets/javascripts/roadmap-tabs.js b/lib/assets/javascripts/roadmap-tabs.js new file mode 100644 index 0000000..82f630f --- /dev/null +++ b/lib/assets/javascripts/roadmap-tabs.js @@ -0,0 +1,19 @@ +$(document).ready(function(){ + $(".tab-panels div.tab-panel:not(.active)").hide(); + + $("li[role='tab'] a").click(function(e){ + e.preventDefault(); + + // Unselect the other tabs + $("li[role='tab']").removeClass('active').children('a').attr('aria-selected', 'false'); + // Select the current tab + $(this).attr('aria-selected', 'true').parent().addClass('active'); + + // Display the corresponding panel + let panel = $($(this).attr("href")); + panel.show().attr("aria-hidden", 'false'); + $.each($(panel).siblings(), function(i, p){ + $(p).hide().attr("aria-hidden", 'true'); + }); + }); +}); \ No newline at end of file diff --git a/lib/assets/javascripts/static_pages/utils.js b/lib/assets/javascripts/static_pages/utils.js deleted file mode 100644 index 5e99ca3..0000000 --- a/lib/assets/javascripts/static_pages/utils.js +++ /dev/null @@ -1,19 +0,0 @@ -$(document).ready(function(){ - $(".tab-panels div.tab-panel:not(.active)").hide(); - - $("li[role='tab'] a").click(function(e){ - e.preventDefault(); - - // Unselect the other tabs - $("li[role='tab']").removeClass('active').children('a').attr('aria-selected', 'false'); - // Select the current tab - $(this).attr('aria-selected', 'true').parent().addClass('active'); - - // Display the corresponding panel - let panel = $($(this).attr("href")); - panel.show().attr("aria-hidden", 'false'); - $.each($(panel).siblings(), function(i, p){ - $(p).hide().attr("aria-hidden", 'true'); - }); - }); -}); diff --git a/lib/assets/stylesheets/roadmap-form.scss b/lib/assets/stylesheets/roadmap-form.scss index d8f854c..f32abfa 100644 --- a/lib/assets/stylesheets/roadmap-form.scss +++ b/lib/assets/stylesheets/roadmap-form.scss @@ -333,6 +333,9 @@ /* Sign in/Create account forms */ /* ------------------------------------------------ */ +#sign-in-panel, #create-account-panel { + width: 375px; +} .omniauth-options { display: block; width: 100%; diff --git a/lib/assets/stylesheets/roadmap-hacks.scss b/lib/assets/stylesheets/roadmap-hacks.scss index dd23cc9..2586ab7 100644 --- a/lib/assets/stylesheets/roadmap-hacks.scss +++ b/lib/assets/stylesheets/roadmap-hacks.scss @@ -70,25 +70,94 @@ /* Override the color scheme settings in bootstrap_and_overrides and the admin css files */ /* --------------------------------------------------------------------------------------------- */ -a:hover, +a:hover, a:focus, +p a:hover, p a:focus, +li a:hover, li a:focus, +.screencast_home_page, #create-test:hover, .dmp_table_link:hover, -.signIn ul li a, .signIn ul li a:visited, .signIn ul li a:active, .signIn ul li a:hover, .signIn ul li a:link, ul.tabs li a:hover, -.navbar { +.navbar, +ul.question_right_column_ul li.active a, ul.question_right_column_ul li.active a:active, +ul.question_right_column_ul li.active a:hover, ul.question_right_column_ul li.active a:focus, +.question-guidance .accordion-heading a, .question-guidance .accordion-heading a:hover { color: $primary-color !important; } +.accordion-group, +.accordion_heading_text, +.plan-export-settings h4 { + background-color: $primary-color; +} + +.accordion_heading_text { + color: $white; +} + #main-nav-tabs ul { border-bottom: none; } -#main-nav-tabs li a, +.main_header { + position: relative; + height: auto; + width: 100%; + background-color: $primary-color; +} +div.header_left, div.header_right { + position: relative; + float: none; + clear: none; + display: inline-block; + width: auto; +} +div.header_right { + margin-left: 20px; + height: auto; + width: 75%; + position: absolute; + bottom: 0; +} +div.signin_signout_header_link { + position: absolute; + top: 2px; + right: 10px; + + .signIn { + float: none; + position: relative; + top: auto; + right: auto; + + ul.navbar li, + ul.navbar li a, ul.navbar li a:link, ul.navbar li a:visited, ul.navbar li a:active, ul.navbar li a:focus { + color: $white !important; + } + } +} + +#main-nav-tabs { + width: auto; +} +#main-nav-tabs li a { + color: $white; + background-color: $primary-color; + border: 1px solid $white; +} +#main-nav-tabs li.active a, #main-nav-tabs li.active a:active, #main-nav-tabs li a:hover, lang-dropdown-link:hover{ + color: $primary-color !important; + background: $white; + border: 1px solid $white; +} + +#project-tabs { + margin-bottom: 10px; +} + #project-tabs li a { color: $white; background-color: $primary-color; border-bottom: 1px solid $primary-color; } -#main-nav-tabs li.active a, #main-nav-tabs li.active a:active, #main-nav-tabs li a:hover, lang-dropdown-link:hover, #project-tabs li.active a, #project-tabs li.active a:active, #project-tabs li a:hover { color: $primary-color !important; background: $white; @@ -98,18 +167,50 @@ border-bottom: none; } +div.accordion-group { + border-color: $primary-color; + + .section_desc { + background-color: $primary-color; + } +} +div.accordion-heading a.accordion-toggle { + color: $white; +} + +.label-info, +.badge-info, +ul.question_right_column_ul li a { + background-color: $dark-grey; +} + +.comment-area, .question-guidance, +.question-guidance .guidance-accordion-body, +ul.question_right_column_ul li.active a, ul.question_right_column_ul li.active a:active, +ul.question_right_column_ul li.active a:hover, ul.question_right_column_ul li.active a:focus { + border: 1px solid $primary-color; +} + .caret, .caret-orange { border-top: 4px solid $primary-color !important; border-bottom-color: $primary-color !important; } +hr.orange_break_line { + border-top: 1px solid $primary-color; +} + .question-divider, +ul.question_right_column_ul li a, #plan-guidance-accordion > .accordion-group > .accordion-heading { border-bottom: 1px solid $primary-color; } -ul#signIn_dropdown { +p.alert, +ul#signIn_dropdown li a.signIn_dropdown_link:hover, ul#signIn_dropdown li a.signIn_dropdown_link:focus { + color: $black; background-color: $light-grey !important; + border: none; } body.dmponline { @@ -118,8 +219,9 @@ .dmp_table thead, .accordion-heading, .progress .bar, - .section-status { - background: $primary-color; + .section-status, + .move_2_right input.btn-primary { + background: $primary-color !important; } .accordion-heading { @@ -132,13 +234,17 @@ } div.dmp_details_body, + div.phase_details_body, div.roadmap-info-box, .tab-panel, - #create_plan, #sign-in-panel, #create-account-panel { + #create_plan fieldset, #contact-us { border: 1px solid $primary-color; border-radius: 5px; } table.dmp_details_table tr td.first { border-right: 1px solid $primary-color; } + div.phase_details_body { + padding: 0 6px 25px 6px; + } } diff --git a/lib/assets/stylesheets/roadmap-tabs.scss b/lib/assets/stylesheets/roadmap-tabs.scss index d5b7be6..669e1e9 100644 --- a/lib/assets/stylesheets/roadmap-tabs.scss +++ b/lib/assets/stylesheets/roadmap-tabs.scss @@ -52,7 +52,7 @@ position: absolute; top: -1px; left: 0; - width: 100%; + width: inherit; border: 1px solid $primary-color; border-top-left-radius: 0; border-top-right-radius: 5px; diff --git a/lib/assets/stylesheets/roadmap.scss b/lib/assets/stylesheets/roadmap.scss index 0088f04..c380f6c 100644 --- a/lib/assets/stylesheets/roadmap.scss +++ b/lib/assets/stylesheets/roadmap.scss @@ -11,12 +11,14 @@ $medium-grey: #827D7E; $light-grey: #CCC; -$primary-color: #36421A; -$primary-admin-color: #36421A; +$primary-color: #CC7A00; +$primary-admin-color: #CC7A00; $disabled-button-color: #CCC; $cancel-button-color: #36421A; $reverse-text: #FFF; +$header-height: 100px; + /* See `.combobox-clear-button` for an example of this mixin in use */ @mixin icon($icon) { @extend .fa; @@ -51,10 +53,18 @@ .main_header { margin-bottom: 20px; + + div.header_left { + width: auto; + + .home_logo { + margin: 25px 10px 30px 10px; + } + } } .content { - width: 98%; + width: 100%; background-color: $white; border-radius: 3px; margin-top: 25px; @@ -62,7 +72,7 @@ } .content-two-column { - width: 98%; + width: 100%; .column-left { display: inline-block; @@ -71,6 +81,7 @@ .column-right { display: inline-block; width: 40%; + height: auto; margin-left: 35px; vertical-align: top; } @@ -90,7 +101,7 @@ div.roadmap-info-box { position: absolute; float: right; - top: 200px; + top: 180px; right: 12%; background-color: $white; padding: 8px 20px;