TableAjax fix sticky col height, fix modal (see #52)

SE/procesy5.php

@@ -2274,16 +2274,20 @@ function tree_callback__show_item_from_CRM_PROCES( &$r, &$tree ) {
 								<i class="glyphicon glyphicon-info-sign" title="Opis stanowiska"></i>
 							</a>
 							<!-- Modal -->
-							<div id="wsk-<?php echo $w->CW_ID; ?>-Modal" class="wsk-modal modal hide fade" tabindex="-1" role="dialog" aria-labelledby="wsk-<?php echo $w->CW_ID; ?>-ModalLabel" aria-hidden="true">
-								<div class="modal-header">
-									<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-									<h3 id="wsk-<?php echo $w->CW_ID; ?>-ModalLabel"><?php echo "[{$w->CW_ID}] {$w->DESC}"; ?></h3>
-								</div>
-								<div class="modal-body">
-									<?php echo $w->OPIS; ?>
-								</div>
-								<div class="modal-footer">
-									<button class="btn btn-primary" data-dismiss="modal" aria-hidden="true">Zamknij</button>
+							<div id="wsk-<?php echo $w->CW_ID; ?>-Modal" class="wsk-modal modal fade" tabindex="-1" role="dialog" aria-labelledby="wsk-<?php echo $w->CW_ID; ?>-ModalLabel" aria-hidden="true">
+								<div class="modal-dialog">
+									<div class="modal-content">
+										<div class="modal-header">
+											<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+											<h3 id="wsk-<?php echo $w->CW_ID; ?>-ModalLabel"><?php echo "[{$w->CW_ID}] {$w->DESC}"; ?></h3>
+										</div>
+										<div class="modal-body">
+											<?php echo $w->OPIS; ?>
+										</div>
+										<div class="modal-footer">
+											<button class="btn btn-primary" data-dismiss="modal" aria-hidden="true">Zamknij</button>
+										</div>
+									</div>
 								</div>
 							</div>
 							<?php

SE/se-lib/S.php

@@ -163,12 +163,16 @@ function sesAjaxTimerCheck(){
 
 				var exprModal=document.getElementById('session-timer-modal');
 				if (!exprModal) {
-					var modalHtml = '<div id="session-timer-modal" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="session-timer-modal-label" aria-hidden="true">' +
-						'	<div class="modal-header">' +
-						'		<h3 id="session-timer-modal-label">Zostałeś wylogowany</h3>' +
-						'	</div>' +
-						'	<div class="modal-footer">' +
-						'		<a href="index.php" class="btn btn-primary">Zaloguj</a>' +
+					var modalHtml = '<div id="session-timer-modal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="session-timer-modal-label" aria-hidden="true">' +
+						'	<div class="modal-dialog">' +
+						'		<div class="modal-content">' +
+						'			<div class="modal-header">' +
+						'				<h3 id="session-timer-modal-label">Zostałeś wylogowany</h3>' +
+						'			</div>' +
+						'			<div class="modal-footer">' +
+						'				<a href="index.php" class="btn btn-primary">Zaloguj</a>' +
+						'			</div>' +
+						'		</div>' +
 						'	</div>' +
 						'</div>';
 					exprModal = jQuery(modalHtml).appendTo('body');

SE/se-lib/TableAjax.php

@@ -1349,6 +1349,9 @@ class TableAjax extends ViewAjax {
 				width:'' + stickyCol1Width + 'px',
 			});
 			_table.find('.filter').find('.stickyCol1').css({height:'34px'});
+			var sortStickyColHeight = _table.find('.sort').find('th:last').outerHeight();
+			_table.find('.sort').find('.stickyCol1').css({height: sortStickyColHeight + 'px'});
+			_table.find('.sort').find('.stickyCol2').css({height: sortStickyColHeight + 'px'});
 			_table.find('.stickyCol2').css({position:'absolute',
 				left:'' + (stickyCol1Width) + 'px',
 				top:'auto',
@@ -1366,8 +1369,10 @@ class TableAjax extends ViewAjax {
 
 			if (!_inlineEditBox) {
 				$(_foot).next('.inlineEditBox').remove();
-				_inlineEditBox = $('<div class="inlineEditBox modal hide fade" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true"></div>').insertAfter(_foot);
-				var frmInlineEdit = $('<form style="margin:0;padding:0;"></form>').appendTo(_inlineEditBox);
+				_inlineEditBox = $('<div class="inlineEditBox modal fade" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true"></div>').insertAfter(_foot);
+				var modalWrap = $('<div class="modal-dialog"></div>').appendTo(_inlineEditBox);
+				var modalWrap = $('<div class="modal-content"></div>').appendTo(modalWrap);
+				var frmInlineEdit = $('<form style="margin:0;padding:0;"></form>').appendTo(modalWrap);
 				var iebHead = $('<div class="modal-header">').appendTo(frmInlineEdit);
 				$('<button type="button" class="close" data-dismiss="modal" aria-hidden="true"><i class="glyphicon glyphicon-remove"></i></button>').appendTo(iebHead);
 				$('<h3 id="myModalLabel">Edytuj</h3>').appendTo(iebHead);

SE/superedit-PROCES_ADD_ZASOB.php

@@ -591,20 +591,24 @@ function PROCES_ADD_ZASOB() {
 	</div>
 
 	<!-- Modal -->
-	<div id="editWskModal" class="modal hide fade editWskModal-loading" tabindex="-1" role="dialog" aria-labelledby="editWskModalLabel" aria-hidden="true">
-		<div class="modal-header">
-			<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-			<h3 id="editWskModalLabel">Edycja wskaźnika</h3>
-		</div>
-		<div class="modal-body">
-			<p>One fine body...</p>
-		</div>
-<!--
-		<div class="modal-footer">
-			<button class="btn" data-dismiss="modal" aria-hidden="true">Anuluj</button>
-			<button class="btn btn-primary">Zapisz</button>
+	<div id="editWskModal" class="modal fade editWskModal-loading" tabindex="-1" role="dialog" aria-labelledby="editWskModalLabel" aria-hidden="true">
+		<div class="modal-dialog">
+			<div class="modal-content">
+				<div class="modal-header">
+					<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+					<h3 id="editWskModalLabel">Edycja wskaźnika</h3>
+				</div>
+				<div class="modal-body">
+					<p>One fine body...</p>
+				</div>
+				<!--
+				<div class="modal-footer">
+					<button class="btn" data-dismiss="modal" aria-hidden="true">Anuluj</button>
+					<button class="btn btn-primary">Zapisz</button>
+				</div>
+				-->
+			</div>
 		</div>
--->
 	</div>
 
 <script>

SE/superedit-PRZYPOMNIJ.php

@@ -424,22 +424,26 @@ Ilość pism: <span id="przypomnij_stats-pisma"><?php echo $ILOSC_PISM; ?></span
 	ilość procesów: <span id="przypomnij_stats-procesy"><?php echo $ILOSC_PROCES; ?></span>.
 </div>
 
-<div class="przypomnijInlineEditBox inlineEditBox modal hide fade" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
-	<form style="margin:0;padding:0;">
-		<div class="modal-header">
-			<button type="button" class="close" data-dismiss="modal" aria-hidden="true"><i class="glyphicon glyphicon-remove"></i></button>
-			<h3 id="myModalLabel">Edytuj</h3>
+<div class="przypomnijInlineEditBox inlineEditBox modal fade" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
+	<div class="modal-dialog">
+		<div class="modal-content">
+			<form style="margin:0;padding:0;">
+				<div class="modal-header">
+					<button type="button" class="close" data-dismiss="modal" aria-hidden="true"><i class="glyphicon glyphicon-remove"></i></button>
+					<h3 id="myModalLabel">Edytuj</h3>
+				</div>
+				<div class="modal-body">
+					<input type="hidden" name="rowid" value="">
+					<input type="hidden" name="type" value="">
+					<div class="inlineEditBox-cnt"></div>
+				</div>
+				<div class="modal-footer">
+					<button class="btn" data-dismiss="modal" aria-hidden="true">Zamknij</button>
+					<input type="submit" value="Zapisz" class="btn btn-primary btn-save">
+				</div>
+			</form>
 		</div>
-		<div class="modal-body">
-			<input type="hidden" name="rowid" value="">
-			<input type="hidden" name="type" value="">
-			<div class="inlineEditBox-cnt"></div>
-		</div>
-		<div class="modal-footer">
-			<button class="btn" data-dismiss="modal" aria-hidden="true">Zamknij</button>
-			<input type="submit" value="Zapisz" class="btn btn-primary btn-save">
-		</div>
-	</form>
+	</div>
 </div>
 
 <script>

SE/superedit-USERS2_OFFERS_GROUPS.php

@@ -869,97 +869,101 @@ function USERS2_OFFERS_GROUPS_konfigurator2() {
 		</tbody>
 	</table>
 
-	<div id="conf2-Modal" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
-		<form action="" id="conf2-modal-frm" class="form-horizontal">
-		<div class="modal-header">
-			<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-			<h3 id="myModalLabel">Grupa ofert</h3>
-		</div>
-		<div class="modal-body">
-			<input type="hidden" name="f_ID" value="">
-			<div class="control-group">
-				<label for="f_COM" class="control-label">P SERVICE COMPANY </label>
-				<div class="controls">
-					<input type="text" name="f_COM" value="<?php echo $model->getCache('fltr_COM', 'BN'); ?>">
-				</div>
-			</div>
-
-			<div class="control-group">
-				<label for="f_S_ALIAS" class="control-label">[1615] S ALIAS </label>
-				<div class="controls">
-					<input type="text" name="f_S_ALIAS" value="<?php echo $model->getCache('fltr_p_1615'); ?>">
-				</div>
-			</div>
-
-			<div class="control-group">
-				<label for="f_P_PROMOTION_NAME" class="control-label">[1616] P PROMOTION NAME </label>
-				<div class="controls">
-					<input type="text" name="f_P_PROMOTION_NAME" value="<?php echo $model->getCache('fltr_p_1616'); ?>">
-				</div>
-			</div>
-
-			<div class="control-group">
-				<label for="f_P_DEALTERM_MONTHS" class="control-label">[1617] P DEALTERM MONTHS </label>
-				<div class="controls">
-					<input type="text" name="f_P_DEALTERM_MONTHS" value="<?php echo $model->getCache('fltr_p_1617'); ?>">
-				</div>
-			</div>
-
-			<div class="control-group">
-				<label for="f_P_OFFER_TERM_BEGIN" class="control-label">[1618] P OFFER TERM BEGIN </label>
-				<div class="controls">
-					<input type="text" name="f_P_OFFER_TERM_BEGIN" value="<?php echo $model->getCache('fltr_p_1618'); ?>">
-				</div>
-			</div>
-
-			<div class="control-group">
-				<label for="f_P_OFFER_TERM" class="control-label">[1619] P OFFER TERM </label>
-				<div class="controls">
-					<input type="text" name="f_P_OFFER_TERM" value="<?php echo $model->getCache('fltr_p_1619'); ?>">
-				</div>
-			</div>
-
-			<div class="control-group">
-				<label for="f_M_REWIR" class="control-label">[1627] M REWIR </label>
-				<div class="controls">
-					<input type="text" name="f_M_REWIR" value="<?php echo $model->getCache('fltr_p_1627'); ?>">
+	<div id="conf2-Modal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
+		<div class="modal-dialog">
+			<div class="modal-content">
+				<form action="" id="conf2-modal-frm" class="form-horizontal">
+				<div class="modal-header">
+					<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+					<h3 id="myModalLabel">Grupa ofert</h3>
 				</div>
-			</div>
+				<div class="modal-body">
+					<input type="hidden" name="f_ID" value="">
+					<div class="control-group">
+						<label for="f_COM" class="control-label">P SERVICE COMPANY </label>
+						<div class="controls">
+							<input type="text" name="f_COM" value="<?php echo $model->getCache('fltr_COM', 'BN'); ?>">
+						</div>
+					</div>
+
+					<div class="control-group">
+						<label for="f_S_ALIAS" class="control-label">[1615] S ALIAS </label>
+						<div class="controls">
+							<input type="text" name="f_S_ALIAS" value="<?php echo $model->getCache('fltr_p_1615'); ?>">
+						</div>
+					</div>
+
+					<div class="control-group">
+						<label for="f_P_PROMOTION_NAME" class="control-label">[1616] P PROMOTION NAME </label>
+						<div class="controls">
+							<input type="text" name="f_P_PROMOTION_NAME" value="<?php echo $model->getCache('fltr_p_1616'); ?>">
+						</div>
+					</div>
+
+					<div class="control-group">
+						<label for="f_P_DEALTERM_MONTHS" class="control-label">[1617] P DEALTERM MONTHS </label>
+						<div class="controls">
+							<input type="text" name="f_P_DEALTERM_MONTHS" value="<?php echo $model->getCache('fltr_p_1617'); ?>">
+						</div>
+					</div>
+
+					<div class="control-group">
+						<label for="f_P_OFFER_TERM_BEGIN" class="control-label">[1618] P OFFER TERM BEGIN </label>
+						<div class="controls">
+							<input type="text" name="f_P_OFFER_TERM_BEGIN" value="<?php echo $model->getCache('fltr_p_1618'); ?>">
+						</div>
+					</div>
+
+					<div class="control-group">
+						<label for="f_P_OFFER_TERM" class="control-label">[1619] P OFFER TERM </label>
+						<div class="controls">
+							<input type="text" name="f_P_OFFER_TERM" value="<?php echo $model->getCache('fltr_p_1619'); ?>">
+						</div>
+					</div>
+
+					<div class="control-group">
+						<label for="f_M_REWIR" class="control-label">[1627] M REWIR </label>
+						<div class="controls">
+							<input type="text" name="f_M_REWIR" value="<?php echo $model->getCache('fltr_p_1627'); ?>">
+						</div>
+					</div>
+
+					<div class="control-group">
+						<label for="f_ID_NET" class="control-label">[1743] ID_NET </label>
+						<div class="controls">
+							<select name="f_ID_NET"></select>
+						</div>
+					</div>
+
+					<div class="control-group">
+						<label for="f_ID_TV" class="control-label">[1744] ID_TV </label>
+						<div class="controls">
+							<select name="f_ID_TV"></select>
+						</div>
+					</div>
+
+					<div class="control-group">
+						<label for="f_ID_TVC" class="control-label">[1745] ID_TVC </label>
+						<div class="controls">
+							<select name="f_ID_TVC"></select>
+						</div>
+					</div>
+
+					<div class="control-group">
+						<label for="f_ID_TEL" class="control-label">[1747] ID_TEL </label>
+						<div class="controls">
+							<select name="f_ID_TEL"></select>
+						</div>
+					</div>
 
-			<div class="control-group">
-				<label for="f_ID_NET" class="control-label">[1743] ID_NET </label>
-				<div class="controls">
-					<select name="f_ID_NET"></select>
 				</div>
-			</div>
-
-			<div class="control-group">
-				<label for="f_ID_TV" class="control-label">[1744] ID_TV </label>
-				<div class="controls">
-					<select name="f_ID_TV"></select>
+				<div class="modal-footer">
+					<button class="btn" data-dismiss="modal" aria-hidden="true">Close</button>
+					<button class="btn btn-primary" class="btn-save">Zapisz/Dodaj</button>
 				</div>
+				</form>
 			</div>
-
-			<div class="control-group">
-				<label for="f_ID_TVC" class="control-label">[1745] ID_TVC </label>
-				<div class="controls">
-					<select name="f_ID_TVC"></select>
-				</div>
-			</div>
-
-			<div class="control-group">
-				<label for="f_ID_TEL" class="control-label">[1747] ID_TEL </label>
-				<div class="controls">
-					<select name="f_ID_TEL"></select>
-				</div>
-			</div>
-
-		</div>
-		<div class="modal-footer">
-			<button class="btn" data-dismiss="modal" aria-hidden="true">Close</button>
-			<button class="btn btn-primary" class="btn-save">Zapisz/Dodaj</button>
 		</div>
-		</form>
 	</div>
 
 	<script>