Skip to content
This repository has been archived by the owner on Oct 31, 2018. It is now read-only.

Let users set a default calendar for new events [with hidden buttons] #639

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Let users set a default calendar for new events [with hidden buttons] #639

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f282318
Let users set a default calendar for new events
vgezer Apr 9, 2014
b0eaaa8
css tweaks for buttons
vgezer Dec 6, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions ajax/calendar/delete.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
OCP\JSON::checkAppEnabled('calendar');
OCP\JSON::callCheck();

$cal = $_POST["calendarid"];
$cal = isset($_POST["calendarid"]) ? $_POST["calendarid"] : null;

try {
$del = OC_Calendar_Calendar::deleteCalendar($cal);
Expand All @@ -22,5 +22,4 @@
}
} catch(Exception $e) {
OCP\JSON::error(array('message'=>$e->getMessage()));
exit;
}
25 changes: 25 additions & 0 deletions ajax/calendar/makedefault.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
<?php
/**
* Copyright (c) 2014 Volkan Gezer <volkangezer at gmail dot com>
* This file is licensed under the Affero General Public License version 3 or
* later.
* See the COPYING-README file.
*/


OCP\JSON::checkLoggedIn();
OCP\JSON::checkAppEnabled('calendar');
OCP\JSON::callCheck();

$cal = isset($_POST["calendarid"]) ? $_POST["calendarid"] : null;

try {
$def = OC_Calendar_Calendar::makeDefault($cal);
if($def === true) {
OCP\JSON::success();
}else{
OCP\JSON::error(array('error'=>'dberror'));
}
} catch(Exception $e) {
OCP\JSON::error(array('message'=>$e->getMessage()));
}
281 changes: 281 additions & 0 deletions css/style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -551,6 +551,16 @@ button.category{margin:0 3px;}
top: 44px;
}

.icon-default {
background-image: url('../img/star.png');
}

.not-set {
-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=10)";
filter: alpha(opacity = 10);
opacity: 0.1;
}

#navigation-list #caldav_url_entry {
min-height: 0;
}
Expand Down Expand Up @@ -583,3 +593,274 @@ button.ui-multiselect{
height:26px;
text-align:left;
}

/* New boilerplate menu */

/**
* Backports for ownCloud 7
*/
#app-navigation .active.with-menu > a,
#app-navigation .with-counter > a {
padding-right: 50px;
}

#app-navigation .active.with-menu.with-counter > a {
padding-right: 90px;
}

#app-navigation > .with-icon ul li > a,
#app-navigation > .with-icon ul li.app-navigation-entry-loading > a {
padding-left: 68px;
background-position: 44px center;
}

#app-navigation li:hover > a,
#app-navigation .selected,
#app-navigation .selected a {
background-color: #ddd;
}

#app-navigation .with-icon a,
#app-navigation .app-navigation-entry-loading a {
padding-left: 44px;
background-size: 16px 16px;
background-position: 14px center;
background-repeat: no-repeat;
}

#app-navigation .collapsible.open {
background-image: linear-gradient(top, rgb(238,238,238) 0%, rgb(245,245,245) 100%);
background-image: -o-linear-gradient(top, rgb(238,238,238) 0%, rgb(245,245,245) 100%);
background-image: -moz-linear-gradient(top, rgb(238,238,238) 0%, rgb(245,245,245) 100%);
background-image: -webkit-linear-gradient(top, rgb(238,238,238) 0%, rgb(245,245,245) 100%);
background-image: -ms-linear-gradient(top, rgb(238,238,238) 0%, rgb(245,245,245) 100%);
}

#app-navigation > ul .collapsible.open:hover {
box-shadow: inset 0 0 3px #ddd;
}

#app-navigation > ul .collapsible.open ul {
display: block;
}

/* Deleted entries with undo button */
#app-navigation .app-navigation-entry-deleted {
display: inline-block;
height: 44px;
width: 100%;
}

#app-navigation .app-navigation-entry-deleted-description {
padding-left: 12px;
position: relative;
white-space: nowrap;
text-overflow: ellipsis;
overflow: hidden;
display: inline-block;
width: 201px; /* fallback for IE8 */
width: calc(100% - 49px);
line-height: 44px;
float: left;
}

#app-navigation .app-navigation-entry-deleted-button {
margin: 0;
height: 44px;
width: 44px;
line-height: 44px;
border: 0;
display: inline-block;
background-color: transparent;
opacity: .5;
}

#app-navigation .app-navigation-entry-deleted-button:hover {
opacity: 1;
}


/**
* App navigation utils, buttons and counters for drop down menu
*/
#app-navigation .app-navigation-entry-utils {
position: absolute;
top: 0;
right: 0;
z-index: 10;
}

#app-navigation .app-navigation-entry-utils ul {
display: block !important;
}


#app-navigation .app-navigation-entry-utils li {
float: left;
width: 44px !important;
height: 44px;
line-height: 44px;
}

#app-navigation .active > .app-navigation-entry-utils li {
display: inline-block;
}

#app-navigation .app-navigation-entry-utils button {
height: 38px;
width: 38px;
line-height: 38px;
float: left;
}

#app-navigation .app-navigation-entry-utils-menu-button {
display: none;
}
#app-navigation .app-navigation-entry-utils-menu-button button {
border: 0;
opacity: .5;
background-color: transparent;
background-repeat: no-repeat;
background-position: center;
background-image: url('../img/more.svg');
}

#app-navigation .app-navigation-entry-utils-menu-button:hover button,
#app-navigation .app-navigation-entry-utils-menu-button:focus button {
background-color: transparent;
opacity: 1;
}

#app-navigation .app-navigation-entry-utils-counter {
overflow: hidden;
text-overflow: hidden;
text-align: right;
font-size: 9pt;
width: 38px;
line-height: 44px;
padding: 0 10px;
}

