Skip to content

Commit 0565d22

Browse files
evilchewitsdregad
evilchewits
authored and
dregad
committed
Broken layout on repository add/edit pages caused by mantis 1.3 changes
Fixes: BitBucket, Cgit, Gitlab, Gitweb, HgWeb, SFSVN, ViewVC, WebSVN Not affected: Generic, GitHub, SVN Fixes #174
1 parent baad7d3 commit 0565d22

File tree

12 files changed

+275
-126
lines changed

12 files changed

+275
-126
lines changed

‎SourceBitBucket/SourceBitBucket.php‎

Lines changed: 46 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -108,36 +108,52 @@ public function update_repo_form( $p_repo ) {
108108
} else {
109109
$t_master_branch = 'master';
110110
}
111-
?>
112-
<tr <?php echo helper_alternate_class() ?>>
113-
<td class="category"><?php echo plugin_lang_get( 'bit_basic_login' ) ?></td>
114-
<td><input name="bit_basic_login" maxlength="250" size="40"
115-
value="<?php echo string_attribute( $t_bit_basic_login ) ?>"/></td>
116-
</tr>
117-
<tr <?php echo helper_alternate_class() ?>>
118-
<td class="category"><?php echo plugin_lang_get( 'bit_basic_pwd' ) ?></td>
119-
<td><input type="password" name="bit_basic_pwd" maxlength="250" size="40"
120-
value="<?php echo string_attribute( $t_bit_basic_pwd ) ?>"/></td>
121-
</tr>
122-
<tr <?php echo helper_alternate_class() ?>>
123-
<td class="category"><?php echo plugin_lang_get( 'bit_username' ) ?></td>
124-
<td><input name="bit_username" maxlength="250" size="40"
125-
value="<?php echo string_attribute( $t_bit_username ) ?>"/></td>
126-
</tr>
127-
<tr <?php echo helper_alternate_class() ?>>
128-
<td class="category"><?php echo plugin_lang_get( 'bit_reponame' ) ?></td>
129-
<td><input name="bit_reponame" maxlength="250" size="40"
130-
value="<?php echo string_attribute( $t_bit_reponame ) ?>"/></td>
131-
</tr>
132-
<tr>
133-
<td class="spacer"></td>
134-
</tr>
135-
<tr <?php echo helper_alternate_class() ?>>
136-
<td class="category"><?php echo plugin_lang_get( 'master_branch' ) ?></td>
137-
<td><input name="master_branch" maxlength="250" size="40"
138-
value="<?php echo string_attribute( $t_master_branch ) ?>"/></td>
139-
</tr>
140-
<?php
111+
112+
?>
113+
114+
<div class="field-container">
115+
<label><span><?php echo plugin_lang_get( 'bit_basic_login' ) ?></span></label>
116+
<span class="input">
117+
<input name="bit_basic_login" maxlength="250" size="40" value="<?php echo string_attribute( $t_bit_basic_login ) ?>"/>
118+
</span>
119+
<span class="label-style"></span>
120+
</div>
121+
122+
<div class="field-container">
123+
<label><span><?php echo plugin_lang_get( 'bit_basic_pwd' ) ?></span></label>
124+
<span class="input">
125+
<input type="password" name="bit_basic_pwd" maxlength="250" size="40" value="<?php echo string_attribute( $t_bit_basic_pwd ) ?>"/>
126+
</span>
127+
<span class="label-style"></span>
128+
</div>
129+
130+
<div class="field-container">
131+
<label><span><?php echo plugin_lang_get( 'bit_username' ) ?></span></label>
132+
<span class="input">
133+
<input name="bit_username" maxlength="250" size="40" value="<?php echo string_attribute( $t_bit_username ) ?>"/>
134+
</span>
135+
<span class="label-style"></span>
136+
</div>
137+
138+
<div class="field-container">
139+
<label><span><?php echo plugin_lang_get( 'bit_reponame' ) ?></span></label>
140+
<span class="input">
141+
<input name="bit_reponame" maxlength="250" size="40" value="<?php echo string_attribute( $t_bit_reponame ) ?>"/>
142+
</span>
143+
<span class="label-style"></span>
144+
</div>
145+
146+
<div class="spacer"></div>
147+
148+
<div class="field-container">
149+
<label><span><?php echo plugin_lang_get( 'master_branch' ) ?></span></label>
150+
<span class="input">
151+
<input name="master_branch" maxlength="250" size="40" value="<?php echo string_attribute( $t_master_branch ) ?>"/>
152+
</span>
153+
<span class="label-style"></span>
154+
</div>
155+
156+
<?php
141157
}
142158

