gunghogeoduck/osem-fcy
1
0
Fork 0
mirror of https://github.com/openSUSE/osem.git synced 2026-08-13 19:54:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #454 from hennevogel/drop-jquery-ui

Browse source 
Drop JQuery-UI
This commit is contained in:
Henne Vogelsang 2014-08-18 09:47:04 +02:00
commit 3a17ccb49b
9 changed files with 65 additions and 89 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/assets/javascripts/application.js
View file

@ -11,10 +11,8 @@
// GO AFTER THE REQUIRES BELOW.
//
//= require jquery
//= require jquery.ui.all
//= require jquery_ujs
//= require jquery-fileupload
//= require jquery-ui-timepicker-addon
//= require jquery.dataTables
//= require cocoon
//= require bootstrap
@ -27,6 +25,10 @@
//= require bootstrap-markdown
//= require to-markdown
//= require markdown
//= require moment
//= require bootstrap-datetimepicker
//= require osem-datepickers
$(document).ready(function() {
$('a[disabled=disabled]').click(function(event){
return false;

34
app/assets/javascripts/osem-datepickers.js Normal file
View file

@ -0,0 +1,34 @@
$(function () {
$("#conference-start-datepicker").datetimepicker({
pickTime: false,
format: "YYYY-MM-DD"
});
$("#conference-end-datepicker").datetimepicker({
pickTime: false,
format: "YYYY-MM-DD"
});
$("#conference-reg-start-datepicker").datetimepicker({
format: "YYYY-MM-DD",
pickTime: false,
pickSeconds: false
});
$("#conference-reg-end-datepicker").datetimepicker({
format: "YYYY-MM-DD",
pickTime: false,
pickSeconds: false
});
$(".target-due-date-datepicker").datetimepicker({
pickTime: false,
format: "YYYY-MM-DD"
});
/* Appends the datetimepicker to new injected nested target fields. */
$('a:contains("Add target")').click(function () {
setTimeout(function () {
$('.target-due-date-datepicker').not('.hasDatepicker').datetimepicker({
pickTime: false,
format: "YYYY-MM-DD"
});
},
5)
});
} );

79
app/assets/javascripts/osem.js
View file

@ -9,7 +9,11 @@ $(function () {
$("#" + id).toggle();
});
});
$("#commercial_commercial_type").change(function () {
$(".media-type").hide();
$('#' + $(this).val().toLowerCase() + '-help').show();
});
$('.dropdown-toggle').dropdown();
/**
* Adds the default template as value to the regarding email textarea field.
*/
@ -69,78 +73,7 @@ $(function () {
$('#' + $(this).data('name')).toggle();
});
/**
* Appends the datetimepicker to new injected nested target fields.
*/
$('a:contains("Add target")').click(function () {
setTimeout(function () {
$('.target-due-date-datepicker').not('.hasDatepicker').datepicker({
dateFormat: 'yy/mm/dd',
numberOfMonths: 1
});
},
5)
});
$("#commercial_commercial_type").change(function () {
$(".media-type").hide();
$('#' + $(this).val().toLowerCase() + '-help').show();
});
$('.dropdown-toggle').dropdown();
$("#conference-start-datepicker").datepicker({
dateFormat: 'yy/mm/dd',
numberOfMonths: 2,
onSelect: function(selected) {
$("#conference-end-datepicker").datepicker("option","minDate", selected)
}
});
$("#conference-end-datepicker").datepicker({
dateFormat: 'yy/mm/dd',
numberOfMonths: 2,
onSelect: function(selected) {
$("#conference-start-datepicker").datepicker("option","maxDate", selected)
$("#cfp-hard-datepicker").datepicker("option","minDate", selected)
}
});
$(".target-due-date-datepicker").datepicker({
dateFormat: 'yy/mm/dd',
numberOfMonths: 1
});
$("#cfp-hard-datepicker").datepicker({
dateFormat: 'yy/mm/dd',
numberOfMonths: 2,
onSelect: function(selected) {
$("#conference-end-datepicker").datepicker("option","maxDate", selected)
$("#conference-start-datepicker").datepicker("option","maxDate", selected)
}
});
$("#conference-reg-start-datepicker").datetimepicker({
dateFormat: "yy-mm-dd",
timeFormat: "HH:mm",
showSecond: false,
numberOfMonths: 2,
onSelect: function(selected) {
$("#conference-reg-end-datepicker").datepicker("option","minDate", selected)
}
});
$("#conference-reg-end-datepicker").datetimepicker({
dateFormat: "yy-mm-dd",
timeFormat: "HH:mm",
showSecond: false,
numberOfMonths: 2,
onSelect: function(selected) {
$("#conference-reg-start-datepicker").datepicker("option","maxDate", selected)
}
});
$(".comment-reply-link").click(function(){
$(".comment-reply", $(this).parent()).toggle();
return false;

3
app/assets/stylesheets/application.css
View file

@ -1,9 +1,7 @@
/*
*= require strap-on
*= require formtastic-bootstrap
*= require jquery.ui.all
*= require jquery.fileupload-ui
*= require jquery-ui-timepicker-addon
*= require jquery.dataTables_themeroller
*= require osem
*= require osem-rating
@ -13,4 +11,5 @@
*= require osem-fonts
*= require font-awesome
*= require bootstrap-markdown.min
*= require bootstrap-datetimepicker
*/

3
app/assets/stylesheets/strap-on.css.scss
View file

@ -5,4 +5,5 @@ $navbar-default-color: #ffffff;
$navbar-default-link-color: #ffffff;
$navbar-default-link-hover-color: #000000;
@import "bootstrap";
@import 'bootstrap';
@import 'bootstrap-datetimepicker';

2
app/views/admin/conference/new.html.haml
View file

@ -9,6 +9,6 @@
= f.inputs 'Scheduling' do
= f.input :timezone, as: :time_zone, hint: 'Please select in what time zone your conference will take place.'
= f.input :start_date, as: :string, input_html: { id: 'conference-start-datepicker', required: 'required' }
= f.input :end_date, as: :string, input_html: { id: 'conference-end-datepicker', required: 'required' }
= f.input :end_date, as: :string, input_html: { id: 'conference-end-datepicker', required: 'required' }
= f.actions do
= f.action :submit, button_html: {class: 'btn btn-success pull-right'}

8
app/views/layouts/_user_menu.html.haml
View file

@ -15,8 +15,12 @@
%li.divider
%li
= link_to(admin_conference_index_path()) do
%span.glyphicon.glyphicon-home
Administration
- if Conference.any?
%span.glyphicon.glyphicon-home
Administration
- else
%span.glyphicon.glyphicon-plus
Create Conference
-if @conference and @conference.id and can? :show, @conference
%li
= link_to(admin_conference_path(@conference.short_title)) do