#app-navigation .app-navigation-entry-utils ul,
#app-navigation .app-navigation-entry-menu ul {
list-style-type: none;
}

#app-navigation .app-navigation-entry-menu {
display: none;
position: absolute;
background-color: #eee;
color: #333;
border-radius: 3px;
border-top-right-radius: 0px;
z-index: 110;
margin: -5px 14px 5px 10px;
right: 0;
border: 1px solid #bbb;
-webkit-filter: drop-shadow(0 0 5px rgba(150, 150, 150, 0.75));
-moz-filter: drop-shadow(0 0 5px rgba(150, 150, 150, 0.75));
-ms-filter: drop-shadow(0 0 5px rgba(150, 150, 150, 0.75));
-o-filter: drop-shadow(0 0 5px rgba(150, 150, 150, 0.75));
filter: drop-shadow(0 0 5px rgba(150, 150, 150, 0.75));
}

#app-navigation .app-navigation-entry-menu.open {
display: block;
}

/* miraculous border arrow stuff */
#app-navigation .app-navigation-entry-menu:after,
#app-navigation .app-navigation-entry-menu:before {
bottom: 100%;
right: 0; /* change this to adjust the arrow position */
border: solid transparent;
content: " ";
height: 0;
width: 0;
position: absolute;
pointer-events: none;
}

#app-navigation .app-navigation-entry-menu:after {
border-color: rgba(238, 238, 238, 0);
border-bottom-color: #eee;
border-width: 10px;
margin-left: -10px;
}
#app-navigation .app-navigation-entry-menu:before {
border-color: rgba(187, 187, 187, 0);
border-bottom-color: #bbb;
border-width: 11px;
margin-left: -11px;
}

/* list of options for an entry */
#app-navigation .app-navigation-entry-menu ul {
display: block !important;
}

#app-navigation .app-navigation-entry-menu li {
float: left;
width: 38px !important;
}

#app-navigation .app-navigation-entry-menu li button {
float: right;
width: 36px !important;
height: 36px;
line-height: 36px;
border: 0;
opacity: .5;
background-color: transparent;
}

#app-navigation .app-navigation-entry-menu li button:hover,
#app-navigation .app-navigation-entry-menu li button:focus {
opacity: 1;
background-color: transparent;
}

/* editing an entry */
#app-navigation .app-navigation-entry-edit {
padding-left: 5px;
padding-right: 5px;
display: inline-block;
height: 39px;
width: 100%;
}

#app-navigation .app-navigation-entry-edit input {
border-bottom-right-radius: 0;
border-top-right-radius: 0;
width: 204px; /* fallback for IE8 */
width: calc(100% - 36px);
padding: 5px;
margin-right: 0;
height: 38px;
float: left;
border: 1px solid rgba(190,190,190,.9);
}

#app-navigation .app-navigation-entry-edit button,
#app-navigation .app-navigation-entry-edit input[type="submit"] {
width: 36px;
height: 38px;
float: left;
}

#app-navigation .app-navigation-entry-edit .icon-checkmark {
border-bottom-left-radius: 0;
border-top-left-radius: 0;
border-left: 0;
margin-right: 0;
}

#app-content {
z-index: 25;
}

#app-settings,
#expanddiv {
z-index: 15;
}

Binary file added img/star.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
14 changes: 14 additions & 0 deletions js/calendar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -628,6 +628,20 @@ Calendar={
});
}
},
makeDefault:function(calid){

$.post(OC.filePath('calendar', 'ajax/calendar', 'makedefault.php'), { calendarid: calid},
function(data) {
if (data.status == 'success'){
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The rest of your message is missing.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ah crap :)

I meant ===

var url = 'ajax/events.php?calendar_id='+calid;
if($('#navigation-list li[data-id="'+calid+'"] span a').hasClass( "icon-default" ))
{
$('#navigation-list li span a[id="chooseCalendar-make-def"]').addClass("not-set");
$('#navigation-list li[data-id="'+calid+'"] span a[id="chooseCalendar-make-def"]').removeClass("not-set");
}
}
});
},
submit:function(button, calendarid){
var displayname = $.trim($("#displayname_"+calendarid).val());
var active = $("#active_"+calendarid).attr("checked") ? 1 : 0;
Expand Down
3 changes: 3 additions & 0 deletions js/on-event.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,9 @@ $(document).on('click', '#chooseCalendar-edit', function () {
$(document).on('click', '#chooseCalendar-delete', function () {
Calendar.UI.Calendar.deleteCalendar($(this).data('id'));
});
$(document).on('click','#chooseCalendar-make-def', function () {
Calendar.UI.Calendar.makeDefault($(this).data('id'));
});
$(document).on('click', '#editCalendar-submit', function () {
Calendar.UI.Calendar.submit($(this), $(this).data('id'));
});
Expand Down
22 changes: 22 additions & 0 deletions lib/calendar.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,6 +280,28 @@ public static function deleteCalendar($id) {
return true;
}

/**
* @brief Sets a calendar default and new events are created in it by default
* @param integer $id
* @return boolean
*/
public static function makeDefault($id) {
$calendar = self::find($id);
if ($calendar['userid'] != OCP\User::getUser()) {
$sharedCalendar = OCP\Share::getItemSharedWithBySource('calendar', $id);
if (!$sharedCalendar || !($sharedCalendar['permissions'] & OCP\PERMISSION_CREATE)) {
throw new Exception(
OC_Calendar_App::$l10n->t(
'You do not have the permissions to update this calendar.'
)
);
}
}
OCP\Config::setUserValue(OCP\User::getUser(), "calendar", "defaultcalendar", $id);

return true;
}

/**
* @brief merges two calendars
* @param integer $id1
Expand Down
Loading