Merge pull request #941 from owncloud/fix-checkboxes

Fix checkboxes
owncloud-archive · Oct 13, 2015 · c8e2dc8 · c8e2dc8
2 parents 71d553c + 393507e
commit c8e2dc8
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 26 deletions.
diff --git a/css/style.css b/css/style.css
@@ -199,6 +199,11 @@ button.category{margin:0 3px;}
 	display: block;
 	margin: 5px 0;
 }
+#event-time:after {
+	content: "";
+	display: table;
+	clear: both;
+}
 #event-time-from {
 	float: left;
 }
@@ -214,9 +219,7 @@ button.category{margin:0 3px;}
 	width: 90px;
 }
 #event-allday {
-	display: inline-block;
 	margin: 7px 0;
-	width: 100%;
 }
 /* category input field leaves room for edit button
    location input field leaves room for map button */

diff --git a/templates/part.eventform.php b/templates/part.eventform.php
@@ -49,10 +49,8 @@
 		</div>
 	</div>
 
-	<label id="event-allday">
-		<input id="allday_checkbox" type="checkbox"<?php if($_['allday']) {print_unescaped('checked="checked"');} ?> name="allday">
-		<?php p($l->t("All Day Event"));?>
-	</label>
+	<input id="allday_checkbox" class="checkbox" type="checkbox"<?php if($_['allday']) {print_unescaped('checked="checked"');} ?> name="allday">
+	<label id="event-allday" for="allday_checkbox"><?php p($l->t("All Day Event"));?></label>
 
 	<input id="advanced_options_button" type="button" class="submit" value="<?php p($l->t('Advanced options')); ?>">
 

diff --git a/templates/part.share.php b/templates/part.share.php
@@ -41,14 +41,12 @@
 		data-share-type="<?php p($sharee['share_type']); ?>">
 		<?php p($sharee['share_with'] . ($sharee['share_type'] == OCP\Share::SHARE_TYPE_GROUP ? ' (group)' : '')); ?>
 		<span class="shareactions">
-			<label>
-				<input class="update sharepermissioncheckbox" type="checkbox" <?php p(($sharee['permissions'] & OCP\PERMISSION_UPDATE?'checked="checked"':''))?>>
-				 <?php p($l->t('can edit')); ?>
-			</label>
-			<label>
-				<input class="share sharepermissioncheckbox" type="checkbox" <?php p(($sharee['permissions'] & OCP\PERMISSION_SHARE?'checked="checked"':''))?>>
-				 <?php p($l->t('can share')); ?>
-			</label>
+			<input id="checkbox-<?php p($sharee['share_with']) ?>-update" class="update sharepermissioncheckbox" type="checkbox" <?php p(($sharee['permissions'] & OCP\PERMISSION_UPDATE?'checked="checked"':''))?>>
+			<label for="checkbox-<?php p($sharee['share_with']) ?>-update"><?php p($l->t('can edit')); ?></label>
+
+			<input id="checkbox-<?php p($sharee['share_with']) ?>-share" class="share sharepermissioncheckbox" type="checkbox" <?php p(($sharee['permissions'] & OCP\PERMISSION_SHARE?'checked="checked"':''))?>>
+			<label for="checkbox-<?php p($sharee['share_with']) ?>-share"><?php p($l->t('can share')); ?></label>
+
 			<img src="<?php p(OCP\Util::imagePath('core', 'actions/delete.svg')); ?>" class="svg action delete"
 				title="<?php p($l->t('Unshare')); ?>">
 		</span>
@@ -74,18 +72,14 @@
 		data-share-type="<?php p($sharee['share_type']); ?>">
 		<?php p($sharee['share_with'] . ($sharee['share_type'] == OCP\Share::SHARE_TYPE_GROUP ? ' (group)' : '')); ?>
 		<span class="shareactions">
-			<label>
-				<input class="update" type="checkbox"
-					<?php p(($sharee['permissions'] & OCP\PERMISSION_UPDATE?'checked="checked"':''))?>
-					disabled="disabled">
-				<?php p($l->t('can edit')); ?>
-			</label>
-			<label>
-				<input class="share" type="checkbox"
-					<?php p(($sharee['permissions'] & OCP\PERMISSION_SHARE?'checked="checked"':''))?>
-					disabled="disabled">
-				<?php p($l->t('can share')); ?>
-			</label>
+			<input class="update" type="checkbox"
+				<?php p(($sharee['permissions'] & OCP\PERMISSION_UPDATE?'checked="checked"':''))?>
+				disabled="disabled">
+			<label><?php p($l->t('can edit')); ?></label>
+			<input class="share" type="checkbox"
+				<?php p(($sharee['permissions'] & OCP\PERMISSION_SHARE?'checked="checked"':''))?>
+				disabled="disabled">
+			<label><?php p($l->t('can share')); ?></label>
 		</span>
 	</li>
 <?php endforeach; ?>