Merge branch 'modern-ui-2' of https://bitbucket.org/vboctor/mantishub …

…into mantishub-1.3.x-m
mantisbt · Mar 3, 2015 · 3fe0c08 · 3fe0c08
2 parents 8bd53dd + 8941094
commit 3fe0c08
Show file tree

Hide file tree

Showing 2 changed files with 49 additions and 33 deletions.
diff --git a/core/print_api.php b/core/print_api.php
@@ -1149,7 +1149,7 @@ function print_custom_field_projects_list( $p_field_id ) {
 		$t_project_name = project_get_field( $t_project_id, 'name' );
 		$t_sequence = custom_field_get_sequence( $p_field_id, $t_project_id );
 		echo '<strong>', string_display_line( $t_project_name ), '</strong>: ';
-		print_bracket_link( 'manage_proj_custom_field_remove.php?field_id=' . $c_field_id . '&project_id=' . $t_project_id . '&return=custom_field' . $t_security_token, lang_get( 'remove_link' ) );
+		print_extra_small_button( 'manage_proj_custom_field_remove.php?field_id=' . $c_field_id . '&project_id=' . $t_project_id . '&return=custom_field' . $t_security_token, lang_get( 'remove_link' ) );
 		echo '<br />- ';
 
 		$t_linked_field_ids = custom_field_get_linked_ids( $t_project_id );
@@ -1469,6 +1469,10 @@ function print_button( $p_link, $p_url_text, $p_class = '', $p_new_window = fals
  * @param boolean $p_new_window Whether to open in a new window.
  * @return void
  */
+function print_extra_small_button( $p_link, $p_url_text, $p_new_window = false ) {
+	print_button( $p_link, $p_url_text, 'btn-xs', $p_new_window );
+}
+
 function print_small_button( $p_link, $p_url_text, $p_new_window = false ) {
 	print_button( $p_link, $p_url_text, 'btn-sm', $p_new_window );
 }

diff --git a/manage_custom_field_edit_page.php b/manage_custom_field_edit_page.php
@@ -305,53 +305,65 @@
 ?>
 <div class="col-md-12 col-xs-12">
 	<div class="space-10"></div>
-	<form method="post" action="manage_custom_field_proj_add.php">
+
 	<div class="widget-box widget-color-blue2">
 	<div class="widget-header widget-header-small">
 		<h4 class="widget-title lighter">
-			<i class="ace-icon fa fa-flask"></i>
+			<i class="ace-icon fa fa-link"></i>
 			<?php echo lang_get( 'link_custom_field_to_project_title' ) ?>
 		</h4>
 	</div>
 
 	<div class="widget-body">
 		<div class="widget-main no-padding">
-		<div class="form-container">
-		<div class="table-responsive">
-		<table class="table table-bordered table-condensed table-striped">
-		<fieldset>
-			<input type="hidden" name="field_id" value="<?php echo $f_field_id ?>" />
-			<?php echo form_security_field( 'manage_custom_field_proj_add' ); ?>
-
-			<tr>
+			<div class="table-responsive">
+			<table class="table table-bordered table-condensed table-striped">
+				<tr id="custom-field-link-project">
 				<td class="category">
-					<?php echo lang_get( 'projects_title_label' ) ?>
+					<?php echo lang_get( 'link_custom_field_to_project_title' ) ?>
 				</td>
 				<td>
-					<select id="custom-field-project-id" name="project_id[]" class="input-sm" multiple="multiple" size="5">
-						<?php print_project_option_list( null, false ); ?>
-					</select>
+					<?php print_custom_field_projects_list( $f_field_id ); ?>
 				</td>
-			</tr>
-			<tr>
-				<td class="category">
-					<?php echo lang_get( 'custom_field_sequence_label' ) ?>
-				</td>
-				<td>
-					<input type="text" id="custom-field-sequence" name="sequence" class="input-sm" value="0" />
-				</td>
-			</tr>
-		</fieldset>
-		</table>
-		</div>
-		</div>
-			<div class="widget-toolbox padding-8 clearfix">
-				<input type="submit" class="btn btn-primary btn-white btn-round" value="<?php echo lang_get( 'link_custom_field_to_project_button' ) ?>" />
+				</tr>
+
+				<form method="post" action="manage_custom_field_proj_add.php">
+				<div class="form-container">
+
+				<input type="hidden" name="field_id" value="<?php echo $f_field_id ?>" />
+				<?php echo form_security_field( 'manage_custom_field_proj_add' ); ?>
+
+				<tr>
+					<td class="category">
+						<?php echo lang_get( 'projects_title_label' ) ?>
+					</td>
+					<td>
+						<select id="custom-field-project-id" name="project_id[]" class="input-sm" multiple="multiple" size="5">
+							<?php print_project_option_list( null, false ); ?>
+						</select>
+					</td>
+				</tr>
+				<tr>
+					<td class="category">
+						<?php echo lang_get( 'custom_field_sequence_label' ) ?>
+					</td>
+					<td>
+						<input type="text" id="custom-field-sequence" name="sequence" class="input-sm" value="0" />
+					</td>
+				</tr>
+				<tr>
+					<td colspan="2" class="no-padding">
+					<div class="widget-toolbox padding-8 clearfix">
+						<input type="submit" class="btn btn-primary btn-white btn-round" value="<?php echo lang_get( 'link_custom_field_to_project_button' ) ?>" />
+					</div>
+					</td>
+				</tr>
+				</form>
+			</table>
 			</div>
 		</div>
-		</div>
-		</div>
-	</form>
+    </div>
+    </div>
 </div><?php
 
 layout_page_end();