143159
public function update_repo( $p_repo ) {

‎SourceCgit/SourceCgit.php‎

Lines changed: 27 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,8 @@ public function url_diff( $p_repo, $p_changeset, $p_file ) {
7575
}
7676

7777
public function update_repo_form( $p_repo ) {
78-
$t_gitweb_root = null;
79-
$t_gitweb_project = null;
78+
$t_cgit_root = null;
79+
$t_cgit_project = null;
8080

8181
if ( isset( $p_repo->info['cgit_root'] ) ) {
8282
$t_cgit_root = $p_repo->info['cgit_root'];
@@ -92,18 +92,31 @@ public function update_repo_form( $p_repo ) {
9292
$t_master_branch = 'master';
9393
}
9494
?>
95-
<tr>
96-
<td class="category"><?php echo plugin_lang_get( 'cgit_root' ) ?></td>
97-
<td><input name="cgit_root" maxlength="250" size="40" value="<?php echo string_attribute( $t_cgit_root ) ?>"/></td>
98-
</tr>
99-
<tr>
100-
<td class="category"><?php echo plugin_lang_get( 'cgit_project' ) ?></td>
101-
<td><input name="cgit_project" maxlength="250" size="40" value="<?php echo string_attribute( $t_cgit_project ) ?>"/></td>
102-
</tr>
103-
<tr>
104-
<td class="category"><?php echo plugin_lang_get( 'master_branch' ) ?></td>
105-
<td><input name="master_branch" maxlength="250" size="40" value="<?php echo string_attribute( $t_master_branch ) ?>"/></td>
106-
</tr>
95+
96+
<div class="field-container">
97+
<label><span><?php echo plugin_lang_get( 'cgit_root' ) ?></span></label>
98+
<span class="input">
99+
<input name="cgit_root" maxlength="250" size="40" value="<?php echo string_attribute( $t_cgit_root ) ?>"/>
100+
</span>
101+
<span class="label-style"></span>
102+
</div>
103+
104+
<div class="field-container">
105+
<label><span><?php echo plugin_lang_get( 'cgit_project' ) ?></span></label>
106+
<span class="input">
107+
<input name="cgit_project" maxlength="250" size="40" value="<?php echo string_attribute( $t_cgit_project ) ?>"/>
108+
</span>
109+
<span class="label-style"></span>
110+
</div>
111+
112+
<div class="field-container">
113+
<label><span><?php echo plugin_lang_get( 'master_branch' ) ?></span></label>
114+
<span class="input">
115+
<input name="master_branch" maxlength="250" size="40" value="<?php echo string_attribute( $t_master_branch ) ?>"/>
116+
</span>
117+
<span class="label-style"></span>
118+
</div>
119+
107120
<?php
108121
}
109122

‎SourceGitlab/SourceGitlab.php‎

Lines changed: 44 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -98,8 +98,9 @@ public function url_diff( $p_repo, $p_changeset, $p_file ) {
9898
}
9999

100100
public function update_repo_form( $p_repo ) {
101-
$t_hub_root = null;
102-
$t_hub_repoid = null;
101+
$t_hub_root = null;
102+
$t_hub_repoid = null;
103+
$t_hub_reponame = null;
103104
$t_hub_app_secret = null;
104105

105106
if ( isset( $p_repo->info['hub_root'] ) ) {
@@ -120,26 +121,47 @@ public function update_repo_form( $p_repo ) {
120121
$t_master_branch = 'master';
121122
}
122123
?>
123-
<tr>
124-
<td class="category"><?php echo plugin_lang_get( 'hub_root' ) ?></td>
125-
<td><input name="hub_root" maxlength="250" size="40" value="<?php echo string_attribute( $t_hub_root ) ?>"/></td>
126-
</tr>
127-
<tr>
128-
<td class="category"><?php echo plugin_lang_get( 'hub_repoid' ) ?></td>
129-
<td><input name="hub_repoid" maxlength="250" size="40" value="<?php echo string_attribute( $t_hub_repoid ) ?>"/></td>
130-
</tr>
131-
<tr>
132-
<td class="category"><?php echo plugin_lang_get( 'hub_reponame' ) ?></td>
133-
<td><input name="hub_reponame" maxlength="250" size="40" value="<?php echo string_attribute( $t_hub_reponame ) ?>"/></td>
134-
</tr>
135-
<tr>
136-
<td class="category"><?php echo plugin_lang_get( 'hub_app_secret' ) ?></td>
137-
<td><input name="hub_app_secret" maxlength="250" size="40" value="<?php echo string_attribute( $t_hub_app_secret ) ?>"/></td>
138-
</tr>
139-
<tr>
140-
<td class="category"><?php echo plugin_lang_get( 'master_branch' ) ?></td>
141-
<td><input name="master_branch" maxlength="250" size="40" value="<?php echo string_attribute( $t_master_branch ) ?>"/></td>
142-
</tr>
124+
125+
<div class="field-container">
126+
<label><span><?php echo plugin_lang_get( 'hub_root' ) ?></span></label>
127+
<span class="input">
128+
<input name="hub_root" maxlength="250" size="40" value="<?php echo string_attribute( $t_hub_root ) ?>"/>
129+
</span>
130+
<span class="label-style"></span>
131+
</div>
132+
133+
<div class="field-container">
134+
<label><span><?php echo plugin_lang_get( 'hub_repoid' ) ?></span></label>
135+
<span class="input">
136+
<input name="hub_repoid" maxlength="250" size="40" value="<?php echo string_attribute( $t_hub_repoid ) ?>"/>
137+
</span>
138+
<span class="label-style"></span>
139+
</div>
140+
141+
<div class="field-container">
142+
<label><span><?php echo plugin_lang_get( 'hub_reponame' ) ?></span></label>
143+
<span class="input">
144+
<input name="hub_reponame" maxlength="250" size="40" value="<?php echo string_attribute( $t_hub_reponame ) ?>"/>
145+
</span>
146+
<span class="label-style"></span>
147+
</div>
148+
149+
<div class="field-container">
150+
<label><span><?php echo plugin_lang_get( 'hub_app_secret' ) ?></span></label>
151+
<span class="input">
152+
<input name="hub_app_secret" maxlength="250" size="40" value="<?php echo string_attribute( $t_hub_app_secret ) ?>"/>
153+
</span>
154+
<span class="label-style"></span>
155+
</div>
156+
157+
<div class="field-container">
158+
<label><span><?php echo plugin_lang_get( 'master_branch' ) ?></span></label>
159+
<span class="input">
160+
<input name="master_branch" maxlength="250" size="40" value="<?php echo string_attribute( $t_master_branch ) ?>"/>
161+
</span>
162+
<span class="label-style"></span>
163+
</div>
164+
143165
<?php
144166
}
145167

‎SourceGitweb/SourceGitweb.php‎

Lines changed: 25 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -84,18 +84,31 @@ public function update_repo_form( $p_repo ) {
8484
$t_master_branch = 'master';
8585
}
8686
?>
87-
<tr>
88-
<td class="category"><?php echo plugin_lang_get( 'gitweb_root' ) ?></td>
89-
<td><input name="gitweb_root" maxlength="250" size="40" value="<?php echo string_attribute( $t_gitweb_root ) ?>"/></td>
90-
</tr>
91-
<tr>
92-
<td class="category"><?php echo plugin_lang_get( 'gitweb_project' ) ?></td>
93-
<td><input name="gitweb_project" maxlength="250" size="40" value="<?php echo string_attribute( $t_gitweb_project ) ?>"/></td>
94-
</tr>
95-
<tr>
96-
<td class="category"><?php echo plugin_lang_get( 'master_branch' ) ?></td>
97-
<td><input name="master_branch" maxlength="250" size="40" value="<?php echo string_attribute( $t_master_branch ) ?>"/></td>
98-
</tr>
87+
88+
<div class="field-container">
89+
<label><span><?php echo plugin_lang_get( 'gitweb_root' ) ?></span></label>
90+
<span class="input">
91+
<input name="gitweb_root" maxlength="250" size="40" value="<?php echo string_attribute( $t_gitweb_root ) ?>"/>
92+
</span>
93+
<span class="label-style"></span>
94+
</div>
95+
96+
<div class="field-container">
97+
<label><span><?php echo plugin_lang_get( 'gitweb_project' ) ?></span></label>
98+
<span class="input">
99+
<input name="gitweb_project" maxlength="250" size="40" value="<?php echo string_attribute( $t_gitweb_project ) ?>"/>
100+
</span>
101+
<span class="label-style"></span>
102+
</div>
103+
104+
<div class="field-container">
105+
<label><span><?php echo plugin_lang_get( 'master_branch' ) ?></span></label>
106+
<span class="input">
107+
<input name="master_branch" maxlength="250" size="40" value="<?php echo string_attribute( $t_master_branch ) ?>"/>
108+
</span>
109+
<span class="label-style"></span>
110+
</div>
111+
99112
<?php
100113
}
101114

‎SourceHgWeb/SourceHgWeb.php‎

Lines changed: 25 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -92,18 +92,31 @@ public function update_repo_form( $p_repo ) {
9292
$t_master_branch = 'default';
9393
}
9494
?>
95-
<tr>
96-
<td class="category"><?php echo plugin_lang_get( 'hgweb_root' ) ?></td>
97-
<td><input name="hgweb_root" maxlength="250" size="40" value="<?php echo string_attribute( $t_hgweb_root ) ?>"/></td>
98-
</tr>
99-
<tr>
100-
<td class="category"><?php echo plugin_lang_get( 'hgweb_project' ) ?></td>
101-
<td><input name="hgweb_project" maxlength="250" size="40" value="<?php echo string_attribute( $t_hgweb_project ) ?>"/></td>
102-
</tr>
103-
<tr>
104-
<td class="category"><?php echo plugin_lang_get( 'master_branch' ) ?></td>
105-
<td><input name="master_branch" maxlength="250" size="40" value="<?php echo string_attribute( $t_master_branch ) ?>"/></td>
106-
</tr>
95+
96+
<div class="field-container">
97+
<label><span><?php echo plugin_lang_get( 'hgweb_root' ) ?></span></label>
98+
<span class="input">
99+
<input name="hgweb_root" maxlength="250" size="40" value="<?php echo string_attribute( $t_hgweb_root ) ?>"/>
100+
</span>
101+
<span class="label-style"></span>
102+
</div>
103+
104+
<div class="field-container">
105+
<label><span><?php echo plugin_lang_get( 'hgweb_project' ) ?></span></label>
106+
<span class="input">
107+
<input name="hgweb_project" maxlength="250" size="40" value="<?php echo string_attribute( $t_hgweb_project ) ?>"/>
108+
</span>
109+
<span class="label-style"></span>
110+
</div>
111+
112+
<div class="field-container">
113+
<label><span><?php echo plugin_lang_get( 'master_branch' ) ?></span></label>
114+
<span class="input">
115+
<input name="master_branch" maxlength="250" size="40" value="<?php echo string_attribute( $t_master_branch ) ?>"/>
116+
</span>
117+
<span class="label-style"></span>
118+
</div>
119+
107120
<?php
108121
}
109122

‎SourceSFSVN/SourceSFSVN.php‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -70,10 +70,15 @@ public function update_repo_form( $p_repo ) {
7070
$t_sf_project = isset( $p_repo->info['sf_project'] ) ? $p_repo->info['sf_project'] : '';
7171

7272
?>
73-
<tr>
74-
<td class="category"><?php echo lang_get( 'plugin_SourceSFSVN_sf_project' ) ?></td>
75-
<td><input name="sf_project" maxlength="250" size="40" value="<?php echo string_attribute( $t_sf_project ) ?>"/></td>
76-
</tr>
73+
74+
<div class="field-container">
75+
<label><span><?php echo plugin_lang_get( 'sf_project' ) ?></span></label>
76+
<span class="input">
77+
<input name="sf_project" maxlength="250" size="40" value="<?php echo string_attribute( $t_sf_project ) ?>"/>
78+
</span>
79+
<span class="label-style"></span>
80+
</div>
81+
7782
<?php
7883

7984
return parent::update_repo_form( $p_repo );

‎SourceSFSVN/lang/strings_catalan.txt‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,11 @@ $s_plugin_SourceSFSVN_description = 'Afegeix la integració amb Subversion al fr
1010
$s_plugin_SourceSFSVN_svn = 'SVN SourceForge';
1111
$s_plugin_SourceSFSVN_sf_project = 'Projecte SourceForge';
1212

13+
$s_plugin_SourceSFSVN_svn_username = 'Usuari de SVN';
14+
$s_plugin_SourceSFSVN_svn_password = 'Contrasenya de SVN';
15+
$s_plugin_SourceSFSVN_standard_repo = 'Repositori estàndar<br/><span class="small">(trunk/branches/tags)</span>';
16+
$s_plugin_SourceSFSVN_trunk_path = 'Directori Trunk<br/><span class="small">(Per repositoris no estàndar)</span>';
17+
$s_plugin_SourceSFSVN_branch_path = 'Directori Branch<br/><span class="small">(Per repositoris no estàndar)</span>';
18+
$s_plugin_SourceSFSVN_tag_path = 'Directori Tag<br/><span class="small">(Per repositoris no estàndar)</span>';
19+
$s_plugin_SourceSFSVN_ignore_paths = 'Ignorar altres rutes<br/><span class="small">(Per repositoris no estándar)</span>';
20+

‎SourceSFSVN/lang/strings_english.txt‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,12 @@ $s_plugin_SourceSFSVN_description = 'Adds Subversion integration to the Source p
1010
$s_plugin_SourceSFSVN_svn = 'SourceForge SVN';
1111
$s_plugin_SourceSFSVN_sf_project = 'SourceForge Project';
1212

13+
$s_plugin_SourceSFSVN_svn_username = 'SVN Username';
14+
$s_plugin_SourceSFSVN_svn_password = 'SVN Password';
15+
$s_plugin_SourceSFSVN_standard_repo = 'Standard Repository<br/><span class="small">(trunk/branches/tags)</span>';
16+
$s_plugin_SourceSFSVN_trunk_path = 'Trunk Path<br/><span class="small">(Non-standard repository)</span>';
17+
$s_plugin_SourceSFSVN_branch_path = 'Branch Path<br/><span class="small">(Non-standard repository)</span>';
18+
$s_plugin_SourceSFSVN_tag_path = 'Tag Path<br/><span class="small">(Non-standard repository)</span>';
19+
$s_plugin_SourceSFSVN_ignore_paths = 'Ignore Other Paths<br/><span class="small">(Non-standard repository)</span>';
20+
21+

‎SourceSFSVN/lang/strings_german.txt‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,11 @@ $s_plugin_SourceSFSVN_description = 'Subversionintegration für SourceForge.net
1010
$s_plugin_SourceSFSVN_svn = 'SourceForge SVN';
1111
$s_plugin_SourceSFSVN_sf_project = 'SourceForge Projekt';
1212

13+
$s_plugin_SourceSFSVN_svn_username = 'SVN Benutzername';
14+
$s_plugin_SourceSFSVN_svn_password = 'SVN Passwort';
15+
$s_plugin_SourceSFSVN_standard_repo = 'Standardprojektarchiv<br /><span class="small">(trunk/branches/tags)</span>';
16+
$s_plugin_SourceSFSVN_trunk_path = 'Pfad zu \'Trunk\'<br /><span class="small">(Wenn kein Standardprojektarchiv)</span>';
17+
$s_plugin_SourceSFSVN_branch_path = 'Pfad zu \'Branch\'<br /><span class="small">(Wenn kein Standardprojektarchiv)</span>';
18+
$s_plugin_SourceSFSVN_tag_path = 'Pfad zu \'Tag\'<br /><span class="small">(Wenn kein Standardprojektarchiv)</span>';
19+
$s_plugin_SourceSFSVN_ignore_paths = 'Andere Pfade ignorieren<br /><span class="small">(Wenn kein Standardprojektarchiv)</span>';
20+

‎SourceSFSVN/lang/strings_spanish.txt‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,11 @@ $s_plugin_SourceSFSVN_description = 'Añade la integración con Subversion al fr
1010
$s_plugin_SourceSFSVN_svn = 'SVN SourceForge';
1111
$s_plugin_SourceSFSVN_sf_project = 'Proyecto SourceForge';
1212

13+
$s_plugin_SourceSFSVN_svn_username = 'Usuario de SVN';
14+
$s_plugin_SourceSFSVN_svn_password = 'Contraseña de SVN';
15+
$s_plugin_SourceSFSVN_standard_repo = 'Repositorio estándar<br/><span class="small">(trunk/branches/tags)</span>';
16+
$s_plugin_SourceSFSVN_trunk_path = 'Directorio Trunk<br/><span class="small">(Para repositorios no estándar)</span>';
17+
$s_plugin_SourceSFSVN_branch_path = 'Directorio Branch<br/><span class="small">(Para repositorios no estándar)</span>';
18+
$s_plugin_SourceSFSVN_tag_path = 'Directorio Tag<br/><span class="small">(Para repositorios no estándar)</span>';
19+
$s_plugin_SourceSFSVN_ignore_paths = 'Ignorar otras rutas<br/><span class="small">(Para repositorios no estándar)</span>';
20+

0 commit comments

Comments
 (0)