fix form control-group na form-group (see #52)

SE/se-lib/TreeAjax.php

@@ -1574,11 +1574,11 @@ jQuery(document).ready(function(){
 
 				<?php $tabindex = 0; foreach ($fieldsList as $kID => $vCol) : ?>
 					<?php if ($this->_acl->isAllowed($kID, 'W', $record)) : ?>
-						<div class="control-group">
-							<label class="control-label" for="<?php echo "f{$kID}"; ?>"><?php echo $vCol['label']; ?>
+						<div class="form-group">
+							<label class="col-sm-3 control-label" for="<?php echo "f{$kID}"; ?>"><?php echo $vCol['label']; ?>
 								<i class="glyphicon glyphicon-info-sign frm-help" data-toggle="popover" data-trigger="hover" title="" data-content="<?php echo htmlspecialchars($vCol['opis']); ?>" data-original-title="<?php echo "[{$kID}] {$vCol['name']}"; ?>"></i>
 							</label>
-							<div class="controls">
+							<div class="col-sm-9">
 								<?php
 									$fieldParams = array('appendBack'=>true, 'tabindex'=>(++$tabindex), 'maxGrid'=>8);
 									if (!empty($tsValues[$kID])) {
@@ -1589,11 +1589,11 @@ jQuery(document).ready(function(){
 							</div>
 						</div>
 					<?php elseif ($this->_acl->isAllowed($kID, 'R', $record)) : ?>
-						<div class="control-group">
-							<label class="control-label" for="<?php echo "f{$kID}"; ?>"><?php echo $vCol['label']; ?>
+						<div class="form-group">
+							<label class="col-sm-3 control-label" for="<?php echo "f{$kID}"; ?>"><?php echo $vCol['label']; ?>
 								<i class="glyphicon glyphicon-info-sign frm-help" data-toggle="popover" data-trigger="hover" title="" data-content="<?php echo htmlspecialchars($vCol['opis']); ?>" data-original-title="<?php echo "[{$kID}] {$vCol['name']}"; ?>"></i>
 							</label>
-							<div class="controls">
+							<div class="col-sm-9">
 								<p style="margin-top:5px;">
 								<?php
 									//echo $this->_acl->showFormItem('R', $kID, "f{$kID}", $cols[$kID], array('appendBack'=>true), $record);
@@ -1609,8 +1609,8 @@ jQuery(document).ready(function(){
 					<?php endif; ?>
 				<?php endforeach; ?>
 
-				<div class="control-group">
-					<div class="controls">
+				<div class="form-group">
+					<div class="col-sm-offset-3 col-sm-9">
 						<button type="submit" class="btn btn-primary" tabindex="<?php echo (++$tabindex); ?>">Zapisz</button>
 					</div>
 				</div>

SE/se-lib/User.php

@@ -187,7 +187,7 @@ class User {
 					$req_ADM_ACCOUNT = (isset($_REQUEST['ADM_ACCOUNT']))? $_REQUEST['ADM_ACCOUNT'] : '';
 					$req_ADM_PASSWD = (isset($_REQUEST['ADM_PASSWD']))? $_REQUEST['ADM_PASSWD'] : '';
 					if (empty($req_ADM_ACCOUNT) || empty($req_ADM_PASSWD)) {
-						$data['errors'][] = "Proszę podać LOGIN i HASŁO!";
+						$data['errors'][] = "Proszę podać poprawny login i hasło!";
 					} else {
 						User::login($req_ADM_ACCOUNT, $req_ADM_PASSWD, $data['errors']);
 					}

SE/se-lib/tmpl/login.php

@@ -8,20 +8,27 @@
 
 	<form name="LOGIN" action="" method="post" class="form-horizontal" style="width:574px; margin:0 auto;">
 		<fieldset>
-			<div class="control-group">
-				<label class="control-label"for="ADM_ACCOUNT">Użytkownik:</label>
-				<div class="controls">
-					<input type="text" name="ADM_ACCOUNT" value="" id="username">
+			<div class="form-group">
+				<label class="col-sm-3 control-label" for="ADM_ACCOUNT">Użytkownik:</label>
+				<div class="col-sm-6">
+					<input type="text" name="ADM_ACCOUNT" value="" id="username" class="form-control">
 				</div>
 			</div>
-			<div class="control-group">
-				<label class="control-label" for="ADM_PASSWD">Hasło:</label>
-				<div class="controls">
-					<input type="password" name="ADM_PASSWD"><br>
+			<div class="form-group">
+				<label class="col-sm-3 control-label" for="ADM_PASSWD">Hasło:</label>
+				<div class="col-sm-6">
+					<input type="password" name="ADM_PASSWD" class="form-control"><br>
 				</div>
 			</div>
-			<div class="control-group">
-				<div class="controls">
+			<?php if (!empty($errors)) : ?>
+				<div class="form-group">
+					<div class="col-sm-9">
+						<div class="alert alert-danger"><?php echo implode('<br>', $errors); ?></div>
+					</div>
+				</div>
+			<?php endif; ?>
+			<div class="form-group">
+				<div class="col-sm-9 col-sm-offset-3">
 					<!--
 					<label class="checkbox">
 						<input name="NOPREINIT" type="checkbox"> Szybkie logowanie bez inicjalizacji kolumn

SE/superedit-AHMES_MNP.php

@@ -220,12 +220,12 @@ class Ahmes_Mnp {
 				</blockquote>
 				<?php $tabindex = 0; foreach ($fieldsList as $kID => $vCol) : ?>
 					<?php if ($this->_korespAcl->isAllowed($kID, 'C')) : ?>
-						<div class="control-group">
-							<label class="control-label" for="<?php echo "f{$kID}"; ?>"><?php echo $vCol['label']; ?>
+						<div class="form-group">
+							<label class="col-sm-3 control-label" for="<?php echo "f{$kID}"; ?>"><?php echo $vCol['label']; ?>
 								<i class="glyphicon glyphicon-info-sign frm-help" data-toggle="popover" data-trigger="hover" title="" data-content="<?php echo htmlspecialchars($vCol['opis']); ?>" data-original-title="<?php echo "[{$kID}] {$vCol['name']}"; ?>"></i>
 								<?php $perms = $this->_korespAcl->getFieldPerms($kID); SE_Layout::hotKeyDBG($perms); ?>
 							</label>
-							<div class="controls">
+							<div class="col-sm-9">
 								<?php
 									$fieldParams = array('appendBack'=>true, 'tabindex'=>(++$tabindex), 'maxGrid'=>8);
 									echo $this->_korespAcl->showFormItem('C', $kID, "f{$kID}", $cols[$kID], $fieldParams);
@@ -235,8 +235,8 @@ class Ahmes_Mnp {
 					<?php endif; ?>
 				<?php endforeach; ?>
 
-				<div class="control-group">
-					<div class="controls">
+				<div class="form-group">
+					<div class="col-sm-9 col-sm-offset-3">
 						<button type="submit" class="btn btn-primary" tabindex="<?php echo (++$tabindex); ?>">Dodaj rekord</button>
 					</div>
 				</div>

SE/superedit-AHMES_REKLAMACJE.php

@@ -334,12 +334,12 @@ class Ahmes_Reklamacje {
 				</blockquote>
 				<?php $tabindex = 0; foreach ($fieldsList as $kID => $vCol) : ?>
 					<?php if ($this->_acl->isAllowed($kID, 'C')) : ?>
-						<div class="control-group">
-							<label class="control-label" for="<?php echo "f{$kID}"; ?>"><?php echo $vCol['label']; ?>
+						<div class="form-group">
+							<label class="col-sm-3 control-label" for="<?php echo "f{$kID}"; ?>"><?php echo $vCol['label']; ?>
 								<i class="glyphicon glyphicon-info-sign frm-help" data-toggle="popover" data-trigger="hover" title="" data-content="<?php echo htmlspecialchars($vCol['opis']); ?>" data-original-title="<?php echo "[{$kID}] {$vCol['name']}"; ?>"></i>
 								<?php $perms = $this->_acl->getFieldPerms($kID); SE_Layout::hotKeyDBG($perms); ?>
 							</label>
-							<div class="controls">
+							<div class="col-sm-9">
 								<?php
 									$fieldParams = array('appendBack'=>true, 'tabindex'=>(++$tabindex), 'maxGrid'=>8);
 									echo $this->_acl->showFormItem('C', $kID, "f{$kID}", $cols[$kID], $fieldParams);
@@ -349,8 +349,8 @@ class Ahmes_Reklamacje {
 					<?php endif; ?>
 				<?php endforeach; ?>
 
-				<div class="control-group">
-					<div class="controls">
+				<div class="form-group">
+					<div class="col-sm-9 col-sm-offset-3">
 						<button type="submit" class="btn btn-primary" tabindex="<?php echo (++$tabindex); ?>">Dodaj rekord</button>
 					</div>
 				</div>
@@ -454,12 +454,12 @@ jQuery(document).ready(function(){
 				</blockquote>
 				<?php $tabindex = 0; foreach ($fieldsList as $kID => $vCol) : ?>
 					<?php if ($this->_korespAcl->isAllowed($kID, 'C')) : ?>
-						<div class="control-group">
-							<label class="control-label" for="<?php echo "f{$kID}"; ?>"><?php echo $vCol['label']; ?>
+						<div class="form-group">
+							<label class="col-sm-3 control-label" for="<?php echo "f{$kID}"; ?>"><?php echo $vCol['label']; ?>
 								<i class="glyphicon glyphicon-info-sign frm-help" data-toggle="popover" data-trigger="hover" title="" data-content="<?php echo htmlspecialchars($vCol['opis']); ?>" data-original-title="<?php echo "[{$kID}] {$vCol['name']}"; ?>"></i>
 								<?php $perms = $this->_korespAcl->getFieldPerms($kID); SE_Layout::hotKeyDBG($perms); ?>
 							</label>
-							<div class="controls">
+							<div class="col-sm-9">
 								<?php
 									$fieldParams = array('appendBack'=>true, 'tabindex'=>(++$tabindex), 'maxGrid'=>8);
 									echo $this->_korespAcl->showFormItem('C', $kID, "f{$kID}", $cols[$kID], $fieldParams);
@@ -469,8 +469,8 @@ jQuery(document).ready(function(){
 					<?php endif; ?>
 				<?php endforeach; ?>
 
-				<div class="control-group">
-					<div class="controls">
+				<div class="form-group">
+					<div class="col-sm-9 col-sm-offset-3">
 						<button type="submit" class="btn btn-primary" tabindex="<?php echo (++$tabindex); ?>">Dodaj rekord</button>
 					</div>
 				</div>

SE/superedit-POKAZ_OFERTY_AKTUALNE_FUNC.php

@@ -1882,11 +1882,11 @@ body {font:11px helvetica, arial;}
 
 					<?php $tabindex = 0; foreach ($fieldsList as $kID => $vCol) : ?>
 						<?php if (in_array($vCol['name'], $frmFldsNamesWriteOnly) && $tblAcl->isAllowed($kID, 'W', $record)) : ?>
-							<div class="control-group">
-								<label class="control-label" for="<?php echo "f{$kID}"; ?>"><?php echo $vCol['label']; ?>
+							<div class="form-group">
+								<label class="col-sm-3 control-label" for="<?php echo "f{$kID}"; ?>"><?php echo $vCol['label']; ?>
 									<i class="glyphicon glyphicon-info-sign frm-help" data-toggle="popover" data-trigger="hover" title="" data-content="<?php echo htmlspecialchars($vCol['opis']); ?>" data-original-title="<?php echo "[{$kID}] {$vCol['name']}"; ?>"></i>
 								</label>
-								<div class="controls">
+								<div class="col-sm-9">
 									<?php
 										$fieldParams = array('appendBack'=>true, 'tabindex'=>(++$tabindex), 'maxGrid'=>8);
 										if (!empty($tsValues[$kID])) {
@@ -1897,11 +1897,11 @@ body {font:11px helvetica, arial;}
 								</div>
 							</div>
 						<?php elseif ($tblAcl->isAllowed($kID, 'R', $record)) : ?>
-							<div class="control-group">
-								<label class="control-label" for="<?php echo "f{$kID}"; ?>"><?php echo $vCol['label']; ?>
+							<div class="form-group">
+								<label class="col-sm-3 control-label" for="<?php echo "f{$kID}"; ?>"><?php echo $vCol['label']; ?>
 									<i class="glyphicon glyphicon-info-sign frm-help" data-toggle="popover" data-trigger="hover" title="" data-content="<?php echo htmlspecialchars($vCol['opis']); ?>" data-original-title="<?php echo "[{$kID}] {$vCol['name']}"; ?>"></i>
 								</label>
-								<div class="controls">
+								<div class="col-sm-9">
 									<p style="margin-top:5px;">
 									<?php
 										//echo $this->_acl->showFormItem('R', $kID, "f{$kID}", $cols[$kID], array('appendBack'=>true), $record);
@@ -1917,8 +1917,8 @@ body {font:11px helvetica, arial;}
 						<?php endif; ?>
 					<?php endforeach; ?>
 
-					<div class="control-group">
-						<div class="controls">
+					<div class="form-group">
+						<div class="col-sm-9 col-sm-offset-3">
 							<button type="submit" class="btn btn-primary" tabindex="<?php echo (++$tabindex); ?>">Zapisz</button>
 							<a class="btn btn-default" href="index.php?MENU_INIT=VIEWTABLE_AJAX&ZASOB_ID=<?php echo $zasobID; ?>">Wróć</a>
 						</div>

SE/superedit-PROCES_ADD_ZASOB.php

@@ -252,9 +252,9 @@ function PROCES_ADD_ZASOB() {
 
 			?>
 			<form action="" method="POST" class="form conn_wsk-frm">
-				<div class="control-group">
-					<label class="control-label" for="editZasobID">Zasób</label>
-					<div class="controls">
+				<div class="form-group">
+					<label class="col-sm-3 control-label" for="editZasobID">Zasób</label>
+					<div class="col-sm-9">
 						<?php
 							$fName = 'editZasobID';
 							$fldParams = array();
@@ -267,9 +267,9 @@ function PROCES_ADD_ZASOB() {
 						?>
 					</div>
 				</div>
-				<div class="control-group">
-					<label class="control-label" for="editPrzypadekID">Uprawnienia</label>
-					<div class="controls">
+				<div class="form-group">
+					<label class="col-sm-3 control-label" for="editPrzypadekID">Uprawnienia</label>
+					<div class="col-sm-9">
 						<?php
 							$uprawnienia = array();
 							$db = DB::getDB();
@@ -287,14 +287,14 @@ function PROCES_ADD_ZASOB() {
 						</select>
 					</div>
 				</div>
-				<div class="control-group">
-					<label class="control-label" for="editComment">Komentarz</label>
-					<div class="controls">
+				<div class="form-group">
+					<label class="col-sm-3 control-label" for="editComment">Komentarz</label>
+					<div class="col-sm-9">
 						<textarea name="editComment" cols="80" rows="6" style="width:354px;"><?php echo $wskaznik->OPIS_ZASOB; ?></textarea>
 					</div>
 				</div>
-				<div class="control-group">
-					<div class="controls">
+				<div class="form-group">
+					<div class="col-sm-9 col-sm-offset-3">
 						<button type="submit" class="btn btn-primary">Zapisz</button>
 					</div>
 				</div>

SE/superedit-USERS2_OFFERS_GROUPS.php

@@ -879,79 +879,79 @@ function USERS2_OFFERS_GROUPS_konfigurator2() {
 				</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">
+					<div class="form-group">
+						<label for="f_COM" class="col-sm-3 control-label">P SERVICE COMPANY </label>
+						<div class="col-sm-9">
 							<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">
+					<div class="form-group">
+						<label for="f_S_ALIAS" class="col-sm-3 control-label">[1615] S ALIAS </label>
+						<div class="col-sm-9">
 							<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">
+					<div class="form-group">
+						<label for="f_P_PROMOTION_NAME" class="col-sm-3 control-label">[1616] P PROMOTION NAME </label>
+						<div class="col-sm-9">
 							<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">
+					<div class="form-group">
+						<label for="f_P_DEALTERM_MONTHS" class="col-sm-3 control-label">[1617] P DEALTERM MONTHS </label>
+						<div class="col-sm-9">
 							<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">
+					<div class="form-group">
+						<label for="f_P_OFFER_TERM_BEGIN" class="col-sm-3 control-label">[1618] P OFFER TERM BEGIN </label>
+						<div class="col-sm-9">
 							<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">
+					<div class="form-group">
+						<label for="f_P_OFFER_TERM" class="col-sm-3 control-label">[1619] P OFFER TERM </label>
+						<div class="col-sm-9">
 							<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">
+					<div class="form-group">
+						<label for="f_M_REWIR" class="col-sm-3 control-label">[1627] M REWIR </label>
+						<div class="col-sm-9">
 							<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">
+					<div class="form-group">
+						<label for="f_ID_NET" class="col-sm-3 control-label">[1743] ID_NET </label>
+						<div class="col-sm-9">
 							<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">
+					<div class="form-group">
+						<label for="f_ID_TV" class="col-sm-3 control-label">[1744] ID_TV </label>
+						<div class="col-sm-9">
 							<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">
+					<div class="form-group">
+						<label for="f_ID_TVC" class="col-sm-3 control-label">[1745] ID_TVC </label>
+						<div class="col-sm-9">
 							<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">
+					<div class="form-group">
+						<label for="f_ID_TEL" class="col-sm-3 control-label">[1747] ID_TEL </label>
+						<div class="col-sm-9">
 							<select name="f_ID_TEL"></select>
 						</div>
 					</div>

SE/superedit-USER_ADD_GROUP.php

@@ -289,9 +289,9 @@ function USER_ADD_GROUP() {
 			<p><b>Dodaj grupę:</b></p>
 				<form class="form-horizontal" action="" method="POST">
 					<input type="hidden" name="_task" value="FRM_ADD_GROUP">
-					<div class="control-group">
-						<label class="control-label" for="addUsrGroupID">Grupa</label>
-						<div class="controls">
+					<div class="form-group">
+						<label class="col-sm-3 control-label" for="addUsrGroupID">Grupa</label>
+						<div class="col-sm-9">
 							<?php
 								$fName = 'addUsrGroupID';
 								$fldParams = array();
@@ -302,9 +302,9 @@ function USER_ADD_GROUP() {
 							?>
 						</div>
 					</div>
-					<div class="control-group">
-						<label class="control-label" for="addTelboxesID">Lokalizacja</label>
-						<div class="controls">
+					<div class="form-group">
+						<label class="col-sm-3 control-label" for="addTelboxesID">Lokalizacja</label>
+						<div class="col-sm-9">
 							<?php
 								$fName = 'addTelboxesID';
 								$fldParams = array();
@@ -315,8 +315,8 @@ function USER_ADD_GROUP() {
 							?>
 						</div>
 					</div>
-					<div class="control-group">
-						<div class="controls">
+					<div class="form-group">
+						<div class="col-sm-9 col-sm-offset-3">
 							<button type="submit" class="btn">dodaj grupę</button>
 						</div>
 					</div>